Skip to contentSkip to conversation

ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY

PATCH In review Laurent Pinchart 4 participants 15 messages Nov 9, 2013 – Dec 9, 2013

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

cover ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY

Hello,

This patch series enables compilation of SH-Mobile drivers on both the non-multiplatform (ARCH_SHMOBILE) and the multiplatform (ARCH_SHMOBILE_MULTI) SH-Mobile architectures. To do so it renames ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY and creates a new ARCH_SHMOBILE symbol selected by both ARCH_SHMOBILE_MULTI and ARCH_SHMOBILE_LEGACY.

The second patch adds a dependency on ARCH_SHMOBILE_LEGACY to the ASoC R-Car driver. It can be squashed with the first patch or applied separately to minimize the risk of conflicts if desired.

Laurent Pinchart (2):
ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY
ASoC: sh: rcar: Depend on ARCH_SHMOBILE_LEGACY

 arch/arm/Kconfig                  | 14 ++++++++------
 arch/arm/Makefile                 |  1 -
 arch/arm/boot/compressed/Makefile |  2 +-
 arch/arm/boot/dts/Makefile        |  2 +-
 arch/arm/mach-shmobile/Kconfig    |  8 ++++++--
 drivers/Makefile                  |  2 +-
 sound/soc/sh/Kconfig              |  1 +
 7 files changed, 18 insertions(+), 12 deletions(-)
Signature · 3 lines
Regards,

Laurent Pinchart
#1 lore raw

PATCH 1/2 ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY

SH-Mobile platforms are transitioning from non-multiplatform to multiplatform kernel. A new ARCH_SHMOBILE_MULTI configuration symbol has been created to group all multiplatform-enabled SH-Mobile SoCs. The existing ARCH_SHMOBILE configuration symbol groups SoCs that haven't been converted yet.

This arrangement works fine for the arch/ code, but lots of drivers needed on both ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI depend on ARCH_SHMOBILE only. In order to avoid changing them, rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY, and create a new boolean ARCH_SHMOBILE configuration symbol that is selected by both ARCH_SHMOBILE_LEGACY and ARCH_SHMOBILE_MULTI.

---
 arch/arm/Kconfig                  | 14 ++++++++------
 arch/arm/Makefile                 |  1 -
 arch/arm/boot/compressed/Makefile |  2 +-
 arch/arm/boot/dts/Makefile        |  2 +-
 arch/arm/mach-shmobile/Kconfig    |  8 ++++++--
 drivers/Makefile                  |  2 +-
 6 files changed, 17 insertions(+), 12 deletions(-)
arch/arm/Kconfig +8 -6
index 1ad6fb6..588b46b 100644
@@ -642,8 +642,9 @@ config ARCH_MSM
 	  stack and controls some vital subsystems
 	  (clock and power control, etc).
 
-config ARCH_SHMOBILE
-	bool "Renesas SH-Mobile / R-Mobile"
+config ARCH_SHMOBILE_LEGACY
+	bool "Renesas SH-Mobile / R-Mobile (non-multiplatform)"
+	select ARCH_SHMOBILE
 	select ARM_PATCH_PHYS_VIRT
 	select CLKDEV_LOOKUP
 	select GENERIC_CLOCKEVENTS
@@ -659,7 +660,8 @@ config ARCH_SHMOBILE
 	select PM_GENERIC_DOMAINS if PM
 	select SPARSE_IRQ
 	help
-	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms.
+	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms using
+	  a non-multiplatform kernel.
 
 config ARCH_RPC
 	bool "RiscPC"
@@ -1619,7 +1621,7 @@ config HZ_FIXED
 	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \
 		ARCH_S5PV210 || ARCH_EXYNOS4
 	default AT91_TIMER_HZ if ARCH_AT91
-	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
+	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY
 	default 0
 
 choice
@@ -1800,8 +1802,8 @@ config ARCH_WANT_GENERAL_HUGETLB
 source "mm/Kconfig"
 
 config FORCE_MAX_ZONEORDER
-	int "Maximum zone order" if ARCH_SHMOBILE
-	range 11 64 if ARCH_SHMOBILE
+	int "Maximum zone order" if ARCH_SHMOBILE_LEGACY
+	range 11 64 if ARCH_SHMOBILE_LEGACY
 	default "12" if SOC_AM33XX
 	default "9" if SA1111
 	default "11"
arch/arm/Makefile +0 -1
index db50b62..dca2e84 100644
@@ -190,7 +190,6 @@ machine-$(CONFIG_ARCH_S5PV210)		+= s5pv210
 machine-$(CONFIG_ARCH_SA1100)		+= sa1100
 machine-$(CONFIG_ARCH_SHARK)		+= shark
 machine-$(CONFIG_ARCH_SHMOBILE) 	+= shmobile
-machine-$(CONFIG_ARCH_SHMOBILE_MULTI) 	+= shmobile
 machine-$(CONFIG_ARCH_SIRF)		+= prima2
 machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga
 machine-$(CONFIG_ARCH_STI)		+= sti
arch/arm/boot/compressed/Makefile +1 -1
index 7ac1610..bafbb4c7 100644
@@ -68,7 +68,7 @@ else
 endif
 endif
 
-ifeq ($(CONFIG_ARCH_SHMOBILE),y)
+ifeq ($(CONFIG_ARCH_SHMOBILE_LEGACY),y)
 OBJS		+= head-shmobile.o
 endif
 
arch/arm/boot/dts/Makefile +1 -1
index 891b724..7d98d3a 100644
@@ -197,7 +197,7 @@ dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
 	ste-ccu8540.dtb \
 	ste-ccu9540.dtb
 dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
-dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
+dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
 	r7s72100-genmai.dtb \
 	r8a7740-armadillo800eva.dtb \
 	r8a7778-bockw.dtb \
arch/arm/mach-shmobile/Kconfig +6 -2
index 4bb548f..b31ceda 100644
@@ -1,6 +1,10 @@
+config ARCH_SHMOBILE
+	bool
+
 config ARCH_SHMOBILE_MULTI
 	bool "SH-Mobile Series" if ARCH_MULTI_V7
 	depends on MMU
+	select ARCH_SHMOBILE
 	select CPU_V7
 	select GENERIC_CLOCKEVENTS
 	select HAVE_ARM_SCU if SMP
@@ -30,7 +34,7 @@ config MACH_KZM9D
 comment "SH-Mobile System Configuration"
 endif
 
-if ARCH_SHMOBILE
+if ARCH_SHMOBILE_LEGACY
 
 comment "SH-Mobile System Type"
 
@@ -288,7 +292,7 @@ source "drivers/sh/Kconfig"
 
 endif
 
-if ARCH_SHMOBILE || ARCH_SHMOBILE_MULTI
+if ARCH_SHMOBILE
 
 menu "Timer and clock configuration"
 
drivers/Makefile +1 -1
index ab93de8..8a50222 100644
@@ -116,7 +116,7 @@ obj-$(CONFIG_SGI_SN)		+= sn/
 obj-y				+= firmware/
 obj-$(CONFIG_CRYPTO)		+= crypto/
 obj-$(CONFIG_SUPERH)		+= sh/
-obj-$(CONFIG_ARCH_SHMOBILE)	+= sh/
+obj-$(CONFIG_ARCH_SHMOBILE_LEGACY)	+= sh/
 ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
 obj-y				+= clocksource/
 endif
Signature · 1 line
1.8.1.5
#2 lore raw
Quoted 13 lines · Laurent Pinchart

SH-Mobile platforms are transitioning from non-multiplatform to multiplatform kernel. A new ARCH_SHMOBILE_MULTI configuration symbol has been created to group all multiplatform-enabled SH-Mobile SoCs. The existing ARCH_SHMOBILE configuration symbol groups SoCs that haven't been converted yet.

This arrangement works fine for the arch/ code, but lots of drivers needed on both ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI depend on ARCH_SHMOBILE only. In order to avoid changing them, rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY, and create a new boolean ARCH_SHMOBILE configuration symbol that is selected by both ARCH_SHMOBILE_LEGACY and ARCH_SHMOBILE_MULTI.

Quoted 2 lines

Thanks, I have queued this up.

#3 lore raw
Quoted 14 lines · Simon Horman
Quoted 13 lines · Laurent Pinchart

SH-Mobile platforms are transitioning from non-multiplatform to multiplatform kernel. A new ARCH_SHMOBILE_MULTI configuration symbol has been created to group all multiplatform-enabled SH-Mobile SoCs. The existing ARCH_SHMOBILE configuration symbol groups SoCs that haven't been converted yet.

This arrangement works fine for the arch/ code, but lots of drivers needed on both ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI depend on ARCH_SHMOBILE only. In order to avoid changing them, rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY, and create a new boolean ARCH_SHMOBILE configuration symbol that is selected by both ARCH_SHMOBILE_LEGACY and ARCH_SHMOBILE_MULTI.

Quoted 4 lines
Quoted 2 lines

Thanks, I have queued this up.

I have dropped this for now as it seems that all of the shmobile defconfigs now need to be updated to use ARCH_SHMOBILE_LEGACY instead of ARCH_SHMOBILE.

It seems to me that needs to be part of this patch to avoid breaking bisecatability. Any thoughts?

#4 lore raw

PATCH 1/2 ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY

Hi Simon,

Quoted 19 lines · On Tuesday 12 November 2013 14:26:25 Simon Horman wrote:
Quoted 18 lines · Simon Horman
Quoted 16 lines · Laurent Pinchart

SH-Mobile platforms are transitioning from non-multiplatform to multiplatform kernel. A new ARCH_SHMOBILE_MULTI configuration symbol has been created to group all multiplatform-enabled SH-Mobile SoCs. The existing ARCH_SHMOBILE configuration symbol groups SoCs that haven't been converted yet.

This arrangement works fine for the arch/ code, but lots of drivers needed on both ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI depend on ARCH_SHMOBILE only. In order to avoid changing them, rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY, and create a new boolean ARCH_SHMOBILE configuration symbol that is selected by both ARCH_SHMOBILE_LEGACY and ARCH_SHMOBILE_MULTI.

Signed-off-by: Laurent Pinchart
<[email protected]>

Quoted 5 lines
Quoted 1 line

Thanks, I have queued this up.

I have dropped this for now as it seems that all of the shmobile defconfigs now need to be updated to use ARCH_SHMOBILE_LEGACY instead of ARCH_SHMOBILE.

Indeed, I forgot about that.

Quoted 2 lines

It seems to me that needs to be part of this patch to avoid breaking bisecatability. Any thoughts?

The only bisection this would break is the defconfig bisection. I'm not sure whether we need to care about that, Would that be a bit issue ? I'll submit a separate patch, please feel free to squash it with this one if you believe it should be.

Signature · 3 lines
Regards,

Laurent Pinchart
#5 lore raw

PATCH 1/2 ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY

Quoted 30 lines · Laurent Pinchart

Hi Simon,

Quoted 19 lines · On Tuesday 12 November 2013 14:26:25 Simon Horman wrote:
Quoted 18 lines · Simon Horman
Quoted 16 lines · Laurent Pinchart

SH-Mobile platforms are transitioning from non-multiplatform to multiplatform kernel. A new ARCH_SHMOBILE_MULTI configuration symbol has been created to group all multiplatform-enabled SH-Mobile SoCs. The existing ARCH_SHMOBILE configuration symbol groups SoCs that haven't been converted yet.

This arrangement works fine for the arch/ code, but lots of drivers needed on both ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI depend on ARCH_SHMOBILE only. In order to avoid changing them, rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY, and create a new boolean ARCH_SHMOBILE configuration symbol that is selected by both ARCH_SHMOBILE_LEGACY and ARCH_SHMOBILE_MULTI.

Signed-off-by: Laurent Pinchart
<[email protected]>

Quoted 5 lines
Quoted 1 line

Thanks, I have queued this up.

I have dropped this for now as it seems that all of the shmobile defconfigs now need to be updated to use ARCH_SHMOBILE_LEGACY instead of ARCH_SHMOBILE.

Indeed, I forgot about that.

Quoted 7 lines
Quoted 2 lines

It seems to me that needs to be part of this patch to avoid breaking bisecatability. Any thoughts?

The only bisection this would break is the defconfig bisection. I'm not sure whether we need to care about that, Would that be a bit issue ? I'll submit a separate patch, please feel free to squash it with this one if you believe it should be.

To be honest I'm unsure.
But I think that I am leaning towards keeping the patches separate.

#6 lore raw

PATCH 1/2 ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY

Hi Simon,

Quoted 32 lines · On Wednesday 13 November 2013 09:53:29 Simon Horman wrote:
Quoted 31 lines · Laurent Pinchart
Quoted 19 lines · On Tuesday 12 November 2013 14:26:25 Simon Horman wrote:
Quoted 18 lines · Simon Horman
Quoted 16 lines · Laurent Pinchart

SH-Mobile platforms are transitioning from non-multiplatform to multiplatform kernel. A new ARCH_SHMOBILE_MULTI configuration symbol has been created to group all multiplatform-enabled SH-Mobile SoCs. The existing ARCH_SHMOBILE configuration symbol groups SoCs that haven't been converted yet.

This arrangement works fine for the arch/ code, but lots of drivers needed on both ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI depend on ARCH_SHMOBILE only. In order to avoid changing them, rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY, and create a new boolean ARCH_SHMOBILE configuration symbol that is selected by both ARCH_SHMOBILE_LEGACY and ARCH_SHMOBILE_MULTI.

Signed-off-by: Laurent Pinchart
<[email protected]>

Quoted 5 lines
Quoted 1 line

Thanks, I have queued this up.

I have dropped this for now as it seems that all of the shmobile defconfigs now need to be updated to use ARCH_SHMOBILE_LEGACY instead of ARCH_SHMOBILE.

Indeed, I forgot about that.

Quoted 2 lines

It seems to me that needs to be part of this patch to avoid breaking bisecatability. Any thoughts?

Quoted 7 lines
Quoted 4 lines

The only bisection this would break is the defconfig bisection. I'm not sure whether we need to care about that, Would that be a bit issue ? I'll submit a separate patch, please feel free to squash it with this one if you believe it should be.

To be honest I'm unsure.
But I think that I am leaning towards keeping the patches separate.

You got both patches, it's your call ;-)

Signature · 3 lines
Regards,

Laurent Pinchart
#7 lore raw

PATCH 1/2 ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY

Quoted 40 lines · Laurent Pinchart

Hi Simon,

Quoted 37 lines · On Wednesday 13 November 2013 09:53:29 Simon Horman wrote:
Quoted 35 lines · Laurent Pinchart
Quoted 19 lines · On Tuesday 12 November 2013 14:26:25 Simon Horman wrote:
Quoted 18 lines · Simon Horman
Quoted 16 lines · Laurent Pinchart

SH-Mobile platforms are transitioning from non-multiplatform to multiplatform kernel. A new ARCH_SHMOBILE_MULTI configuration symbol has been created to group all multiplatform-enabled SH-Mobile SoCs. The existing ARCH_SHMOBILE configuration symbol groups SoCs that haven't been converted yet.

This arrangement works fine for the arch/ code, but lots of drivers needed on both ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI depend on ARCH_SHMOBILE only. In order to avoid changing them, rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY, and create a new boolean ARCH_SHMOBILE configuration symbol that is selected by both ARCH_SHMOBILE_LEGACY and ARCH_SHMOBILE_MULTI.

Signed-off-by: Laurent Pinchart
<[email protected]>

Quoted 5 lines
Quoted 1 line

Thanks, I have queued this up.

I have dropped this for now as it seems that all of the shmobile defconfigs now need to be updated to use ARCH_SHMOBILE_LEGACY instead of ARCH_SHMOBILE.

Indeed, I forgot about that.

Quoted 2 lines

It seems to me that needs to be part of this patch to avoid breaking bisecatability. Any thoughts?

The only bisection this would break is the defconfig bisection. I'm not sure whether we need to care about that, Would that be a bit issue ? I'll submit a separate patch, please feel free to squash it with this one if you believe it should be.

Quoted 4 lines
Quoted 2 lines

To be honest I'm unsure.
But I think that I am leaning towards keeping the patches separate.

You got both patches, it's your call ;-)

I have decided to try the squash option which I have now done and queued up the following:

From: Laurent Pinchart <[email protected]>

[PATCH] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY

SH-Mobile platforms are transitioning from non-multiplatform to multiplatform kernel. A new ARCH_SHMOBILE_MULTI configuration symbol has been created to group all multiplatform-enabled SH-Mobile SoCs. The existing ARCH_SHMOBILE configuration symbol groups SoCs that haven't been converted yet.

This arrangement works fine for the arch/ code, but lots of drivers needed on both ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI depend on ARCH_SHMOBILE only. In order to avoid changing them, rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY, and create a new boolean ARCH_SHMOBILE configuration symbol that is selected by both ARCH_SHMOBILE_LEGACY and ARCH_SHMOBILE_MULTI.

---
 arch/arm/Kconfig                  | 14 ++++++++------
 arch/arm/Makefile                 |  1 -
 arch/arm/boot/compressed/Makefile |  2 +-
 arch/arm/boot/dts/Makefile        |  2 +-
 arch/arm/mach-shmobile/Kconfig    |  8 ++++++--
 drivers/Makefile                  |  2 +-
 6 files changed, 17 insertions(+), 12 deletions(-)
arch/arm/Kconfig +8 -6
index 1ad6fb6..588b46b 100644
@@ -642,8 +642,9 @@ config ARCH_MSM
 	  stack and controls some vital subsystems
 	  (clock and power control, etc).
 
-config ARCH_SHMOBILE
-	bool "Renesas SH-Mobile / R-Mobile"
+config ARCH_SHMOBILE_LEGACY
+	bool "Renesas SH-Mobile / R-Mobile (non-multiplatform)"
+	select ARCH_SHMOBILE
 	select ARM_PATCH_PHYS_VIRT
 	select CLKDEV_LOOKUP
 	select GENERIC_CLOCKEVENTS
@@ -659,7 +660,8 @@ config ARCH_SHMOBILE
 	select PM_GENERIC_DOMAINS if PM
 	select SPARSE_IRQ
 	help
-	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms.
+	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms using
+	  a non-multiplatform kernel.
 
 config ARCH_RPC
 	bool "RiscPC"
@@ -1619,7 +1621,7 @@ config HZ_FIXED
 	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \
 		ARCH_S5PV210 || ARCH_EXYNOS4
 	default AT91_TIMER_HZ if ARCH_AT91
-	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
+	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY
 	default 0
 
 choice
@@ -1800,8 +1802,8 @@ config ARCH_WANT_GENERAL_HUGETLB
 source "mm/Kconfig"
 
 config FORCE_MAX_ZONEORDER
-	int "Maximum zone order" if ARCH_SHMOBILE
-	range 11 64 if ARCH_SHMOBILE
+	int "Maximum zone order" if ARCH_SHMOBILE_LEGACY
+	range 11 64 if ARCH_SHMOBILE_LEGACY
 	default "12" if SOC_AM33XX
 	default "9" if SA1111
 	default "11"
arch/arm/Makefile +0 -1
index db50b62..dca2e84 100644
@@ -190,7 +190,6 @@ machine-$(CONFIG_ARCH_S5PV210)		+= s5pv210
 machine-$(CONFIG_ARCH_SA1100)		+= sa1100
 machine-$(CONFIG_ARCH_SHARK)		+= shark
 machine-$(CONFIG_ARCH_SHMOBILE) 	+= shmobile
-machine-$(CONFIG_ARCH_SHMOBILE_MULTI) 	+= shmobile
 machine-$(CONFIG_ARCH_SIRF)		+= prima2
 machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga
 machine-$(CONFIG_ARCH_STI)		+= sti
arch/arm/boot/compressed/Makefile +1 -1
index 7ac1610..bafbb4c7 100644
@@ -68,7 +68,7 @@ else
 endif
 endif
 
-ifeq ($(CONFIG_ARCH_SHMOBILE),y)
+ifeq ($(CONFIG_ARCH_SHMOBILE_LEGACY),y)
 OBJS		+= head-shmobile.o
 endif
 
arch/arm/boot/dts/Makefile +1 -1
index 6ff3139..7f36e22 100644
@@ -197,7 +197,7 @@ dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
 	ste-ccu8540.dtb \
 	ste-ccu9540.dtb
 dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
-dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
+dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
 	r7s72100-genmai.dtb \
 	r8a7740-armadillo800eva.dtb \
 	r8a7778-bockw.dtb \
arch/arm/mach-shmobile/Kconfig +6 -2
index 180b71f..1b7df17 100644
@@ -1,6 +1,10 @@
+config ARCH_SHMOBILE
+	bool
+
 config ARCH_SHMOBILE_MULTI
 	bool "SH-Mobile Series" if ARCH_MULTI_V7
 	depends on MMU
+	select ARCH_SHMOBILE
 	select CPU_V7
 	select GENERIC_CLOCKEVENTS
 	select HAVE_ARM_SCU if SMP
@@ -30,7 +34,7 @@ config MACH_KZM9D
 comment "SH-Mobile System Configuration"
 endif
 
-if ARCH_SHMOBILE
+if ARCH_SHMOBILE_LEGACY
 
 comment "SH-Mobile System Type"
 
@@ -272,7 +276,7 @@ source "drivers/sh/Kconfig"
 
 endif
 
-if ARCH_SHMOBILE || ARCH_SHMOBILE_MULTI
+if ARCH_SHMOBILE
 
 menu "Timer and clock configuration"
 
drivers/Makefile +1 -1
index ab93de8..8a50222 100644
@@ -116,7 +116,7 @@ obj-$(CONFIG_SGI_SN)		+= sn/
 obj-y				+= firmware/
 obj-$(CONFIG_CRYPTO)		+= crypto/
 obj-$(CONFIG_SUPERH)		+= sh/
-obj-$(CONFIG_ARCH_SHMOBILE)	+= sh/
+obj-$(CONFIG_ARCH_SHMOBILE_LEGACY)	+= sh/
 ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
 obj-y				+= clocksource/
 endif
Signature · 1 line
1.8.4
#8 lore raw

PATCH 1/2 ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY

Hi Simon,

Quoted 40 lines · On Tuesday 19 November 2013 10:45:40 Simon Horman wrote:
Quoted 39 lines · Laurent Pinchart
Quoted 38 lines · On Wednesday 13 November 2013 09:53:29 Simon Horman wrote:
Quoted 36 lines · Laurent Pinchart
Quoted 19 lines · On Tuesday 12 November 2013 14:26:25 Simon Horman wrote:
Quoted 18 lines · Simon Horman
Quoted 16 lines · Laurent Pinchart

SH-Mobile platforms are transitioning from non-multiplatform to multiplatform kernel. A new ARCH_SHMOBILE_MULTI configuration symbol has been created to group all multiplatform-enabled SH- Mobile SoCs. The existing ARCH_SHMOBILE configuration symbol groups SoCs that haven't been converted yet.

This arrangement works fine for the arch/ code, but lots of drivers needed on both ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI depend on ARCH_SHMOBILE only. In order to avoid changing them, rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY, and create a new boolean ARCH_SHMOBILE configuration symbol that is selected by both ARCH_SHMOBILE_LEGACY and ARCH_SHMOBILE_MULTI.

Signed-off-by: Laurent Pinchart
<[email protected]>

Quoted 6 lines
Quoted 1 line

Thanks, I have queued this up.

I have dropped this for now as it seems that all of the shmobile defconfigs now need to be updated to use ARCH_SHMOBILE_LEGACY
instead of ARCH_SHMOBILE.

Indeed, I forgot about that.

Quoted 2 lines

It seems to me that needs to be part of this patch to avoid breaking bisecatability. Any thoughts?

The only bisection this would break is the defconfig bisection. I'm not sure whether we need to care about that, Would that be a bit issue ? I'll submit a separate patch, please feel free to squash it with this one if you believe it should be.

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

To be honest I'm unsure.
But I think that I am leaning towards keeping the patches separate.

You got both patches, it's your call ;-)

I have decided to try the squash option which I have now done and queued up the following:

The following patch isn't a squashed version of 1/2 and 3/2 :-)

Quoted 159 lines

From: Laurent Pinchart <[email protected]>

[PATCH] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY

SH-Mobile platforms are transitioning from non-multiplatform to multiplatform kernel. A new ARCH_SHMOBILE_MULTI configuration symbol has been created to group all multiplatform-enabled SH-Mobile SoCs. The existing ARCH_SHMOBILE configuration symbol groups SoCs that haven't been converted yet.

This arrangement works fine for the arch/ code, but lots of drivers needed on both ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI depend on ARCH_SHMOBILE only. In order to avoid changing them, rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY, and create a new boolean ARCH_SHMOBILE configuration symbol that is selected by both ARCH_SHMOBILE_LEGACY and ARCH_SHMOBILE_MULTI.

---
 arch/arm/Kconfig                  | 14 ++++++++------
 arch/arm/Makefile                 |  1 -
 arch/arm/boot/compressed/Makefile |  2 +-
 arch/arm/boot/dts/Makefile        |  2 +-
 arch/arm/mach-shmobile/Kconfig    |  8 ++++++--
 drivers/Makefile                  |  2 +-
 6 files changed, 17 insertions(+), 12 deletions(-)
arch/arm/Kconfig +8 -6
index 1ad6fb6..588b46b 100644
@@ -642,8 +642,9 @@ config ARCH_MSM
 	  stack and controls some vital subsystems
 	  (clock and power control, etc).
 
-config ARCH_SHMOBILE
-	bool "Renesas SH-Mobile / R-Mobile"
+config ARCH_SHMOBILE_LEGACY
+	bool "Renesas SH-Mobile / R-Mobile (non-multiplatform)"
+	select ARCH_SHMOBILE
 	select ARM_PATCH_PHYS_VIRT
 	select CLKDEV_LOOKUP
 	select GENERIC_CLOCKEVENTS
@@ -659,7 +660,8 @@ config ARCH_SHMOBILE
 	select PM_GENERIC_DOMAINS if PM
 	select SPARSE_IRQ
 	help
-	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms.
+	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms using
+	  a non-multiplatform kernel.
 
 config ARCH_RPC
 	bool "RiscPC"
@@ -1619,7 +1621,7 @@ config HZ_FIXED
 	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \
 		ARCH_S5PV210 || ARCH_EXYNOS4
 	default AT91_TIMER_HZ if ARCH_AT91
-	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
+	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY
 	default 0
 
 choice
@@ -1800,8 +1802,8 @@ config ARCH_WANT_GENERAL_HUGETLB
 source "mm/Kconfig"
 
 config FORCE_MAX_ZONEORDER
-	int "Maximum zone order" if ARCH_SHMOBILE
-	range 11 64 if ARCH_SHMOBILE
+	int "Maximum zone order" if ARCH_SHMOBILE_LEGACY
+	range 11 64 if ARCH_SHMOBILE_LEGACY
 	default "12" if SOC_AM33XX
 	default "9" if SA1111
 	default "11"
arch/arm/Makefile +0 -1
index db50b62..dca2e84 100644
@@ -190,7 +190,6 @@ machine-$(CONFIG_ARCH_S5PV210)		+= s5pv210
 machine-$(CONFIG_ARCH_SA1100)		+= sa1100
 machine-$(CONFIG_ARCH_SHARK)		+= shark
 machine-$(CONFIG_ARCH_SHMOBILE) 	+= shmobile
-machine-$(CONFIG_ARCH_SHMOBILE_MULTI) 	+= shmobile
 machine-$(CONFIG_ARCH_SIRF)		+= prima2
 machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga
 machine-$(CONFIG_ARCH_STI)		+= sti
(quoted diff) +0 -0

b/arch/arm/boot/compressed/Makefile index 7ac1610..bafbb4c7 100644

arch/arm/boot/compressed/Makefile +1 -1
@@ -68,7 +68,7 @@ else
 endif
 endif
 
-ifeq ($(CONFIG_ARCH_SHMOBILE),y)
+ifeq ($(CONFIG_ARCH_SHMOBILE_LEGACY),y)
 OBJS		+= head-shmobile.o
 endif
 
arch/arm/boot/dts/Makefile +1 -1
index 6ff3139..7f36e22 100644
@@ -197,7 +197,7 @@ dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
 	ste-ccu8540.dtb \
 	ste-ccu9540.dtb
 dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
-dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
+dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
 	r7s72100-genmai.dtb \
 	r8a7740-armadillo800eva.dtb \
 	r8a7778-bockw.dtb \
arch/arm/mach-shmobile/Kconfig +6 -2
index 180b71f..1b7df17 100644
@@ -1,6 +1,10 @@
+config ARCH_SHMOBILE
+	bool
+
 config ARCH_SHMOBILE_MULTI
 	bool "SH-Mobile Series" if ARCH_MULTI_V7
 	depends on MMU
+	select ARCH_SHMOBILE
 	select CPU_V7
 	select GENERIC_CLOCKEVENTS
 	select HAVE_ARM_SCU if SMP
@@ -30,7 +34,7 @@ config MACH_KZM9D
 comment "SH-Mobile System Configuration"
 endif
 
-if ARCH_SHMOBILE
+if ARCH_SHMOBILE_LEGACY
 
 comment "SH-Mobile System Type"
 
@@ -272,7 +276,7 @@ source "drivers/sh/Kconfig"
 
 endif
 
-if ARCH_SHMOBILE || ARCH_SHMOBILE_MULTI
+if ARCH_SHMOBILE
 
 menu "Timer and clock configuration"
 
drivers/Makefile +1 -1
index ab93de8..8a50222 100644
@@ -116,7 +116,7 @@ obj-$(CONFIG_SGI_SN)		+= sn/
 obj-y				+= firmware/
 obj-$(CONFIG_CRYPTO)		+= crypto/
 obj-$(CONFIG_SUPERH)		+= sh/
-obj-$(CONFIG_ARCH_SHMOBILE)	+= sh/
+obj-$(CONFIG_ARCH_SHMOBILE_LEGACY)	+= sh/
 ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
 obj-y				+= clocksource/
 endif
Signature · 3 lines
Regards,

Laurent Pinchart
#9 lore raw

PATCH 1/2 ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY

Quoted 46 lines · Laurent Pinchart

Hi Simon,

Quoted 43 lines · On Tuesday 19 November 2013 10:45:40 Simon Horman wrote:
Quoted 42 lines · Laurent Pinchart
Quoted 40 lines · On Wednesday 13 November 2013 09:53:29 Simon Horman wrote:
Quoted 29 lines · Laurent Pinchart
Quoted 19 lines · On Tuesday 12 November 2013 14:26:25 Simon Horman wrote:
Quoted 18 lines · Simon Horman
Quoted 16 lines · Laurent Pinchart

SH-Mobile platforms are transitioning from non-multiplatform to multiplatform kernel. A new ARCH_SHMOBILE_MULTI configuration symbol has been created to group all multiplatform-enabled SH- Mobile SoCs. The existing ARCH_SHMOBILE configuration symbol groups SoCs that haven't been converted yet.

This arrangement works fine for the arch/ code, but lots of drivers needed on both ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI depend on ARCH_SHMOBILE only. In order to avoid changing them, rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY, and create a new boolean ARCH_SHMOBILE configuration symbol that is selected by both ARCH_SHMOBILE_LEGACY and ARCH_SHMOBILE_MULTI.

Signed-off-by: Laurent Pinchart
<[email protected]>

Quoted 6 lines
Quoted 1 line

Thanks, I have queued this up.

I have dropped this for now as it seems that all of the shmobile defconfigs now need to be updated to use ARCH_SHMOBILE_LEGACY
instead of ARCH_SHMOBILE.

Indeed, I forgot about that.

Quoted 7 lines
Quoted 2 lines

It seems to me that needs to be part of this patch to avoid breaking bisecatability. Any thoughts?

The only bisection this would break is the defconfig bisection. I'm not sure whether we need to care about that, Would that be a bit issue ? I'll submit a separate patch, please feel free to squash it with this one if you believe it should be.

To be honest I'm unsure.
But I think that I am leaning towards keeping the patches separate.

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

You got both patches, it's your call ;-)

I have decided to try the squash option which I have now done and queued up the following:

The following patch isn't a squashed version of 1/2 and 3/2 :-)

True! Thanks for checking.

Here is what I have now:

Quoted 1 line

From 4b83ab62e154857e7fb2353a43ea02afc6783b6e Mon Sep 17 00:00:00 2001

From: Laurent Pinchart <[email protected]>
Date: Sat, 9 Nov 2013 13:33:48 +0100
Subject: [PATCH] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY

SH-Mobile platforms are transitioning from non-multiplatform to multiplatform kernel. A new ARCH_SHMOBILE_MULTI configuration symbol has been created to group all multiplatform-enabled SH-Mobile SoCs. The existing ARCH_SHMOBILE configuration symbol groups SoCs that haven't been converted yet.

This arrangement works fine for the arch/ code, but lots of drivers needed on both ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI depend on ARCH_SHMOBILE only. In order to avoid changing them, rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY, and create a new boolean ARCH_SHMOBILE configuration symbol that is selected by both ARCH_SHMOBILE_LEGACY and ARCH_SHMOBILE_MULTI.

---
 arch/arm/Kconfig                           | 14 ++++++++------
 arch/arm/Makefile                          |  1 -
 arch/arm/boot/compressed/Makefile          |  2 +-
 arch/arm/boot/dts/Makefile                 |  2 +-
 arch/arm/configs/ape6evm_defconfig         |  2 +-
 arch/arm/configs/armadillo800eva_defconfig |  2 +-
 arch/arm/configs/bockw_defconfig           |  2 +-
 arch/arm/configs/genmai_defconfig          |  2 +-
 arch/arm/configs/koelsch_defconfig         |  2 +-
 arch/arm/configs/kzm9d_defconfig           |  2 +-
 arch/arm/configs/kzm9g_defconfig           |  2 +-
 arch/arm/configs/lager_defconfig           |  2 +-
 arch/arm/configs/mackerel_defconfig        |  2 +-
 arch/arm/configs/marzen_defconfig          |  2 +-
 arch/arm/mach-shmobile/Kconfig             |  8 ++++++--
 drivers/Makefile                           |  2 +-
 16 files changed, 27 insertions(+), 22 deletions(-)
arch/arm/Kconfig +8 -6
index 1ad6fb6..588b46b 100644
@@ -642,8 +642,9 @@ config ARCH_MSM
 	  stack and controls some vital subsystems
 	  (clock and power control, etc).
 
-config ARCH_SHMOBILE
-	bool "Renesas SH-Mobile / R-Mobile"
+config ARCH_SHMOBILE_LEGACY
+	bool "Renesas SH-Mobile / R-Mobile (non-multiplatform)"
+	select ARCH_SHMOBILE
 	select ARM_PATCH_PHYS_VIRT
 	select CLKDEV_LOOKUP
 	select GENERIC_CLOCKEVENTS
@@ -659,7 +660,8 @@ config ARCH_SHMOBILE
 	select PM_GENERIC_DOMAINS if PM
 	select SPARSE_IRQ
 	help
-	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms.
+	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms using
+	  a non-multiplatform kernel.
 
 config ARCH_RPC
 	bool "RiscPC"
@@ -1619,7 +1621,7 @@ config HZ_FIXED
 	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \
 		ARCH_S5PV210 || ARCH_EXYNOS4
 	default AT91_TIMER_HZ if ARCH_AT91
-	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
+	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY
 	default 0
 
 choice
@@ -1800,8 +1802,8 @@ config ARCH_WANT_GENERAL_HUGETLB
 source "mm/Kconfig"
 
 config FORCE_MAX_ZONEORDER
-	int "Maximum zone order" if ARCH_SHMOBILE
-	range 11 64 if ARCH_SHMOBILE
+	int "Maximum zone order" if ARCH_SHMOBILE_LEGACY
+	range 11 64 if ARCH_SHMOBILE_LEGACY
 	default "12" if SOC_AM33XX
 	default "9" if SA1111
 	default "11"
arch/arm/Makefile +0 -1
index db50b62..dca2e84 100644
@@ -190,7 +190,6 @@ machine-$(CONFIG_ARCH_S5PV210)		+= s5pv210
 machine-$(CONFIG_ARCH_SA1100)		+= sa1100
 machine-$(CONFIG_ARCH_SHARK)		+= shark
 machine-$(CONFIG_ARCH_SHMOBILE) 	+= shmobile
-machine-$(CONFIG_ARCH_SHMOBILE_MULTI) 	+= shmobile
 machine-$(CONFIG_ARCH_SIRF)		+= prima2
 machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga
 machine-$(CONFIG_ARCH_STI)		+= sti
arch/arm/boot/compressed/Makefile +1 -1
index 7ac1610..bafbb4c7 100644
@@ -68,7 +68,7 @@ else
 endif
 endif
 
-ifeq ($(CONFIG_ARCH_SHMOBILE),y)
+ifeq ($(CONFIG_ARCH_SHMOBILE_LEGACY),y)
 OBJS		+= head-shmobile.o
 endif
 
arch/arm/boot/dts/Makefile +1 -1
index 6ff3139..7f36e22 100644
@@ -197,7 +197,7 @@ dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
 	ste-ccu8540.dtb \
 	ste-ccu9540.dtb
 dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
-dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
+dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
 	r7s72100-genmai.dtb \
 	r8a7740-armadillo800eva.dtb \
 	r8a7778-bockw.dtb \
arch/arm/configs/ape6evm_defconfig +1 -1
index 1ce3994..cb26c62 100644
@@ -13,7 +13,7 @@ CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
 CONFIG_SLAB=y
 # CONFIG_BLOCK is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_R8A73A4=y
 CONFIG_MACH_APE6EVM=y
 # CONFIG_ARM_THUMB is not set
arch/arm/configs/armadillo800eva_defconfig +1 -1
index fae939d..5abf1a2 100644
@@ -15,7 +15,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_R8A7740=y
 CONFIG_MACH_ARMADILLO800EVA=y
 # CONFIG_SH_TIMER_TMU is not set
arch/arm/configs/bockw_defconfig +1 -1
index 8110d8a..80cff50 100644
@@ -8,7 +8,7 @@ CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
 CONFIG_SLAB=y
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_R8A7778=y
 CONFIG_MACH_BOCKW=y
 CONFIG_MEMORY_START=0x60000000
arch/arm/configs/genmai_defconfig +1 -1
index 69b1531..aa0b704 100644
@@ -12,7 +12,7 @@ CONFIG_SLAB=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_R7S72100=y
 CONFIG_MACH_GENMAI=y
 # CONFIG_SH_TIMER_CMT is not set
arch/arm/configs/koelsch_defconfig +1 -1
index 825c16d..7fd65a0 100644
@@ -9,7 +9,7 @@ CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
 CONFIG_SLAB=y
 # CONFIG_BLOCK is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_R8A7791=y
 CONFIG_MACH_KOELSCH=y
 # CONFIG_SWP_EMULATE is not set
arch/arm/configs/kzm9d_defconfig +1 -1
index e6aed23..e42ce37 100644
@@ -13,7 +13,7 @@ CONFIG_SLAB=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_EMEV2=y
 CONFIG_MACH_KZM9D=y
 CONFIG_MEMORY_START=0x40000000
arch/arm/configs/kzm9g_defconfig +1 -1
index 1ad0280..9934dbc2 100644
@@ -22,7 +22,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_SH73A0=y
 CONFIG_MACH_KZM9G=y
 CONFIG_MEMORY_START=0x41000000
arch/arm/configs/lager_defconfig +1 -1
index 35bff5e..35dc8b2 100644
@@ -12,7 +12,7 @@ CONFIG_SLAB=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_R8A7790=y
 CONFIG_MACH_LAGER=y
 # CONFIG_SH_TIMER_TMU is not set
arch/arm/configs/mackerel_defconfig +1 -1
index 9fb1189..a61e165 100644
@@ -14,7 +14,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_SH7372=y
 CONFIG_MACH_MACKEREL=y
 CONFIG_MEMORY_SIZE=0x10000000
arch/arm/configs/marzen_defconfig +1 -1
index dd4aced..f21bd40 100644
@@ -9,7 +9,7 @@ CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
 CONFIG_SLAB=y
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_R8A7779=y
 CONFIG_MACH_MARZEN=y
 CONFIG_MEMORY_START=0x60000000
arch/arm/mach-shmobile/Kconfig +6 -2
index 180b71f..1b7df17 100644
@@ -1,6 +1,10 @@
+config ARCH_SHMOBILE
+	bool
+
 config ARCH_SHMOBILE_MULTI
 	bool "SH-Mobile Series" if ARCH_MULTI_V7
 	depends on MMU
+	select ARCH_SHMOBILE
 	select CPU_V7
 	select GENERIC_CLOCKEVENTS
 	select HAVE_ARM_SCU if SMP
@@ -30,7 +34,7 @@ config MACH_KZM9D
 comment "SH-Mobile System Configuration"
 endif
 
-if ARCH_SHMOBILE
+if ARCH_SHMOBILE_LEGACY
 
 comment "SH-Mobile System Type"
 
@@ -272,7 +276,7 @@ source "drivers/sh/Kconfig"
 
 endif
 
-if ARCH_SHMOBILE || ARCH_SHMOBILE_MULTI
+if ARCH_SHMOBILE
 
 menu "Timer and clock configuration"
 
drivers/Makefile +1 -1
index ab93de8..8a50222 100644
@@ -116,7 +116,7 @@ obj-$(CONFIG_SGI_SN)		+= sn/
 obj-y				+= firmware/
 obj-$(CONFIG_CRYPTO)		+= crypto/
 obj-$(CONFIG_SUPERH)		+= sh/
-obj-$(CONFIG_ARCH_SHMOBILE)	+= sh/
+obj-$(CONFIG_ARCH_SHMOBILE_LEGACY)	+= sh/
 ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
 obj-y				+= clocksource/
 endif
Signature · 1 line
1.8.4
#10 lore raw

PATCH 2/2 ASoC: sh: rcar: Depend on ARCH_SHMOBILE_LEGACY

In reply to Laurent Pinchart

The driver doesn't compile on multiplatform kernels as it requires <mach/clock.h>.

---
 sound/soc/sh/Kconfig | 1 +
 1 file changed, 1 insertion(+)
sound/soc/sh/Kconfig +1 -0
index 56d8ff6..ce7cfd6 100644
@@ -36,6 +36,7 @@ config SND_SOC_SH4_SIU
 
 config SND_SOC_RCAR
 	tristate "R-Car series SRU/SCU/SSIU/SSI support"
+	depends on ARCH_SHMOBILE_LEGACY
 	select SND_SIMPLE_CARD
 	select RCAR_CLK_ADG
 	help
Signature · 1 line
1.8.1.5
#11 lore raw

Re: [PATCH 2/2] ASoC: sh: rcar: Depend on ARCH_SHMOBILE_LEGACY

Hi Morimoto-san,

What's your opinion about this patch ? It needs to be applied on top of "[PATCH 1/2] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY" which has been queued by Simon.

Quoted 20 lines · On Saturday 09 November 2013 13:33:49 Laurent Pinchart wrote:

The driver doesn't compile on multiplatform kernels as it requires <mach/clock.h>.

---
 sound/soc/sh/Kconfig | 1 +
 1 file changed, 1 insertion(+)
sound/soc/sh/Kconfig +1 -0
index 56d8ff6..ce7cfd6 100644
@@ -36,6 +36,7 @@ config SND_SOC_SH4_SIU
 
 config SND_SOC_RCAR
 	tristate "R-Car series SRU/SCU/SSIU/SSI support"
+	depends on ARCH_SHMOBILE_LEGACY
 	select SND_SIMPLE_CARD
 	select RCAR_CLK_ADG
 	help
Signature · 3 lines
Regards,

Laurent Pinchart
#12 lore raw

Re: [alsa-devel] [PATCH 2/2] ASoC: sh: rcar: Depend on ARCH_SHMOBILE_LEGACY

Hi Laurent

Thank you for your patch

Quoted 19 lines

What's your opinion about this patch ? It needs to be applied on top of "[PATCH 1/2] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY" which has been queued by Simon.

Quoted 14 lines · On Saturday 09 November 2013 13:33:49 Laurent Pinchart wrote:

The driver doesn't compile on multiplatform kernels as it requires <mach/clock.h>.

---
 sound/soc/sh/Kconfig | 1 +
 1 file changed, 1 insertion(+)
sound/soc/sh/Kconfig +0 -0
index 56d8ff6..ce7cfd6 100644
@@ -36,6 +36,7 @@ config SND_SOC_SH4_SIU
 
Quoted 6 lines

sound/soc/sh/Kconfig config SND_SOC_SH4_SIU · line 42

Quoted 6 lines
sound/soc/sh/Kconfig +1 -0
 config SND_SOC_RCAR
 	tristate "R-Car series SRU/SCU/SSIU/SSI support"
+	depends on ARCH_SHMOBILE_LEGACY
 	select SND_SIMPLE_CARD
 	select RCAR_CLK_ADG
 	help

<mach/clock.h> had been removed by this patch.
Does it solve your issue ?

commit d3be689e6a07c00123786659b4429b07cf4272ac

Author: Kuninori Morimoto <[email protected]>
Date:   Tue Sep 24 01:25:08 2013 -0700

ASoC: rcar: remove unnecessary mach/clock.h

${LINUX}/sound/soc/sh driver can be compiled from SuperH and ARM.
but, ${LINUX}/sound/soc/sh/rcar driver included SH-ARM specific header.
This patch removes it

#13 lore raw

Re: [alsa-devel] [PATCH 2/2] ASoC: sh: rcar: Depend on ARCH_SHMOBILE_LEGACY

Hi Morimoto-san,

Quoted 29 lines · On Sunday 08 December 2013 16:16:15 Kuninori Morimoto wrote:

Hi Laurent

Thank you for your patch

Quoted 25 lines

What's your opinion about this patch ? It needs to be applied on top of "[PATCH 1/2] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY" which has been queued by Simon.

Quoted 20 lines · On Saturday 09 November 2013 13:33:49 Laurent Pinchart wrote:

The driver doesn't compile on multiplatform kernels as it requires <mach/clock.h>.

Signed-off-by: Laurent Pinchart
<[email protected]>
---

 sound/soc/sh/Kconfig | 1 +
 1 file changed, 1 insertion(+)
sound/soc/sh/Kconfig +0 -0
index 56d8ff6..ce7cfd6 100644
@@ -36,6 +36,7 @@ config SND_SOC_SH4_SIU
 
 config SND_SOC_RCAR
 
 	tristate "R-Car series SRU/SCU/SSIU/SSI support"
 
Quoted 8 lines
Quoted 5 lines

sound/soc/sh/Kconfig config SND_SOC_SH4_SIU · line 42

Quoted 5 lines
sound/soc/sh/Kconfig +1 -0
+	depends on ARCH_SHMOBILE_LEGACY
 
sound/soc/sh/Kconfig +0 -0
 	select SND_SIMPLE_CARD
 	select RCAR_CLK_ADG
 	help

<mach/clock.h> had been removed by this patch.
Does it solve your issue ?

Yes that fixes my issue, thank you.

Quoted 14 lines

commit d3be689e6a07c00123786659b4429b07cf4272ac

Author: Kuninori Morimoto <[email protected]>
Date:   Tue Sep 24 01:25:08 2013 -0700

ASoC: rcar: remove unnecessary mach/clock.h

${LINUX}/sound/soc/sh driver can be compiled from SuperH and ARM.
but, ${LINUX}/sound/soc/sh/rcar driver included SH-ARM specific header.
This patch removes it

Signature · 3 lines
Regards,

Laurent Pinchart
#14 lore raw

[PATCH 3/2] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY in defconfig

In reply to Laurent Pinchart

The ARCH_SHMOBILE configuration option has been renamed to ARCH_SHMOBILE_LEGACY. Update the defconfigs accordingly.

---
 arch/arm/configs/ape6evm_defconfig         | 2 +-
 arch/arm/configs/armadillo800eva_defconfig | 2 +-
 arch/arm/configs/bockw_defconfig           | 2 +-
 arch/arm/configs/genmai_defconfig          | 2 +-
 arch/arm/configs/koelsch_defconfig         | 2 +-
 arch/arm/configs/kzm9d_defconfig           | 2 +-
 arch/arm/configs/kzm9g_defconfig           | 2 +-
 arch/arm/configs/lager_defconfig           | 2 +-
 arch/arm/configs/mackerel_defconfig        | 2 +-
 arch/arm/configs/marzen_defconfig          | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/configs/ape6evm_defconfig +1 -1
index 1ce3994..cb26c62 100644
@@ -13,7 +13,7 @@ CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
 CONFIG_SLAB=y
 # CONFIG_BLOCK is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_R8A73A4=y
 CONFIG_MACH_APE6EVM=y
 # CONFIG_ARM_THUMB is not set
arch/arm/configs/armadillo800eva_defconfig +1 -1
index fae939d..5abf1a2 100644
@@ -15,7 +15,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_R8A7740=y
 CONFIG_MACH_ARMADILLO800EVA=y
 # CONFIG_SH_TIMER_TMU is not set
arch/arm/configs/bockw_defconfig +1 -1
index 8110d8a..80cff50 100644
@@ -8,7 +8,7 @@ CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
 CONFIG_SLAB=y
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_R8A7778=y
 CONFIG_MACH_BOCKW=y
 CONFIG_MEMORY_START=0x60000000
arch/arm/configs/genmai_defconfig +1 -1
index 69b1531..aa0b704 100644
@@ -12,7 +12,7 @@ CONFIG_SLAB=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_R7S72100=y
 CONFIG_MACH_GENMAI=y
 # CONFIG_SH_TIMER_CMT is not set
arch/arm/configs/koelsch_defconfig +1 -1
index 825c16d..7fd65a0 100644
@@ -9,7 +9,7 @@ CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
 CONFIG_SLAB=y
 # CONFIG_BLOCK is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_R8A7791=y
 CONFIG_MACH_KOELSCH=y
 # CONFIG_SWP_EMULATE is not set
arch/arm/configs/kzm9d_defconfig +1 -1
index 6c37f4a..217f1dd 100644
@@ -13,7 +13,7 @@ CONFIG_SLAB=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_EMEV2=y
 CONFIG_MACH_KZM9D=y
 CONFIG_MEMORY_START=0x40000000
arch/arm/configs/kzm9g_defconfig +1 -1
index 1ad0280..9934dbc2 100644
@@ -22,7 +22,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_SH73A0=y
 CONFIG_MACH_KZM9G=y
 CONFIG_MEMORY_START=0x41000000
arch/arm/configs/lager_defconfig +1 -1
index 35bff5e..35dc8b2 100644
@@ -12,7 +12,7 @@ CONFIG_SLAB=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_R8A7790=y
 CONFIG_MACH_LAGER=y
 # CONFIG_SH_TIMER_TMU is not set
arch/arm/configs/mackerel_defconfig +1 -1
index 9fb1189..a61e165 100644
@@ -14,7 +14,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_SH7372=y
 CONFIG_MACH_MACKEREL=y
 CONFIG_MEMORY_SIZE=0x10000000
arch/arm/configs/marzen_defconfig +1 -1
index dd4aced..f21bd40 100644
@@ -9,7 +9,7 @@ CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
 CONFIG_SLAB=y
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_LEGACY=y
 CONFIG_ARCH_R8A7779=y
 CONFIG_MACH_MARZEN=y
 CONFIG_MEMORY_START=0x60000000
Signature · 1 line
1.8.1.5