* [PATCH 0/2] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY @ 2013-11-09 12:33 Laurent Pinchart 2013-11-09 12:33 ` [PATCH 1/2] " Laurent Pinchart 2013-11-09 12:33 ` [PATCH 2/2] ASoC: sh: rcar: Depend on ARCH_SHMOBILE_LEGACY Laurent Pinchart 0 siblings, 2 replies; 8+ messages in thread From: Laurent Pinchart @ 2013-11-09 12:33 UTC (permalink / raw) To: linux-sh; +Cc: linux-arm-kernel, alsa-devel 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(-) -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY 2013-11-09 12:33 [PATCH 0/2] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY Laurent Pinchart @ 2013-11-09 12:33 ` Laurent Pinchart 2013-11-12 5:11 ` Simon Horman 2013-11-09 12:33 ` [PATCH 2/2] ASoC: sh: rcar: Depend on ARCH_SHMOBILE_LEGACY Laurent Pinchart 1 sibling, 1 reply; 8+ messages in thread From: Laurent Pinchart @ 2013-11-09 12:33 UTC (permalink / raw) To: linux-sh; +Cc: linux-arm-kernel, alsa-devel 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 <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Magnus Damm <damm@opensource.se> --- 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(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1ad6fb6..588b46b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index db50b62..dca2e84 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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 diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 7ac1610..bafbb4c7 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -68,7 +68,7 @@ else endif endif -ifeq ($(CONFIG_ARCH_SHMOBILE),y) +ifeq ($(CONFIG_ARCH_SHMOBILE_LEGACY),y) OBJS += head-shmobile.o endif diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 891b724..7d98d3a 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -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 \ diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 4bb548f..b31ceda 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -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" diff --git a/drivers/Makefile b/drivers/Makefile index ab93de8..8a50222 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -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 -- 1.8.1.5 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY 2013-11-09 12:33 ` [PATCH 1/2] " Laurent Pinchart @ 2013-11-12 5:11 ` Simon Horman 2013-11-12 5:26 ` Simon Horman 0 siblings, 1 reply; 8+ messages in thread From: Simon Horman @ 2013-11-12 5:11 UTC (permalink / raw) To: Laurent Pinchart; +Cc: linux-sh, linux-arm-kernel, alsa-devel On Sat, Nov 09, 2013 at 01:33:48PM +0100, Laurent Pinchart wrote: > 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 <laurent.pinchart+renesas@ideasonboard.com> > Acked-by: Magnus Damm <damm@opensource.se> Thanks, I have queued this up. ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY 2013-11-12 5:11 ` Simon Horman @ 2013-11-12 5:26 ` Simon Horman 0 siblings, 0 replies; 8+ messages in thread From: Simon Horman @ 2013-11-12 5:26 UTC (permalink / raw) To: Laurent Pinchart; +Cc: linux-sh, linux-arm-kernel, alsa-devel On Tue, Nov 12, 2013 at 02:11:37PM +0900, Simon Horman wrote: > On Sat, Nov 09, 2013 at 01:33:48PM +0100, Laurent Pinchart wrote: > > 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 <laurent.pinchart+renesas@ideasonboard.com> > > Acked-by: Magnus Damm <damm@opensource.se> > > 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? ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] ASoC: sh: rcar: Depend on ARCH_SHMOBILE_LEGACY 2013-11-09 12:33 [PATCH 0/2] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY Laurent Pinchart 2013-11-09 12:33 ` [PATCH 1/2] " Laurent Pinchart @ 2013-11-09 12:33 ` Laurent Pinchart 2013-12-06 10:07 ` Laurent Pinchart 1 sibling, 1 reply; 8+ messages in thread From: Laurent Pinchart @ 2013-11-09 12:33 UTC (permalink / raw) To: linux-sh; +Cc: linux-arm-kernel, alsa-devel The driver doesn't compile on multiplatform kernels as it requires <mach/clock.h>. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- sound/soc/sh/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig index 56d8ff6..ce7cfd6 100644 --- a/sound/soc/sh/Kconfig +++ b/sound/soc/sh/Kconfig @@ -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 -- 1.8.1.5 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] ASoC: sh: rcar: Depend on ARCH_SHMOBILE_LEGACY 2013-11-09 12:33 ` [PATCH 2/2] ASoC: sh: rcar: Depend on ARCH_SHMOBILE_LEGACY Laurent Pinchart @ 2013-12-06 10:07 ` Laurent Pinchart 2013-12-09 0:16 ` [alsa-devel] " Kuninori Morimoto 0 siblings, 1 reply; 8+ messages in thread From: Laurent Pinchart @ 2013-12-06 10:07 UTC (permalink / raw) To: Kuninori Morimoto; +Cc: linux-sh, linux-arm-kernel, alsa-devel 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. 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 <laurent.pinchart+renesas@ideasonboard.com> > --- > sound/soc/sh/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig > index 56d8ff6..ce7cfd6 100644 > --- a/sound/soc/sh/Kconfig > +++ b/sound/soc/sh/Kconfig > @@ -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 -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [alsa-devel] [PATCH 2/2] ASoC: sh: rcar: Depend on ARCH_SHMOBILE_LEGACY 2013-12-06 10:07 ` Laurent Pinchart @ 2013-12-09 0:16 ` Kuninori Morimoto 2013-12-09 12:57 ` Laurent Pinchart 0 siblings, 1 reply; 8+ messages in thread From: Kuninori Morimoto @ 2013-12-09 0:16 UTC (permalink / raw) To: Laurent; +Cc: Linux-SH, Linux-ARM, Linux-ALSA Hi Laurent Thank you for your patch > 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. > > 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 <laurent.pinchart+renesas@ideasonboard.com> > > --- > > sound/soc/sh/Kconfig | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig > > index 56d8ff6..ce7cfd6 100644 > > --- a/sound/soc/sh/Kconfig > > +++ b/sound/soc/sh/Kconfig > > @@ -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 <mach/clock.h> had been removed by this patch. Does it solve your issue ? commit d3be689e6a07c00123786659b4429b07cf4272ac Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> 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 Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@linaro.org> ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [alsa-devel] [PATCH 2/2] ASoC: sh: rcar: Depend on ARCH_SHMOBILE_LEGACY 2013-12-09 0:16 ` [alsa-devel] " Kuninori Morimoto @ 2013-12-09 12:57 ` Laurent Pinchart 0 siblings, 0 replies; 8+ messages in thread From: Laurent Pinchart @ 2013-12-09 12:57 UTC (permalink / raw) To: Kuninori Morimoto; +Cc: Linux-SH, Linux-ARM, Linux-ALSA Hi Morimoto-san, On Sunday 08 December 2013 16:16:15 Kuninori Morimoto wrote: > Hi Laurent > > Thank you for your patch > > > 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. > > > > 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 > > > <laurent.pinchart+renesas@ideasonboard.com> > > > --- > > > > > > sound/soc/sh/Kconfig | 1 + > > > 1 file changed, 1 insertion(+) > > > > > > diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig > > > index 56d8ff6..ce7cfd6 100644 > > > --- a/sound/soc/sh/Kconfig > > > +++ b/sound/soc/sh/Kconfig > > > @@ -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 > > <mach/clock.h> had been removed by this patch. > Does it solve your issue ? Yes that fixes my issue, thank you. > commit d3be689e6a07c00123786659b4429b07cf4272ac > Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > 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 > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > Signed-off-by: Mark Brown <broonie@linaro.org> -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-12-09 12:57 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-11-09 12:33 [PATCH 0/2] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY Laurent Pinchart 2013-11-09 12:33 ` [PATCH 1/2] " Laurent Pinchart 2013-11-12 5:11 ` Simon Horman 2013-11-12 5:26 ` Simon Horman 2013-11-09 12:33 ` [PATCH 2/2] ASoC: sh: rcar: Depend on ARCH_SHMOBILE_LEGACY Laurent Pinchart 2013-12-06 10:07 ` Laurent Pinchart 2013-12-09 0:16 ` [alsa-devel] " Kuninori Morimoto 2013-12-09 12:57 ` Laurent Pinchart
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).