| Message ID | 1368123170-22906-1-git-send-email-dianders@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, May 9, 2013 at 8:12 PM, Doug Anderson <dianders@chromium.org> wrote: > Previously if you had MACH_EXYNOS5_DT but not MACH_EXYNOS4_DT you'd be > missing the pincontrol definitions. Move PINCTRL selects to the arch > level since we should be enabling the code for all exynos variants. > > Update the PINCTRL descriptions to indicate that PINCTRL_EXYNOS is not > for exynos5440. Also add basic dependencies for the PINCTRL_EXYNOS > kernel config. > > Signed-off-by: Doug Anderson <dianders@chromium.org> > --- > Changes in v3: > - Moved to chip level as per Tomasz. > - Update PINCTRL Kconfig for exynos. > > Changes in v2: > - Moved to the arch level as suggested by Olof. Acked-by: Linus Walleij <linus.walleij@linaro.org> for the pinctrl part, I guess this will be merged through the Samsung tree? Yours, Linus Walleij
Linus Walleij wrote: > > On Thu, May 9, 2013 at 8:12 PM, Doug Anderson <dianders@chromium.org> > wrote: > > > Previously if you had MACH_EXYNOS5_DT but not MACH_EXYNOS4_DT you'd be > > missing the pincontrol definitions. Move PINCTRL selects to the arch > > level since we should be enabling the code for all exynos variants. > > > > Update the PINCTRL descriptions to indicate that PINCTRL_EXYNOS is not > > for exynos5440. Also add basic dependencies for the PINCTRL_EXYNOS > > kernel config. > > > > Signed-off-by: Doug Anderson <dianders@chromium.org> > > --- > > Changes in v3: > > - Moved to chip level as per Tomasz. > > - Update PINCTRL Kconfig for exynos. > > > > Changes in v2: > > - Moved to the arch level as suggested by Olof. > > Acked-by: Linus Walleij <linus.walleij@linaro.org> for the pinctrl > part, I guess this will be merged through the Samsung tree? > Linus, thanks for your ack. Let me take this into samsung tree. - Kukjin
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 6e77432..4139d7f 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -17,6 +17,7 @@ config ARCH_EXYNOS4 select HAVE_ARM_SCU if SMP select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 + select PINCTRL help Samsung EXYNOS4 SoCs based systems @@ -24,6 +25,7 @@ config ARCH_EXYNOS5 bool "SAMSUNG EXYNOS5" select HAVE_ARM_SCU if SMP select HAVE_SMP + select PINCTRL help Samsung EXYNOS5 (Cortex-A15) SoC based systems @@ -34,6 +36,7 @@ config CPU_EXYNOS4210 default y depends on ARCH_EXYNOS4 select ARM_CPU_SUSPEND if PM + select PINCTRL_EXYNOS select PM_GENERIC_DOMAINS select S5P_PM if PM select S5P_SLEEP if PM @@ -45,6 +48,7 @@ config SOC_EXYNOS4212 bool "SAMSUNG EXYNOS4212" default y depends on ARCH_EXYNOS4 + select PINCTRL_EXYNOS select S5P_PM if PM select S5P_SLEEP if PM select SAMSUNG_DMADEV @@ -55,6 +59,7 @@ config SOC_EXYNOS4412 bool "SAMSUNG EXYNOS4412" default y depends on ARCH_EXYNOS4 + select PINCTRL_EXYNOS select SAMSUNG_DMADEV help Enable EXYNOS4412 SoC support @@ -63,6 +68,7 @@ config SOC_EXYNOS5250 bool "SAMSUNG EXYNOS5250" default y depends on ARCH_EXYNOS5 + select PINCTRL_EXYNOS select PM_GENERIC_DOMAINS if PM select S5P_PM if PM select S5P_SLEEP if PM @@ -78,7 +84,6 @@ config SOC_EXYNOS5440 select ARCH_HAS_OPP select ARM_ARCH_TIMER select AUTO_ZRELADDR - select PINCTRL select PINCTRL_EXYNOS5440 select PM_OPP help @@ -412,8 +417,6 @@ config MACH_EXYNOS4_DT select CLKSRC_OF select CPU_EXYNOS4210 select KEYBOARD_SAMSUNG if INPUT_KEYBOARD - select PINCTRL - select PINCTRL_EXYNOS select S5P_DEV_MFC select USE_OF help diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 8f66924..a1c6dd3 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -207,12 +207,13 @@ config PINCTRL_SAMSUNG select PINCONF config PINCTRL_EXYNOS - bool "Pinctrl driver data for Samsung EXYNOS SoCs" - depends on OF && GPIOLIB + bool "Pinctrl driver data for Samsung EXYNOS SoCs other than 5440" + depends on OF && GPIOLIB && ARCH_EXYNOS select PINCTRL_SAMSUNG config PINCTRL_EXYNOS5440 bool "Samsung EXYNOS5440 SoC pinctrl driver" + depends on SOC_EXYNOS5440 select PINMUX select PINCONF
Previously if you had MACH_EXYNOS5_DT but not MACH_EXYNOS4_DT you'd be missing the pincontrol definitions. Move PINCTRL selects to the arch level since we should be enabling the code for all exynos variants. Update the PINCTRL descriptions to indicate that PINCTRL_EXYNOS is not for exynos5440. Also add basic dependencies for the PINCTRL_EXYNOS kernel config. Signed-off-by: Doug Anderson <dianders@chromium.org> --- Changes in v3: - Moved to chip level as per Tomasz. - Update PINCTRL Kconfig for exynos. Changes in v2: - Moved to the arch level as suggested by Olof. arch/arm/mach-exynos/Kconfig | 9 ++++++--- drivers/pinctrl/Kconfig | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-)