[PATCH 0/3] Remove ARCH_MSM* configs

[PATCH 0/3] Remove ARCH_MSM* configs

[Stephen Boyd]

This patch series allows us to remove the ARCH_MSM* configs that live
in mach-qcom/Kconfig. They're mostly proxy configs for user selectable
clocksource configurations anyway. The first patch can go via Daniel,
while the other two can go via Andy.

Stephen Boyd (3):
  clocksource: defbool CLKSRC_QCOM=y on ARCH_QCOM and make it visible
  ARM: qcom_defconfig: Enable HAVE_ARM_ARCH_TIMER
  ARM: qcom: Drop ARCH_MSM* configs

 arch/arm/configs/qcom_defconfig |  1 +
 arch/arm/mach-qcom/Kconfig      | 16 ----------------
 drivers/clocksource/Kconfig     |  3 ++-
 3 files changed, 3 insertions(+), 17 deletions(-)

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 1/3] clocksource: defbool CLKSRC_QCOM=y on ARCH_QCOM and make it visible

[Stephen Boyd]

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 CLKSRC_QCOM default to the
value of ARCH_QCOM, but also make it visible if ARCH_QCOM=y so
that we can turn it off when we don't want it.

Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 drivers/clocksource/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index b423785d6afc..7a5ffaa3e490 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -279,9 +279,10 @@ config EM_TIMER_STI
 	  such as EMEV2 from former NEC Electronics.
 
 config CLKSRC_QCOM
-	bool "Qualcomm MSM timer" if COMPILE_TEST
+	bool "Qualcomm MSM timer" if ARCH_QCOM || COMPILE_TEST
 	depends on ARM
 	select CLKSRC_OF
+	defbool ARCH_QCOM
 	help
 	  This enables the clocksource and the per CPU clockevent driver for the
 	  Qualcomm SoCs.
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 1/3] clocksource: defbool CLKSRC_QCOM=y on ARCH_QCOM and make it visible

[Stephen Boyd]

On 11/24/15 17:08, Stephen Boyd wrote:
> 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 CLKSRC_QCOM default to the
> value of ARCH_QCOM, but also make it visible if ARCH_QCOM=y so
> that we can turn it off when we don't want it.
>
> Suggested-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
>  drivers/clocksource/Kconfig | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
> index b423785d6afc..7a5ffaa3e490 100644
> --- a/drivers/clocksource/Kconfig
> +++ b/drivers/clocksource/Kconfig
> @@ -279,9 +279,10 @@ config EM_TIMER_STI
>  	  such as EMEV2 from former NEC Electronics.
>  
>  config CLKSRC_QCOM
> -	bool "Qualcomm MSM timer" if COMPILE_TEST
> +	bool "Qualcomm MSM timer" if ARCH_QCOM || COMPILE_TEST
>  	depends on ARM
>  	select CLKSRC_OF
> +	defbool ARCH_QCOM

Urgh. This should be def_bool

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 1/3] clocksource: defbool CLKSRC_QCOM=y on ARCH_QCOM and make it visible

[Arnd Bergmann]

On Tuesday 24 November 2015 18:07:20 Stephen Boyd wrote:
> On 11/24/15 17:08, Stephen Boyd wrote:
> > 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 CLKSRC_QCOM default to the
> > value of ARCH_QCOM, but also make it visible if ARCH_QCOM=y so
> > that we can turn it off when we don't want it.
> >
> > Suggested-by: Arnd Bergmann <arnd@arndb.de>
> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> > ---
> >  drivers/clocksource/Kconfig | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
> > index b423785d6afc..7a5ffaa3e490 100644
> > --- a/drivers/clocksource/Kconfig
> > +++ b/drivers/clocksource/Kconfig
> > @@ -279,9 +279,10 @@ config EM_TIMER_STI
> >         such as EMEV2 from former NEC Electronics.
> >  
> >  config CLKSRC_QCOM
> > -     bool "Qualcomm MSM timer" if COMPILE_TEST
> > +     bool "Qualcomm MSM timer" if ARCH_QCOM || COMPILE_TEST
> >       depends on ARM
> >       select CLKSRC_OF
> > +     defbool ARCH_QCOM
> 
> Urgh. This should be def_bool
> 
> 

With this fixed, the series looks good to me. If Daniel can Ack this,
I'd suggest we take the series through arm-soc.

	Arnd

[PATCH 1/3] clocksource: defbool CLKSRC_QCOM=y on ARCH_QCOM and make it visible

[Daniel Lezcano]

On 11/25/2015 02:08 AM, Stephen Boyd wrote:
> 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 CLKSRC_QCOM default to the
> value of ARCH_QCOM, but also make it visible if ARCH_QCOM=y so
> that we can turn it off when we don't want it.

I have been removing the ARCH dependencies in the Kconfig file.

Why do you have to turn it off manually ?

> Suggested-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
>   drivers/clocksource/Kconfig | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
> index b423785d6afc..7a5ffaa3e490 100644
> --- a/drivers/clocksource/Kconfig
> +++ b/drivers/clocksource/Kconfig
> @@ -279,9 +279,10 @@ config EM_TIMER_STI
>   	  such as EMEV2 from former NEC Electronics.
>
>   config CLKSRC_QCOM
> -	bool "Qualcomm MSM timer" if COMPILE_TEST
> +	bool "Qualcomm MSM timer" if ARCH_QCOM || COMPILE_TEST
>   	depends on ARM
>   	select CLKSRC_OF
> +	defbool ARCH_QCOM
>   	help
>   	  This enables the clocksource and the per CPU clockevent driver for the
>   	  Qualcomm SoCs.
>


-- 
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[PATCH 1/3] clocksource: defbool CLKSRC_QCOM=y on ARCH_QCOM and make it visible

[Arnd Bergmann]

On Wednesday 25 November 2015 11:10:49 Daniel Lezcano wrote:
> On 11/25/2015 02:08 AM, Stephen Boyd wrote:
> > 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 CLKSRC_QCOM default to the
> > value of ARCH_QCOM, but also make it visible if ARCH_QCOM=y so
> > that we can turn it off when we don't want it.
> 
> I have been removing the ARCH dependencies in the Kconfig file.
> 
> Why do you have to turn it off manually ?

The background is that this is used only on some of the older
MSM SoCs, while the newer ones use the arch timer.

We decided to remove the SoC-specific top-level options from
mach-msm as they are becoming rather meaningless these days
and just a burden to maintain at the rate that new variants
get released, so being able to turn off this driver helps make
the kernel slightly smaller if you are building a kernel for
only the more recent models.

	Arnd

[PATCH 1/3] clocksource: defbool CLKSRC_QCOM=y on ARCH_QCOM and make it visible

[Daniel Lezcano]

On 11/25/2015 11:17 AM, Arnd Bergmann wrote:
> On Wednesday 25 November 2015 11:10:49 Daniel Lezcano wrote:
>> On 11/25/2015 02:08 AM, Stephen Boyd wrote:
>>> 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 CLKSRC_QCOM default to the
>>> value of ARCH_QCOM, but also make it visible if ARCH_QCOM=y so
>>> that we can turn it off when we don't want it.
>>
>> I have been removing the ARCH dependencies in the Kconfig file.
>>
>> Why do you have to turn it off manually ?
>
> The background is that this is used only on some of the older
> MSM SoCs, while the newer ones use the arch timer.
>
> We decided to remove the SoC-specific top-level options from
> mach-msm as they are becoming rather meaningless these days
> and just a burden to maintain at the rate that new variants
> get released, so being able to turn off this driver helps make
> the kernel slightly smaller if you are building a kernel for
> only the more recent models.

Ok, thanks for the clarification.

I don't really like this approach even if it is correct because it 
breaks the current approach I am trying to make consistent across the 
drivers.

I would like to have the COMPILE_TEST option available for all the 
drivers and move this option under the menu config. This patch will 
prevent to do this code factoring.

On the other side, this option is supposed to have a slightly smaller 
kernel when it is not used. But when does it happen ? When 
ARCH_MSM8X60=n and ARCH_MSM8960=n. With this patchset, I don't see the 
ability to turn these SoCs off as the options are removed. So the 
associated code is not removed, right ?

So why allow to turn off the timer but disallow that for the entire SoC ?


-- 
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[PATCH 1/3] clocksource: defbool CLKSRC_QCOM=y on ARCH_QCOM and make it visible

[Arnd Bergmann]

On Wednesday 25 November 2015 13:37:53 Daniel Lezcano wrote:
> On 11/25/2015 11:17 AM, Arnd Bergmann wrote:
> > On Wednesday 25 November 2015 11:10:49 Daniel Lezcano wrote:
> >> On 11/25/2015 02:08 AM, Stephen Boyd wrote:
> >>> 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 CLKSRC_QCOM default to the
> >>> value of ARCH_QCOM, but also make it visible if ARCH_QCOM=y so
> >>> that we can turn it off when we don't want it.
> >>
> >> I have been removing the ARCH dependencies in the Kconfig file.
> >>
> >> Why do you have to turn it off manually ?
> >
> > The background is that this is used only on some of the older
> > MSM SoCs, while the newer ones use the arch timer.
> >
> > We decided to remove the SoC-specific top-level options from
> > mach-msm as they are becoming rather meaningless these days
> > and just a burden to maintain at the rate that new variants
> > get released, so being able to turn off this driver helps make
> > the kernel slightly smaller if you are building a kernel for
> > only the more recent models.
> 
> Ok, thanks for the clarification.
> 
> I don't really like this approach even if it is correct because it 
> breaks the current approach I am trying to make consistent across the 
> drivers.
> 
> I would like to have the COMPILE_TEST option available for all the 
> drivers and move this option under the menu config. This patch will 
> prevent to do this code factoring.

How about moving the option to arch/arm/mach-qcom/Kconfig then?

We could have a user-selectable "allow use of qcom clocksource"
option there, which would then select the driver.

> On the other side, this option is supposed to have a slightly smaller 
> kernel when it is not used. But when does it happen ? When 
> ARCH_MSM8X60=n and ARCH_MSM8960=n. With this patchset, I don't see the 
> ability to turn these SoCs off as the options are removed. So the 
> associated code is not removed, right ?
> 
> So why allow to turn off the timer but disallow that for the entire SoC ?

The timer is the only code that is controlled by those two options at
the moment, all the other differences between SoCs are already handled
by enabling the respective device drivers.

	Arnd

[PATCH 1/3] clocksource: defbool CLKSRC_QCOM=y on ARCH_QCOM and make it visible

[Daniel Lezcano]

On 11/25/2015 01:49 PM, Arnd Bergmann wrote:
> On Wednesday 25 November 2015 13:37:53 Daniel Lezcano wrote:
>> On 11/25/2015 11:17 AM, Arnd Bergmann wrote:
>>> On Wednesday 25 November 2015 11:10:49 Daniel Lezcano wrote:
>>>> On 11/25/2015 02:08 AM, Stephen Boyd wrote:
>>>>> 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 CLKSRC_QCOM default to the
>>>>> value of ARCH_QCOM, but also make it visible if ARCH_QCOM=y so
>>>>> that we can turn it off when we don't want it.
>>>>
>>>> I have been removing the ARCH dependencies in the Kconfig file.
>>>>
>>>> Why do you have to turn it off manually ?
>>>
>>> The background is that this is used only on some of the older
>>> MSM SoCs, while the newer ones use the arch timer.
>>>
>>> We decided to remove the SoC-specific top-level options from
>>> mach-msm as they are becoming rather meaningless these days
>>> and just a burden to maintain at the rate that new variants
>>> get released, so being able to turn off this driver helps make
>>> the kernel slightly smaller if you are building a kernel for
>>> only the more recent models.
>>
>> Ok, thanks for the clarification.
>>
>> I don't really like this approach even if it is correct because it
>> breaks the current approach I am trying to make consistent across the
>> drivers.
>>
>> I would like to have the COMPILE_TEST option available for all the
>> drivers and move this option under the menu config. This patch will
>> prevent to do this code factoring.
>
> How about moving the option to arch/arm/mach-qcom/Kconfig then?
>
> We could have a user-selectable "allow use of qcom clocksource"
> option there, which would then select the driver.

Yes, why not.

>> On the other side, this option is supposed to have a slightly smaller
>> kernel when it is not used. But when does it happen ? When
>> ARCH_MSM8X60=n and ARCH_MSM8960=n. With this patchset, I don't see the
>> ability to turn these SoCs off as the options are removed. So the
>> associated code is not removed, right ?
>>
>> So why allow to turn off the timer but disallow that for the entire SoC ?
>
> The timer is the only code that is controlled by those two options at
> the moment, all the other differences between SoCs are already handled
> by enabling the respective device drivers.

Ok, I see.

Thanks.

   -- Daniel


-- 
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[PATCH 2/3] ARM: qcom_defconfig: Enable HAVE_ARM_ARCH_TIMER

[Stephen Boyd]

Enable this config in the defconfig so that we can delete the
selection logic surrounding it that exists in mach-qcom/Kconfig.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 arch/arm/configs/qcom_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig
index ee54a706e8a3..6f34da7afd75 100644
--- a/arch/arm/configs/qcom_defconfig
+++ b/arch/arm/configs/qcom_defconfig
@@ -22,6 +22,7 @@ CONFIG_ARCH_MSM8X60=y
 CONFIG_ARCH_MSM8960=y
 CONFIG_ARCH_MSM8974=y
 CONFIG_SMP=y
+CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 3/3] ARM: qcom: Drop ARCH_MSM* configs

[Stephen Boyd]

Drop these configs now that we select the clocksources we need
via the defconfig.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 arch/arm/mach-qcom/Kconfig | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig
index 2256cd1e25d1..37572fd79c87 100644
--- a/arch/arm/mach-qcom/Kconfig
+++ b/arch/arm/mach-qcom/Kconfig
@@ -7,19 +7,3 @@ menuconfig ARCH_QCOM
 	select QCOM_SCM if SMP
 	help
 	  Support for Qualcomm's devicetree based systems.
-
-if ARCH_QCOM
-
-config ARCH_MSM8X60
-	bool "Enable support for MSM8X60"
-	select CLKSRC_QCOM
-
-config ARCH_MSM8960
-	bool "Enable support for MSM8960"
-	select CLKSRC_QCOM
-
-config ARCH_MSM8974
-	bool "Enable support for MSM8974"
-	select HAVE_ARM_ARCH_TIMER
-
-endif
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 3/3] ARM: qcom: Drop ARCH_MSM* configs

[Daniel Lezcano]

On 11/25/2015 02:08 AM, Stephen Boyd wrote:
> Drop these configs now that we select the clocksources we need
> via the defconfig.
>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
>   arch/arm/mach-qcom/Kconfig | 16 ----------------
>   1 file changed, 16 deletions(-)
>
> diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig
> index 2256cd1e25d1..37572fd79c87 100644
> --- a/arch/arm/mach-qcom/Kconfig
> +++ b/arch/arm/mach-qcom/Kconfig
> @@ -7,19 +7,3 @@ menuconfig ARCH_QCOM
>   	select QCOM_SCM if SMP
>   	help
>   	  Support for Qualcomm's devicetree based systems.
> -
> -if ARCH_QCOM
> -
> -config ARCH_MSM8X60
> -	bool "Enable support for MSM8X60"
> -	select CLKSRC_QCOM
> -
> -config ARCH_MSM8960
> -	bool "Enable support for MSM8960"
> -	select CLKSRC_QCOM
> -
> -config ARCH_MSM8974
> -	bool "Enable support for MSM8974"
> -	select HAVE_ARM_ARCH_TIMER
> -
> -endif
>

What about:

textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000
textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000

in arch/arm/Makefile

and

CONFIG_ARCH_MSM8X60=y
CONFIG_ARCH_MSM8960=y
CONFIG_ARCH_MSM8974=y

in arch/arm/configs/qcom_defconfig and multi_v7_defconfig

?

(perhaps you already did the changes and I am not looking at the right 
branch).

-- 
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[PATCH 3/3] ARM: qcom: Drop ARCH_MSM* configs

[Arnd Bergmann]

On Wednesday 25 November 2015 13:27:55 Daniel Lezcano wrote:
> 
> What about:
> 
> textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000
> textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
> 
> in arch/arm/Makefile

Good point, we need to do something about these still.

> and
> 
> CONFIG_ARCH_MSM8X60=y
> CONFIG_ARCH_MSM8960=y
> CONFIG_ARCH_MSM8974=y
> 
> in arch/arm/configs/qcom_defconfig and multi_v7_defconfig
> 
> ?

These should be removed, but they are harmless.

	Arnd

[PATCH 3/3] ARM: qcom: Drop ARCH_MSM* configs

[Stephen Boyd]

On 11/25, Arnd Bergmann wrote:
> On Wednesday 25 November 2015 13:27:55 Daniel Lezcano wrote:
> > 
> > What about:
> > 
> > textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000
> > textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
> > 
> > in arch/arm/Makefile
> 
> Good point, we need to do something about these still.
> 

Yeah good catch! My brain must be shutting down due to the
holiday coming up.

The nice thing is that CLKSRC_QCOM and this text offset stuff are
always used on the same SoCs, so we should be able to make one
config in mach-qcom/Kconfig that selects the qcom clksrc driver
and adjusts the text offset. So is the suggestion to move
CLKSRC_QCOM to mach-qcom/Kconfig, or to make a new config that
selects it?

> > and
> > 
> > CONFIG_ARCH_MSM8X60=y
> > CONFIG_ARCH_MSM8960=y
> > CONFIG_ARCH_MSM8974=y
> > 
> > in arch/arm/configs/qcom_defconfig and multi_v7_defconfig
> > 
> > ?
> 
> These should be removed, but they are harmless.

Yes I was planning to let those fall out of some defconfig update
patch later on.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 3/3] ARM: qcom: Drop ARCH_MSM* configs

[Arnd Bergmann]

On Wednesday 25 November 2015 11:34:47 Stephen Boyd wrote:
> On 11/25, Arnd Bergmann wrote:
> > On Wednesday 25 November 2015 13:27:55 Daniel Lezcano wrote:
> > > 
> > > What about:
> > > 
> > > textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000
> > > textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
> > > 
> > > in arch/arm/Makefile
> > 
> > Good point, we need to do something about these still.
> > 
> 
> Yeah good catch! My brain must be shutting down due to the
> holiday coming up.
> 
> The nice thing is that CLKSRC_QCOM and this text offset stuff are
> always used on the same SoCs, so we should be able to make one
> config in mach-qcom/Kconfig that selects the qcom clksrc driver
> and adjusts the text offset. So is the suggestion to move
> CLKSRC_QCOM to mach-qcom/Kconfig, or to make a new config that
> selects it?

I was thinking of a new option that selects it, which I think is
more in line with what Daniel wants.

	Arnd

[PATCH 3/3] ARM: qcom: Drop ARCH_MSM* configs

[Stephen Boyd]

On 11/25/15 12:30, Arnd Bergmann wrote:
> On Wednesday 25 November 2015 11:34:47 Stephen Boyd wrote:
>> On 11/25, Arnd Bergmann wrote:
>>> On Wednesday 25 November 2015 13:27:55 Daniel Lezcano wrote:
>>>> What about:
>>>>
>>>> textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000
>>>> textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
>>>>
>>>> in arch/arm/Makefile
>>> Good point, we need to do something about these still.
>>>
>> Yeah good catch! My brain must be shutting down due to the
>> holiday coming up.
>>
>> The nice thing is that CLKSRC_QCOM and this text offset stuff are
>> always used on the same SoCs, so we should be able to make one
>> config in mach-qcom/Kconfig that selects the qcom clksrc driver
>> and adjusts the text offset. So is the suggestion to move
>> CLKSRC_QCOM to mach-qcom/Kconfig, or to make a new config that
>> selects it?
> I was thinking of a new option that selects it, which I think is
> more in line with what Daniel wants.
>
>

Ok. Sounds good. Patch will follow soon after I boot test on all the
affected devices.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project