* [PATCH/RFC] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY
@ 2013-11-06 23:54 Laurent Pinchart
2013-11-07 6:04 ` Magnus Damm
0 siblings, 1 reply; 6+ messages in thread
From: Laurent Pinchart @ 2013-11-06 23:54 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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(-)
This patch is an alternative approach to adding ARCH_SHMOBILE_MULTI or ARM
dependencies to all the SH-Mobile-related drivers (see
http://www.spinics.net/lists/arm-kernel/msg283128.html). If accepted I will
modify the previous series to only add COMPILE_TEST support without touching
the other dependencies.
I believe this approach to be simpler. It will also not required dropping the
ARCH_SHMOBILE_MULTI dependency from all drivers when we will eventually get
rid of the non-multiplatform platforms and rename ARCH_SHMOBILE_MULTI to
ARCH_SHMOBILE.
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
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH/RFC] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY
2013-11-06 23:54 [PATCH/RFC] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY Laurent Pinchart
@ 2013-11-07 6:04 ` Magnus Damm
2013-11-07 13:35 ` Laurent Pinchart
2013-11-08 6:08 ` Simon Horman
0 siblings, 2 replies; 6+ messages in thread
From: Magnus Damm @ 2013-11-07 6:04 UTC (permalink / raw)
To: linux-arm-kernel
Hi Laurent,
On Thu, Nov 7, 2013 at 8:54 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> 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>
Thanks, this looks good to me.
Acked-by: Magnus Damm <damm@opensource.se>
I have one semi-related question below:
> @@ -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
For the hunk above, it makes sense that we cannot HZ in the
multiplatform case, so I think your patch is right.
I do however wonder what's the plan with multiplatform and the HZ
value, how do we handle hardware platforms that use 32768 Hz as clock?
Historically those platforms work best with a
even-divide-by-a-power-of-two HZ value, so with a HZ=100 value things
may drift slowly...
Cheers,
/ maganus
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH/RFC] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY
2013-11-07 6:04 ` Magnus Damm
@ 2013-11-07 13:35 ` Laurent Pinchart
2013-11-08 6:08 ` Simon Horman
1 sibling, 0 replies; 6+ messages in thread
From: Laurent Pinchart @ 2013-11-07 13:35 UTC (permalink / raw)
To: linux-arm-kernel
Hi Magnus,
On Thursday 07 November 2013 15:04:57 Magnus Damm wrote:
> On Thu, Nov 7, 2013 at 8:54 AM, 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>
>
> Thanks, this looks good to me.
>
> Acked-by: Magnus Damm <damm@opensource.se>
Thank you.
> I have one semi-related question below:
> > @@ -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
>
> For the hunk above, it makes sense that we cannot HZ in the multiplatform
> case, so I think your patch is right.
>
> I do however wonder what's the plan with multiplatform and the HZ value, how
> do we handle hardware platforms that use 32768 Hz as clock?
> Historically those platforms work best with a even-divide-by-a-power-of-two
> HZ value, so with a HZ=100 value things may drift slowly...
Good question. Would it make sense to allow freely selected HZ values on
multiplatform kernels ? Or maybe only if if ARCH_SHMOBILE is selected ? Or
maybe full tickless kernels are the solution :-)
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH/RFC] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY
2013-11-07 6:04 ` Magnus Damm
2013-11-07 13:35 ` Laurent Pinchart
@ 2013-11-08 6:08 ` Simon Horman
2013-11-09 12:34 ` Laurent Pinchart
1 sibling, 1 reply; 6+ messages in thread
From: Simon Horman @ 2013-11-08 6:08 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Nov 07, 2013 at 03:04:57PM +0900, Magnus Damm wrote:
> Hi Laurent,
>
> On Thu, Nov 7, 2013 at 8:54 AM, Laurent Pinchart
> <laurent.pinchart+renesas@ideasonboard.com> 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>
>
> Thanks, this looks good to me.
>
> Acked-by: Magnus Damm <damm@opensource.se>
This seems reasonable to me.
I would pick it up now but it is marked as "RFC".
Please let me know if you wish me to pick it up.
>
> I have one semi-related question below:
>
> > @@ -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
>
> For the hunk above, it makes sense that we cannot HZ in the
> multiplatform case, so I think your patch is right.
>
> I do however wonder what's the plan with multiplatform and the HZ
> value, how do we handle hardware platforms that use 32768 Hz as clock?
> Historically those platforms work best with a
> even-divide-by-a-power-of-two HZ value, so with a HZ=100 value things
> may drift slowly...
>
> Cheers,
>
> / maganus
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH/RFC] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY
2013-11-08 6:08 ` Simon Horman
@ 2013-11-09 12:34 ` Laurent Pinchart
2013-11-12 2:30 ` Simon Horman
0 siblings, 1 reply; 6+ messages in thread
From: Laurent Pinchart @ 2013-11-09 12:34 UTC (permalink / raw)
To: linux-arm-kernel
Hi Simon,
On Friday 08 November 2013 15:08:05 Simon Horman wrote:
> On Thu, Nov 07, 2013 at 03:04:57PM +0900, Magnus Damm wrote:
> > On Thu, Nov 7, 2013 at 8:54 AM, 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>
> >
> > Thanks, this looks good to me.
> >
> > Acked-by: Magnus Damm <damm@opensource.se>
>
> This seems reasonable to me.
> I would pick it up now but it is marked as "RFC".
> Please let me know if you wish me to pick it up.
I've sent a non-RFC series, please pick that one up.
> > I have one semi-related question below:
> > > @@ -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
> >
> > For the hunk above, it makes sense that we cannot HZ in the
> > multiplatform case, so I think your patch is right.
> >
> > I do however wonder what's the plan with multiplatform and the HZ
> > value, how do we handle hardware platforms that use 32768 Hz as clock?
> > Historically those platforms work best with a
> > even-divide-by-a-power-of-two HZ value, so with a HZ=100 value things
> > may drift slowly...
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH/RFC] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY
2013-11-09 12:34 ` Laurent Pinchart
@ 2013-11-12 2:30 ` Simon Horman
0 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2013-11-12 2:30 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Nov 09, 2013 at 01:34:31PM +0100, Laurent Pinchart wrote:
> Hi Simon,
>
> On Friday 08 November 2013 15:08:05 Simon Horman wrote:
> > On Thu, Nov 07, 2013 at 03:04:57PM +0900, Magnus Damm wrote:
> > > On Thu, Nov 7, 2013 at 8:54 AM, 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>
> > >
> > > Thanks, this looks good to me.
> > >
> > > Acked-by: Magnus Damm <damm@opensource.se>
> >
> > This seems reasonable to me.
> > I would pick it up now but it is marked as "RFC".
> > Please let me know if you wish me to pick it up.
>
> I've sent a non-RFC series, please pick that one up.
Thanks, will do.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-11-12 2:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-06 23:54 [PATCH/RFC] ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY Laurent Pinchart
2013-11-07 6:04 ` Magnus Damm
2013-11-07 13:35 ` Laurent Pinchart
2013-11-08 6:08 ` Simon Horman
2013-11-09 12:34 ` Laurent Pinchart
2013-11-12 2:30 ` Simon Horman
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).