ARM: shmobile: Conditionally select SMSC_PHY

Select the SMSC_PHY if ethernet is enabled on shmbile boards that have an SMSC phy. This allows the SMSC-specific phy driver to be used rather than relying on generic phy code.

Based on the renesas-devel-v3.13-rc7-20140107 tag
of my renesas tree.

Simon Horman (8):
ARM: shmobile: ape6evm: Conditionally select SMSC_PHY
ARM: shmobile: armadillo800eva: Conditionally select SMSC_PHY
ARM: shmobile: bockw: Sort Kconfig node's selections
ARM: shmobile: bockw: Conditionally select SMSC_PHY
ARM: shmobile: kzm9d: Conditionally select SMSC_PHY
ARM: shmobile: kzm9g: Conditionally select SMSC_PHY
ARM: shmobile: mackerel: Conditionally select SMSC_PHY
ARM: shmobile: marzen: Conditionally select SMSC_PHY

 arch/arm/mach-shmobile/Kconfig | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

1.8.4

The ape6evm board uses has an SMSC911X ethernet controller which uses an SMSC phy. Select SMSC_PHY for ape6evm if SMSC911X is enabled to make use of the SMSC-specific phy driver rather than relying on the generic phy driver.

---
 arch/arm/mach-shmobile/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

index 958ccf3d..2673f68 100644
@@ -156,11 +156,13 @@ comment "Renesas ARM SoCs Board Type"
 config MACH_APE6EVM
 	bool "APE6EVM board"
 	depends on ARCH_R8A73A4
+	select SMSC_PHY if SMSC911X
 	select USE_OF
 
 config MACH_APE6EVM_REFERENCE
 	bool "APE6EVM board - Reference Device Tree Implementation"
 	depends on ARCH_R8A73A4
+	select SMSC_PHY if SMSC911X
 	select USE_OF
 	---help---
 	   Use reference implementation of APE6EVM board support

1.8.4

The armadillo800eva board uses has an SH ethernet controller which uses an SMSC phy. Select SMSC_PHY for koelsch if SH_ETH is enabled to make use of the SMSC-specific phy driver rather than relying on the generic phy driver.

---
 arch/arm/mach-shmobile/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

index 2673f68..b624b5a 100644
@@ -184,6 +184,7 @@ config MACH_ARMADILLO800EVA
 	depends on ARCH_R8A7740
 	select ARCH_REQUIRE_GPIOLIB
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
+	select SMSC_PHY if SH_ETH
 	select SND_SOC_WM8978 if SND_SIMPLE_CARD
 	select USE_OF
 

@@ -192,6 +193,7 @@ config MACH_ARMADILLO800EVA_REFERENCE
 	depends on ARCH_R8A7740
 	select ARCH_REQUIRE_GPIOLIB
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
+	select SMSC_PHY if SH_ETH
 	select SND_SOC_WM8978 if SND_SIMPLE_CARD
 	select USE_OF
 	---help---

1.8.4

---
 arch/arm/mach-shmobile/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index b624b5a..6f16983 100644
@@ -207,11 +207,11 @@ config MACH_BOCKW
 	bool "BOCK-W platform"
 	depends on ARCH_R8A7778
 	select ARCH_REQUIRE_GPIOLIB
-	select RENESAS_INTC_IRQPIN
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
-	select USE_OF
+	select RENESAS_INTC_IRQPIN
 	select SND_SOC_AK4554 if SND_SIMPLE_CARD
 	select SND_SOC_AK4642 if SND_SIMPLE_CARD
+	select USE_OF
 
 config MACH_BOCKW_REFERENCE
 	bool "BOCK-W  - Reference Device Tree Implementation"

1.8.4

The bockw board uses has an SMSC911X ethernet controller which uses an SMSC phy. Select SMSC_PHY for bockw if SMSC911X is enabled to make use of the SMSC-specific phy driver rather than relying on the generic phy driver.

---
 arch/arm/mach-shmobile/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

index 6f16983..fdd274d 100644
@@ -209,6 +209,7 @@ config MACH_BOCKW
 	select ARCH_REQUIRE_GPIOLIB
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 	select RENESAS_INTC_IRQPIN
+	select SMSC_PHY if SMSC911X
 	select SND_SOC_AK4554 if SND_SIMPLE_CARD
 	select SND_SOC_AK4642 if SND_SIMPLE_CARD
 	select USE_OF

@@ -219,6 +220,7 @@ config MACH_BOCKW_REFERENCE
 	select ARCH_REQUIRE_GPIOLIB
 	select RENESAS_INTC_IRQPIN
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
+	select SMSC_PHY if SMSC911X
 	select USE_OF
 	---help---
 	   Use reference implementation of BockW board support

1.8.4

The kzm9d board uses has an SMSC911X ethernet controller which uses an SMSC phy. Select SMSC_PHY for kzm9d if SMSC911X is enabled to make use of the SMSC-specific phy driver rather than relying on the generic phy driver.

This only covers the case of multiplatform kzm9d
as there is currently no Kconfig node for non-multiplatform kzm9d. One could be added if desired.

---
 arch/arm/mach-shmobile/Kconfig | 1 +
 1 file changed, 1 insertion(+)

index fdd274d..e88d2e5 100644
@@ -51,6 +51,7 @@ config MACH_KZM9D
 	bool "KZM9D board"
 	depends on ARCH_EMEV2
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
+	select SMSC_PHY if SMSC911X
 
 config MACH_LAGER
 	bool "Lager board"

1.8.4

The kzm9g board uses has an SMSC911X ethernet controller which uses an SMSC phy. Select SMSC_PHY for kzm9g if SMSC911X is enabled to make use of the SMSC-specific phy driver rather than relying on the generic phy driver.

---
 arch/arm/mach-shmobile/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

index e88d2e5..2ccd597 100644
@@ -285,6 +285,7 @@ config MACH_KZM9G
 	select ARCH_HAS_OPP
 	select ARCH_REQUIRE_GPIOLIB
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
+	select SMSC_PHY if SMSC911X
 	select SND_SOC_AK4642 if SND_SIMPLE_CARD
 	select USE_OF
 

@@ -293,6 +294,7 @@ config MACH_KZM9G_REFERENCE
 	depends on ARCH_SH73A0
 	select ARCH_REQUIRE_GPIOLIB
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
+	select SMSC_PHY if SMSC911X
 	select SND_SOC_AK4642 if SND_SIMPLE_CARD
 	select USE_OF
 	---help---

1.8.4

The mackerel board uses has an SMSC911X ethernet controller which uses an SMSC phy. Select SMSC_PHY for mackerel if SMSC911X is enabled to make use of the SMSC-specific phy driver rather than relying on the generic phy driver.

---
 arch/arm/mach-shmobile/Kconfig | 1 +
 1 file changed, 1 insertion(+)

index 2ccd597..d745b1f 100644
@@ -177,6 +177,7 @@ config MACH_MACKEREL
 	depends on ARCH_SH7372
 	select ARCH_REQUIRE_GPIOLIB
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
+	select SMSC_PHY if SMSC911X
 	select SND_SOC_AK4642 if SND_SIMPLE_CARD
 	select USE_OF
 

1.8.4

The marzen board uses has an SMSC911X ethernet controller which uses an SMSC phy. Select SMSC_PHY for marzen if SMSC911X is enabled to make use of the SMSC-specific phy driver rather than relying on the generic phy driver.

---
 arch/arm/mach-shmobile/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

index d745b1f..8011329 100644
@@ -252,6 +252,7 @@ config MACH_MARZEN
 	depends on ARCH_R8A7779
 	select ARCH_REQUIRE_GPIOLIB
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
+	select SMSC_PHY if SMSC911X
 	select USE_OF
 
 config MACH_MARZEN_REFERENCE

@@ -259,6 +260,7 @@ config MACH_MARZEN_REFERENCE
 	depends on ARCH_R8A7779
 	select ARCH_REQUIRE_GPIOLIB
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
+	select SMSC_PHY if SMSC911X
 	select USE_OF
 	---help---
 	   Use reference implementation of Marzen board support

1.8.4

I have queued up these changes.

I don't have an objection to the patches themselves, but a general feeling that it would be better to have larger combined patches than splitting them out per board.

I'm cautious with this comment because most people seem to do the opposite and combine too many things into large patches, but I think when you have identical changeset comments and change the same Kconfig file in all of them, you can save yourself and the reviewers some work.

Arnd

Thanks, I think that is a reasonable comment.

I expected to be more variance between the changes. And in particular I expected more than one PHY driver to be involved. But as I checked the hardware on each board, wrote a patch and tested it turned out that SMSC was used by all the boards. So I was left with a stack of very similar patches.

In hindsight it might have been better to squash them at that point. But I too am wary of combining too many things into one patch and ended up leaning too far the other way.

As I have already queued them up I'd rather not squash them at this point.

Yes, I wasn't expecting you to.

Arnd

To my surprise I have discovered that the bockw and kzm9g boards do not boot using NFS root if SMSC_PHY enabled. I have dropped the SMSC_PHY patches for those boards pending investigation.

I have now reverted the marzen patch for the same reason.