| Message ID | 1448485478-21699-2-git-send-email-sboyd@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wednesday 25 November 2015 13:04:36 Stephen Boyd wrote: > diff --git a/arch/arm/Makefile b/arch/arm/Makefile > index 2c2b28ee4811..999d523ac09f 100644 > --- a/arch/arm/Makefile > +++ b/arch/arm/Makefile > @@ -148,8 +148,7 @@ textofs-$(CONFIG_PM_H1940) := 0x00108000 > ifeq ($(CONFIG_ARCH_SA1100),y) > textofs-$(CONFIG_SA1111) := 0x00208000 > endif > -textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000 > -textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 > +textofs-$(CONFIG_HAVE_CLKSRC_QCOM) := 0x00208000 > textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000 > > # Machine directory name. This list is sorted alphanumerically > diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig > index 2256cd1e25d1..35a03967d9c2 100644 > --- a/arch/arm/mach-qcom/Kconfig > +++ b/arch/arm/mach-qcom/Kconfig > @@ -10,6 +10,14 @@ menuconfig ARCH_QCOM > > if ARCH_QCOM > > +config HAVE_CLKSRC_QCOM > + bool "Support platforms with qcom clocksource" > + default y > + select CLKSRC_QCOM > + help > + Select this option if you want to support platforms > + with the qcom clocksource such as MSM8660 and MSM8960. Hmm, if we use the option for two things, I think it could use a different identifier and title, as it seems counterintuitive to make the text offset based on the clocksource driver. Is there any common way to classify these, e.g. calling them 'pre-2013 models' or 'Snapdragon S4' as a way to identify them? The way it appears in Kconfig also still needs to reflect how this is a subset of the supported platforms (as your current patch does correctly). Arnd
On 11/25/15 14:08, Arnd Bergmann wrote: > On Wednesday 25 November 2015 13:04:36 Stephen Boyd wrote: >> diff --git a/arch/arm/Makefile b/arch/arm/Makefile >> index 2c2b28ee4811..999d523ac09f 100644 >> --- a/arch/arm/Makefile >> +++ b/arch/arm/Makefile >> @@ -148,8 +148,7 @@ textofs-$(CONFIG_PM_H1940) := 0x00108000 >> ifeq ($(CONFIG_ARCH_SA1100),y) >> textofs-$(CONFIG_SA1111) := 0x00208000 >> endif >> -textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000 >> -textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 >> +textofs-$(CONFIG_HAVE_CLKSRC_QCOM) := 0x00208000 >> textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000 >> >> # Machine directory name. This list is sorted alphanumerically >> diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig >> index 2256cd1e25d1..35a03967d9c2 100644 >> --- a/arch/arm/mach-qcom/Kconfig >> +++ b/arch/arm/mach-qcom/Kconfig >> @@ -10,6 +10,14 @@ menuconfig ARCH_QCOM >> >> if ARCH_QCOM >> >> +config HAVE_CLKSRC_QCOM >> + bool "Support platforms with qcom clocksource" >> + default y >> + select CLKSRC_QCOM >> + help >> + Select this option if you want to support platforms >> + with the qcom clocksource such as MSM8660 and MSM8960. > Hmm, if we use the option for two things, I think it could use > a different identifier and title, as it seems counterintuitive > to make the text offset based on the clocksource driver. Ok. > > Is there any common way to classify these, e.g. calling them > 'pre-2013 models' or 'Snapdragon S4' as a way to identify them? I was thinking I could leave it as ARCH_MSM_8X60 because that covers the 6 and the 9, but that doesn't make me feel great. I have no idea what Snapdragon S4 is, and that didn't exist when 8660 was first released. pre-2013 models seems alright. Or perhaps ARCH_QCOM_PRE_8974? Internally (and sort of leaked externally now) we called MSM8960 and its variants A-family, and the generation after B-family, so perhaps ARCH_QCOM_A_FAMILY would be appropriate? The problem there is no end user knows about this distinction.
On Wednesday 25 November 2015 14:22:21 Stephen Boyd wrote: > > > > > Is there any common way to classify these, e.g. calling them > > 'pre-2013 models' or 'Snapdragon S4' as a way to identify them? > > I was thinking I could leave it as ARCH_MSM_8X60 because that covers the > 6 and the 9, but that doesn't make me feel great. I have no idea what > Snapdragon S4 is, and that didn't exist when 8660 was first released. > pre-2013 models seems alright. Or perhaps ARCH_QCOM_PRE_8974? > > Internally (and sort of leaked externally now) we called MSM8960 and its > variants A-family, and the generation after B-family, so perhaps > ARCH_QCOM_A_FAMILY would be appropriate? The problem there is no end > user knows about this distinction. I think using internal code names like ARCH_QCOM_A_FAMILY here is fine, a lot of other platforms do similar things. Regarding end users, it's probably enough to explain the distinction in the help text, something like: The A-family includes all Snapdragon S1/S2/S3/S4 chips before 2013, up to the MSM8x60 and APQ8064 models. The B-family includes all Snapdragon 2xx/4xx/6xx/8xx models starting in 2013 with the MSM8x74. https://en.wikipedia.org/wiki/List_of_Qualcomm_Snapdragon_device has a good overview that translates the marketing names into the model numbers but it doesn't have internal code names, so I'm not sure where the APQ8064 fits it, as it was marketed as both the "S4 Pro" and the "600", depending on the revision. Arnd
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 2c2b28ee4811..999d523ac09f 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -148,8 +148,7 @@ textofs-$(CONFIG_PM_H1940) := 0x00108000 ifeq ($(CONFIG_ARCH_SA1100),y) textofs-$(CONFIG_SA1111) := 0x00208000 endif -textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000 -textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 +textofs-$(CONFIG_HAVE_CLKSRC_QCOM) := 0x00208000 textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000 # Machine directory name. This list is sorted alphanumerically diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig index 2256cd1e25d1..35a03967d9c2 100644 --- a/arch/arm/mach-qcom/Kconfig +++ b/arch/arm/mach-qcom/Kconfig @@ -10,6 +10,14 @@ menuconfig ARCH_QCOM if ARCH_QCOM +config HAVE_CLKSRC_QCOM + bool "Support platforms with qcom clocksource" + default y + select CLKSRC_QCOM + help + Select this option if you want to support platforms + with the qcom clocksource such as MSM8660 and MSM8960. + config ARCH_MSM8X60 bool "Enable support for MSM8X60" select CLKSRC_QCOM
We want to remove the ARCH_MSM* configs in mach-qcom/Kconfig because they are mostly proxy configs for selecting the right clocksource driver. Therefore, make a new config for platforms that use the qcom clocksource driver. We'll also make this the determining factor for if we should adjust the text offset by 2MB or not, because the two go hand in hand. Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- arch/arm/Makefile | 3 +-- arch/arm/mach-qcom/Kconfig | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-)