diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-09-17 03:33:01 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-09-18 23:10:35 +0900 |
| commit | 27350c922eedb8785a1c456863869d49a769952e (patch) | |
| tree | 3198d80c6114c4e25d6a3cffe88ad202dcdd01c9 | |
| parent | 4475c0ca5f40a10b0e3d1cea15b6d36e53d17a74 (diff) | |
| download | u-boot-27350c922eedb8785a1c456863869d49a769952e.tar.gz | |
ARM: uniphier: select PINCTRL and SPL_PINCTRL
Now all UniPhier SoCs support a pinctrl driver. Select (SPL_)PINCTRL
since it is mandatory even for base use.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | configs/uniphier_ld11_defconfig | 2 | ||||
| -rw-r--r-- | configs/uniphier_ld20_defconfig | 2 | ||||
| -rw-r--r-- | configs/uniphier_ld4_sld8_defconfig | 2 | ||||
| -rw-r--r-- | configs/uniphier_pro4_defconfig | 2 | ||||
| -rw-r--r-- | configs/uniphier_pxs2_ld6b_defconfig | 2 |
6 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 498658ddec..a311215c92 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -865,9 +865,11 @@ config ARCH_UNIPHIER select DM_USB select OF_CONTROL select OF_LIBFDT + select PINCTRL select SPL select SPL_DM select SPL_OF_CONTROL + select SPL_PINCTRL select SUPPORT_SPL help Support for UniPhier SoC family developed by Socionext Inc. diff --git a/configs/uniphier_ld11_defconfig b/configs/uniphier_ld11_defconfig index 703d8711ea..e848d084a1 100644 --- a/configs/uniphier_ld11_defconfig +++ b/configs/uniphier_ld11_defconfig @@ -23,8 +23,6 @@ CONFIG_SPL_OF_TRANSLATE=y CONFIG_GPIO_UNIPHIER=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y -CONFIG_PINCTRL=y -CONFIG_SPL_PINCTRL=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/uniphier_ld20_defconfig b/configs/uniphier_ld20_defconfig index c4a8547074..d0e4bf05db 100644 --- a/configs/uniphier_ld20_defconfig +++ b/configs/uniphier_ld20_defconfig @@ -24,8 +24,6 @@ CONFIG_GPIO_UNIPHIER=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y CONFIG_MMC_UNIPHIER=y -CONFIG_PINCTRL=y -CONFIG_SPL_PINCTRL=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig index 89d3de4b31..f9b6eb2f69 100644 --- a/configs/uniphier_ld4_sld8_defconfig +++ b/configs/uniphier_ld4_sld8_defconfig @@ -29,8 +29,6 @@ CONFIG_NAND_DENALI=y CONFIG_SYS_NAND_DENALI_64BIT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 CONFIG_SPL_NAND_DENALI=y -CONFIG_PINCTRL=y -CONFIG_SPL_PINCTRL=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y diff --git a/configs/uniphier_pro4_defconfig b/configs/uniphier_pro4_defconfig index ddc582d70e..e76513ab4f 100644 --- a/configs/uniphier_pro4_defconfig +++ b/configs/uniphier_pro4_defconfig @@ -28,8 +28,6 @@ CONFIG_NAND_DENALI=y CONFIG_SYS_NAND_DENALI_64BIT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 CONFIG_SPL_NAND_DENALI=y -CONFIG_PINCTRL=y -CONFIG_SPL_PINCTRL=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/uniphier_pxs2_ld6b_defconfig b/configs/uniphier_pxs2_ld6b_defconfig index 131c416580..6bc592ed1c 100644 --- a/configs/uniphier_pxs2_ld6b_defconfig +++ b/configs/uniphier_pxs2_ld6b_defconfig @@ -29,8 +29,6 @@ CONFIG_NAND_DENALI=y CONFIG_SYS_NAND_DENALI_64BIT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 CONFIG_SPL_NAND_DENALI=y -CONFIG_PINCTRL=y -CONFIG_SPL_PINCTRL=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_STORAGE=y |