Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-12-01 08:59:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

pinctrl: mvebu: Enable support for the Armada 37xx pinctrl driver

Browse source 
To enable support for the Armada 37xx pinctrl driver, we need to
change the Kconfig symbol for the Armada 7k/8k pinctrl driver and its
dependencies to distinguish between both platforms and drivers.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Konstantin Porotchkin <kostap@marvell.com>
Cc: Nadav Haklai <nadavh@marvell.com>
This commit is contained in:
Stefan Roese 2017-05-09 13:35:44 +02:00
parent d2d92bd71c
commit 8dd082a7e6
7 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configs/mvebu_db-88f7040-nand_defconfig
View file

@ -7,7 +7,6 @@ CONFIG_SMBIOS_PRODUCT_NAME=""
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_BOARD_LATE_INIT=y
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_ARCH_EARLY_INIT_R=y CONFIG_ARCH_EARLY_INIT_R=y
@ -16,12 +15,12 @@ CONFIG_HUSH_PARSER=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_NAND=y
CONFIG_CMD_PART=y CONFIG_CMD_PART=y
CONFIG_CMD_SF=y CONFIG_CMD_SF=y
CONFIG_CMD_SPI=y CONFIG_CMD_SPI=y
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_NAND=y
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPPUT=y
@ -31,6 +30,7 @@ CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_CMD_TIME=y CONFIG_CMD_TIME=y
CONFIG_CMD_MVEBU_BUBT=y CONFIG_CMD_MVEBU_BUBT=y
CONFIG_MVEBU_NAND_BOOT=y
CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
@ -45,18 +45,18 @@ CONFIG_MISC=y
CONFIG_DM_MMC=y CONFIG_DM_MMC=y
CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_XENON=y CONFIG_MMC_SDHCI_XENON=y
CONFIG_NAND_PXA3XX=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_MVEBU_NAND_BOOT=y
CONFIG_NAND_PXA3XX=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_DM_PCI=y CONFIG_DM_PCI=y
CONFIG_PCIE_DW_MVEBU=y CONFIG_PCIE_DW_MVEBU=y
CONFIG_MVEBU_COMPHY_SUPPORT=y CONFIG_MVEBU_COMPHY_SUPPORT=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
CONFIG_PINCTRL_ARMADA_8K=y
# CONFIG_SPL_SERIAL_PRESENT is not set # CONFIG_SPL_SERIAL_PRESENT is not set
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_DEBUG_UART_BASE=0xf0512000 CONFIG_DEBUG_UART_BASE=0xf0512000

1
configs/mvebu_db-88f7040_defconfig
View file

@ -54,6 +54,7 @@ CONFIG_DM_PCI=y
CONFIG_PCIE_DW_MVEBU=y CONFIG_PCIE_DW_MVEBU=y
CONFIG_MVEBU_COMPHY_SUPPORT=y CONFIG_MVEBU_COMPHY_SUPPORT=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
CONFIG_PINCTRL_ARMADA_8K=y
# CONFIG_SPL_SERIAL_PRESENT is not set # CONFIG_SPL_SERIAL_PRESENT is not set
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_DEBUG_UART_BASE=0xf0512000 CONFIG_DEBUG_UART_BASE=0xf0512000

1
configs/mvebu_db-88f8040_defconfig
View file

@ -54,6 +54,7 @@ CONFIG_DM_PCI=y
CONFIG_PCIE_DW_MVEBU=y CONFIG_PCIE_DW_MVEBU=y
CONFIG_MVEBU_COMPHY_SUPPORT=y CONFIG_MVEBU_COMPHY_SUPPORT=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
CONFIG_PINCTRL_ARMADA_8K=y
# CONFIG_SPL_SERIAL_PRESENT is not set # CONFIG_SPL_SERIAL_PRESENT is not set
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_DEBUG_UART_BASE=0xf0512000 CONFIG_DEBUG_UART_BASE=0xf0512000

1
configs/mvebu_mcbin-88f8040_defconfig
View file

@ -57,6 +57,7 @@ CONFIG_DM_PCI=y
CONFIG_PCIE_DW_MVEBU=y CONFIG_PCIE_DW_MVEBU=y
CONFIG_MVEBU_COMPHY_SUPPORT=y CONFIG_MVEBU_COMPHY_SUPPORT=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
CONFIG_PINCTRL_ARMADA_8K=y
CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_FIXED=y
# CONFIG_SPL_SERIAL_PRESENT is not set # CONFIG_SPL_SERIAL_PRESENT is not set
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y

2
drivers/pinctrl/Makefile
View file

@ -17,7 +17,7 @@ obj-$(CONFIG_PINCTRL_UNIPHIER) += uniphier/
obj-$(CONFIG_PINCTRL_PIC32) += pinctrl_pic32.o obj-$(CONFIG_PINCTRL_PIC32) += pinctrl_pic32.o
obj-$(CONFIG_PINCTRL_EXYNOS) += exynos/ obj-$(CONFIG_PINCTRL_EXYNOS) += exynos/
obj-$(CONFIG_PINCTRL_MESON) += meson/ obj-$(CONFIG_PINCTRL_MESON) += meson/
obj-$(CONFIG_PINCTRL_MVEBU) += mvebu/ obj-$(CONFIG_ARCH_MVEBU) += mvebu/
obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o
obj-$(CONFIG_PINCTRL_STI) += pinctrl-sti.o obj-$(CONFIG_PINCTRL_STI) += pinctrl-sti.o
obj-$(CONFIG_PINCTRL_STM32) += pinctrl_stm32.o obj-$(CONFIG_PINCTRL_STM32) += pinctrl_stm32.o

18
drivers/pinctrl/mvebu/Kconfig
View file

@ -1,7 +1,17 @@
config PINCTRL_MVEBU if ARCH_MVEBU
depends on ARCH_MVEBU
bool config PINCTRL_ARMADA_37XX
default y depends on ARMADA_3700
bool "Armada 37xx pin control driver"
help
Support pin multiplexing and pin configuration control on
Marvell's Armada-37xx SoC.
config PINCTRL_ARMADA_8K
depends on ARMADA_8K
bool "Armada 7k/8k pin control driver"
help help
Support pin multiplexing and pin configuration control on Support pin multiplexing and pin configuration control on
Marvell's Armada-8K SoC. Marvell's Armada-8K SoC.
endif

3
drivers/pinctrl/mvebu/Makefile
View file

@ -4,4 +4,5 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# https://spdx.org/licenses # https://spdx.org/licenses
obj-$(CONFIG_PINCTRL_MVEBU) += pinctrl-mvebu.o obj-$(CONFIG_PINCTRL_ARMADA_37XX) += pinctrl-armada-37xx.o
obj-$(CONFIG_PINCTRL_ARMADA_8K) += pinctrl-mvebu.o