Skip to contentSkip to conversation

ARM: exynos: Select PINCTRL_EXYNOS for exynos5

PATCH In review Doug Anderson 5 participants 11 messages May 8, 2013 – May 14, 2013

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: exynos: Select PINCTRL_EXYNOS for exynos5

If you've got MACH_EXYNOS5_DT but not MACH_EXYNOS4_DT you'll be missing the pincontrol definitions. Add them for exynos5.

---
 arch/arm/mach-exynos/Kconfig | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-exynos/Kconfig +2 -0
index 6e77432..cdcd7fa 100644
@@ -428,6 +428,8 @@ config MACH_EXYNOS5_DT
 	depends on ARCH_EXYNOS5
 	select ARM_AMBA
 	select CLKSRC_OF
+	select PINCTRL
+	select PINCTRL_EXYNOS
 	select USB_ARCH_HAS_XHCI
 	select USE_OF
 	help
Signature · 1 line
1.8.2.1
#1 lore raw

Hi,

Quoted 13 lines · Doug Anderson

If you've got MACH_EXYNOS5_DT but not MACH_EXYNOS4_DT you'll be missing the pincontrol definitions. Add them for exynos5.

---
 arch/arm/mach-exynos/Kconfig | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-exynos/Kconfig +0 -0
index 6e77432..cdcd7fa 100644

arch/arm/mach-exynos/Kconfig config MACH_EXYNOS5_DT · line 432

Quoted 5 lines
arch/arm/mach-exynos/Kconfig +2 -0
@@ -428,6 +428,8 @@ config MACH_EXYNOS5_DT
        depends on ARCH_EXYNOS5
        select ARM_AMBA
        select CLKSRC_OF
+       select PINCTRL
+       select PINCTRL_EXYNOS

Nit:

Seems like this should be selected by the SoC (ARCH_EXYNOS5) instead of the board. Actually, I'm not sure we need the board Kconfig entry long-term; all boards will be dt-only.

-Olof

#2 lore raw

Olof,

Quoted 3 lines · Olof Johansson

Seems like this should be selected by the SoC (ARCH_EXYNOS5) instead of the board. Actually, I'm not sure we need the board Kconfig entry long-term; all boards will be dt-only.

Good point. Hopefully someone at Samsung can work on removing the board itself? If you'd like me to take this on then let me know and I can put it on my list.

I'm happy to resubmit my patch under ARCH_EXYNOS5. I'll move the exynos4 one at the same time.

I'm going to make the assumption that PINCTRL_EXYNOS and PINCTRL_EXYNOS5440 can happily coexist. Certainly I've got both defined in my tree right now and nothing blows up. I haven't tested on 5440 but things ought to be handled by "compatible" checks, right?

I'll also assume that eventually someone will move PINCTRL_EXYNOS5440 into PINCTRL_EXYNOS. If PINCTRL_EXYNOS5440 won't eventually move under PINCTRL_EXYNOS then it makes less sense to define PINCTRL_EXYNOS for all exynos parts.

-Doug

#3 lore raw

Hi,

Quoted 10 lines · Doug Anderson

Olof,

Quoted 3 lines · Olof Johansson

Seems like this should be selected by the SoC (ARCH_EXYNOS5) instead of the board. Actually, I'm not sure we need the board Kconfig entry long-term; all boards will be dt-only.

Good point. Hopefully someone at Samsung can work on removing the board itself? If you'd like me to take this on then let me know and I can put it on my list.

Nothing stops you from doing that on your own. I tend to push back onto the maintainers to get them engaged in their own housekeeping, but anyone is free to :)

Quoted 2 lines

I'm happy to resubmit my patch under ARCH_EXYNOS5. I'll move the exynos4 one at the same time.

Great.

Quoted 4 lines

I'm going to make the assumption that PINCTRL_EXYNOS and PINCTRL_EXYNOS5440 can happily coexist. Certainly I've got both defined in my tree right now and nothing blows up. I haven't tested on 5440 but things ought to be handled by "compatible" checks, right?

Yes, if they can't coexist then that's a bug.

Quoted 4 lines

I'll also assume that eventually someone will move PINCTRL_EXYNOS5440 into PINCTRL_EXYNOS. If PINCTRL_EXYNOS5440 won't eventually move under PINCTRL_EXYNOS then it makes less sense to define PINCTRL_EXYNOS for all exynos parts.

Yeah, it should -- this is just in transition since 5440 was first out of the gate with pinctrl.

-Olof

#4 lore raw

Hi Doug, Olof,

Quoted 3 lines · On Wednesday 08 of May 2013 12:33:34 Olof Johansson wrote:

Hi,

On Wed, May 8, 2013 at 11:48 AM, Doug Anderson <[email protected]>

Quoted 27 lines · wrote:
Quoted 10 lines

Olof,

Quoted 3 lines · Olof Johansson

Seems like this should be selected by the SoC (ARCH_EXYNOS5) instead of the board. Actually, I'm not sure we need the board Kconfig entry long-term; all boards will be dt-only.

Good point. Hopefully someone at Samsung can work on removing the board itself? If you'd like me to take this on then let me know and I can put it on my list.

Nothing stops you from doing that on your own. I tend to push back onto the maintainers to get them engaged in their own housekeeping, but anyone is free to :)

Quoted 2 lines

I'm happy to resubmit my patch under ARCH_EXYNOS5. I'll move the exynos4 one at the same time.

Great.

Quoted 4 lines

I'm going to make the assumption that PINCTRL_EXYNOS and PINCTRL_EXYNOS5440 can happily coexist. Certainly I've got both defined in my tree right now and nothing blows up. I haven't tested on 5440 but things ought to be handled by "compatible" checks, right?

Yes, if they can't coexist then that's a bug.

Quoted 7 lines
Quoted 4 lines

I'll also assume that eventually someone will move PINCTRL_EXYNOS5440 into PINCTRL_EXYNOS. If PINCTRL_EXYNOS5440 won't eventually move under PINCTRL_EXYNOS then it makes less sense to define PINCTRL_EXYNOS for all exynos parts.

Yeah, it should -- this is just in transition since 5440 was first out of the gate with pinctrl.

AFAIK, Exynos5440 contains a completely different pin controller block, which is not compatible with pinctrl-samsung driver, so I don't see any point of moving it under PINCTRL_EXYNOS, which is currently used for Exynos 4210, 4x12 and 5250, but will be also extended with driver data for S5PV210 as well.

I'd say that CPU_EXYNOS4210, SOC_EXYNOS4212, SOC_EXYNOS4412 and SOC_EXYNOS5250 should select PINCTRL_EXYNOS and SOC_EXYNOS5440 should be left as is, selecting PINCTRL_EXYNOS5440.

Best regards,

Signature · 3 lines
Tomasz Figa
Samsung Poland R&D Center
SW Solution Development, Kernel and System Framework
#5 lore raw

Tomasz / Olof,

Quoted 3 lines · Tomasz Figa
Quoted 3 lines

Nothing stops you from doing that on your own. I tend to push back onto the maintainers to get them engaged in their own housekeeping, but anyone is free to :)

I will probably leave this to the maintainers at this point... ;)

Quoted 11 lines
Quoted 2 lines

Yeah, it should -- this is just in transition since 5440 was first out of the gate with pinctrl.

AFAIK, Exynos5440 contains a completely different pin controller block, which is not compatible with pinctrl-samsung driver, so I don't see any point of moving it under PINCTRL_EXYNOS, which is currently used for Exynos 4210, 4x12 and 5250, but will be also extended with driver data for S5PV210 as well.

I'd say that CPU_EXYNOS4210, SOC_EXYNOS4212, SOC_EXYNOS4412 and SOC_EXYNOS5250 should select PINCTRL_EXYNOS and SOC_EXYNOS5440 should be left as is, selecting PINCTRL_EXYNOS5440.

OK, sounds reasonable. I didn't dig into all of the details of the 5440 pin control driver and don't have a user manual in front of me. I will do as you say.

New patch coming shortly.

-Doug

#6 lore raw
Quoted 3 lines · Doug Anderson

Tomasz / Olof,

Hi Doug, Tomasz and Olof

Quoted 12 lines · Tomasz Figa
Quoted 3 lines
Quoted 3 lines

Nothing stops you from doing that on your own. I tend to push back onto the maintainers to get them engaged in their own housekeeping, but anyone is free to :)

I will probably leave this to the maintainers at this point... ;)

Quoted 3 lines
Quoted 2 lines

Yeah, it should -- this is just in transition since 5440 was first out of the gate with pinctrl.

Quoted 7 lines
Quoted 1 line

AFAIK, Exynos5440 contains a completely different pin controller block,

which

Quoted 1 line

is not compatible with pinctrl-samsung driver, so I don't see any point

of

Quoted 1 line

moving it under PINCTRL_EXYNOS, which is currently used for Exynos 4210,

4x12

Quoted 1 line

and 5250, but will be also extended with driver data for S5PV210 as

well.

Quoted 10 lines
Quoted 2 lines

I'd say that CPU_EXYNOS4210, SOC_EXYNOS4212, SOC_EXYNOS4412 and

SOC_EXYNOS5250

Quoted 2 lines

should select PINCTRL_EXYNOS and SOC_EXYNOS5440 should be left as is, selecting PINCTRL_EXYNOS5440.

OK, sounds reasonable. I didn't dig into all of the details of the 5440 pin control driver and don't have a user manual in front of me. I will do as you say.

Tomasz is right. The current exynos pinctrl stuff is quite different with exynos5440 pinctrl, it means there is no reason to move exynos5440 pinctrl under exynos pinctrl. Of course, both can be built together without problem.

Quoted 2 lines

New patch coming shortly.

Thanks, the PINCTRL_EXYNOS can be moved into under SoC condition not board.

- Kukjin

#7 lore raw

PATCH v2 1/1 ARM: exynos: Select PINCTRL_EXYNOS for exynos4/5 at arch level

In reply to Doug Anderson

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.

It's expected that eventually exynos5440 (which seems to have its own pinctrl code) will eventually move over to the common code.

---
Changes in v2:
- Moved to the arch level as suggested by Olof.

 arch/arm/mach-exynos/Kconfig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/Kconfig +4 -3
index 6e77432..7ee58b0 100644
@@ -17,6 +17,8 @@ config ARCH_EXYNOS4
 	select HAVE_ARM_SCU if SMP
 	select HAVE_SMP
 	select MIGHT_HAVE_CACHE_L2X0
+	select PINCTRL
+	select PINCTRL_EXYNOS
 	help
 	  Samsung EXYNOS4 SoCs based systems
 
@@ -24,6 +26,8 @@ config ARCH_EXYNOS5
 	bool "SAMSUNG EXYNOS5"
 	select HAVE_ARM_SCU if SMP
 	select HAVE_SMP
+	select PINCTRL
+	select PINCTRL_EXYNOS
 	help
 	  Samsung EXYNOS5 (Cortex-A15) SoC based systems
 
@@ -78,7 +82,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 +415,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
Signature · 1 line
1.8.2.1
#8 lore raw

PATCH v3 1/1 ARM: exynos: Select PINCTRL_EXYNOS for exynos4/5 at chip level

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.

---
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(-)
arch/arm/mach-exynos/Kconfig +6 -3
index 6e77432..4139d7f 100644
@@ -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
drivers/pinctrl/Kconfig +3 -2
index 8f66924..a1c6dd3 100644
@@ -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
 
Signature · 1 line
1.8.2.1
Acked-by on v3 1/1
#9 lore raw

Re: [PATCH v3] ARM: exynos: Select PINCTRL_EXYNOS for exynos4/5 at chip level

Quoted 8 lines · Doug Anderson

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.

Quoted 8 lines

---
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.

part, I guess this will be merged through the Samsung tree?

Yours,
Linus Walleij

#10 lore raw

RE: [PATCH v3] ARM: exynos: Select PINCTRL_EXYNOS for exynos4/5 at chip level

Quoted 18 lines · Linus Walleij
Quoted 14 lines · Doug Anderson

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.

---
Changes in v3:
- Moved to chip level as per Tomasz.
- Update PINCTRL Kconfig for exynos.

Quoted 6 lines
Quoted 2 lines

Changes in v2:
- Moved to the arch level as suggested by Olof.

part, I guess this will be merged through the Samsung tree?

Linus, thanks for your ack.

Let me take this into samsung tree.

- Kukjin