diff mbox

[v2] thermal: allow building dove_thermal with mvebu

Message ID 1401537027-32291-1-git-send-email-riku.voipio@linaro.org
State Accepted
Commit b3dee3905c19d4897386ee0282004b9723a7b6c9
Headers show

Commit Message

Riku Voipio May 31, 2014, 11:50 a.m. UTC
DT-enabled Dove has moved from ARCH_DOVE in mach-dove to MACH_DOVE
in mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
DT-only MACH_DOVE to thermal Kconfig.

This was originally supposed to go in via "ARM: dove: prepare new Dove DT Kconfig"
patch from Sebastian Hesselbarth for 3.15, but slipped through the cracks.

I've tested on CuBox that without this patch you can't compile
dove_thermal into a mach-mvebu based kernel, and with this patch I can
build the driver and it works as expected run-time.

v2: non-ascii char creeped in somehow

Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
---
 drivers/thermal/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Sebastian Hesselbarth May 31, 2014, 12:54 p.m. UTC | #1
On 05/31/2014 01:50 PM, Riku Voipio wrote:
> DT-enabled Dove has moved from ARCH_DOVE in mach-dove to MACH_DOVE
> in mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new
> DT-only MACH_DOVE to thermal Kconfig.
> 
> This was originally supposed to go in via "ARM: dove: prepare new Dove DT Kconfig"
> patch from Sebastian Hesselbarth for 3.15, but slipped through the cracks.
> 
> I've tested on CuBox that without this patch you can't compile
> dove_thermal into a mach-mvebu based kernel, and with this patch I can
> build the driver and it works as expected run-time.

Riku,

looking through my mails, the corresponding patch should have
already been applied [1].

If not, you get my

Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

[1] https://lkml.kernel.org/r/1395295065.3571.10.camel@rzhang1-mobl4

> v2: non-ascii char creeped in somehow
> 
> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Zhang Rui <rui.zhang@intel.com>
> Cc: Eduardo Valentin <edubezval@gmail.com>
> Cc: linux-pm@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> ---
>  drivers/thermal/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index 2d51912..5783c72 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -151,7 +151,7 @@ config KIRKWOOD_THERMAL
>  
>  config DOVE_THERMAL
>  	tristate "Temperature sensor on Marvell Dove SoCs"
> -	depends on ARCH_DOVE
> +	depends on ARCH_DOVE || MACH_DOVE
>  	depends on OF
>  	help
>  	  Support for the Dove thermal sensor driver in the Linux thermal
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Zhang Rui July 1, 2014, 2:04 a.m. UTC | #2
On Mon, 2014-06-02 at 09:14 +0300, Riku Voipio wrote:
> 
> On 31 May 2014 15:54, Sebastian Hesselbarth
> <sebastian.hesselbarth@gmail.com> wrote:
> > Riku,
> 
> > looking through my mails, the corresponding patch should have
> > already been applied [1].
> 
> > If not, you get my
> 
> > Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> 
> I don't see that patch applied in 3.15-rc8 or linux-next:
> 
> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/drivers/thermal/Kconfig#n152
> 
> I'd like to be sure it gets in 3.16.
> 
Sorry, I missed Sebastian' patch...
Now I've seen three versions of patches that do the similar thing.
This one, the one from Sebastian and the one in
https://patchwork.kernel.org/patch/4445141/ from Andrew.

Can anybody tell me the relationship between ARCH_DOVE and MARC_DOVE,
and which one should be the proper fix please?

Eduardo,
I would queue the proper patch for next rc, what's your opinion?

thanks,
rui


> > [1] https://lkml.kernel.org/r/1395295065.3571.10.camel@rzhang1-mobl4
> >
> > > v2: non-ascii char creeped in somehow
> > >
> > > Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
> > > Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> > > Cc: Zhang Rui <rui.zhang@intel.com>
> > > Cc: Eduardo Valentin <edubezval@gmail.com>
> > > Cc: linux-pm@vger.kernel.org
> > > Cc: linux-arm-kernel@lists.infradead.org
> > > ---
> > >  drivers/thermal/Kconfig | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> > > index 2d51912..5783c72 100644
> > > --- a/drivers/thermal/Kconfig
> > > +++ b/drivers/thermal/Kconfig
> > > @@ -151,7 +151,7 @@ config KIRKWOOD_THERMAL
> > >
> > >  config DOVE_THERMAL
> > >       tristate "Temperature sensor on Marvell Dove SoCs"
> > > -     depends on ARCH_DOVE
> > > +     depends on ARCH_DOVE || MACH_DOVE
> > >       depends on OF
> > >       help
> > >         Support for the Dove thermal sensor driver in the Linux
> thermal
> > >
> >


--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sebastian Hesselbarth July 1, 2014, 8:50 a.m. UTC | #3
On 07/01/2014 04:04 AM, Zhang Rui wrote:
> On Mon, 2014-06-02 at 09:14 +0300, Riku Voipio wrote:
>>
>> On 31 May 2014 15:54, Sebastian Hesselbarth
>> <sebastian.hesselbarth@gmail.com> wrote:
>>> Riku,
>>
>>> looking through my mails, the corresponding patch should have
>>> already been applied [1].
>>
>>> If not, you get my
>>
>>> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>>
>> I don't see that patch applied in 3.15-rc8 or linux-next:
>>
>> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/drivers/thermal/Kconfig#n152
>>
>> I'd like to be sure it gets in 3.16.
>>
> Sorry, I missed Sebastian' patch...
> Now I've seen three versions of patches that do the similar thing.
> This one, the one from Sebastian and the one in
> https://patchwork.kernel.org/patch/4445141/ from Andrew.
>
> Can anybody tell me the relationship between ARCH_DOVE and MARC_DOVE,
> and which one should be the proper fix please?

Rui,

ARCH_DOVE represents legacy, non-DT arch/arm/mach-dove while
MACH_DOVE is DT-only Dove in arch/arm/mach-mvebu.

The idea was to have both, legacy and DT-only Dove, for some
cycles to allow us to finalize the DT transition.

Due to a justified request of Russell, we will keep legacy
mach-dove for a while longer.

The correct patch is the one below, adding both MACH_DOVE and ARCH_DOVE
to DOVE_THERMAL.

Sebastian

> Eduardo,
> I would queue the proper patch for next rc, what's your opinion?
>
>>> [1] https://lkml.kernel.org/r/1395295065.3571.10.camel@rzhang1-mobl4
>>>
>>>> v2: non-ascii char creeped in somehow
>>>>
>>>> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
>>>> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>>>> Cc: Zhang Rui <rui.zhang@intel.com>
>>>> Cc: Eduardo Valentin <edubezval@gmail.com>
>>>> Cc: linux-pm@vger.kernel.org
>>>> Cc: linux-arm-kernel@lists.infradead.org
>>>> ---
>>>>   drivers/thermal/Kconfig | 2 +-
>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
>>>> index 2d51912..5783c72 100644
>>>> --- a/drivers/thermal/Kconfig
>>>> +++ b/drivers/thermal/Kconfig
>>>> @@ -151,7 +151,7 @@ config KIRKWOOD_THERMAL
>>>>
>>>>   config DOVE_THERMAL
>>>>        tristate "Temperature sensor on Marvell Dove SoCs"
>>>> -     depends on ARCH_DOVE
>>>> +     depends on ARCH_DOVE || MACH_DOVE
>>>>        depends on OF
>>>>        help
>>>>          Support for the Dove thermal sensor driver in the Linux
>> thermal
>>>>
>>>
>
>

--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Riku Voipio July 15, 2014, 2 p.m. UTC | #4
On 1 July 2014 11:50, Sebastian Hesselbarth
<sebastian.hesselbarth@gmail.com> wrote:
> On 07/01/2014 04:04 AM, Zhang Rui wrote:

>> Can anybody tell me the relationship between ARCH_DOVE and MARC_DOVE,
>> and which one should be the proper fix please?

> Rui,

> ARCH_DOVE represents legacy, non-DT arch/arm/mach-dove while
> MACH_DOVE is DT-only Dove in arch/arm/mach-mvebu.

> The idea was to have both, legacy and DT-only Dove, for some
> cycles to allow us to finalize the DT transition.

> Due to a justified request of Russell, we will keep legacy
> mach-dove for a while longer.

> The correct patch is the one below, adding both MACH_DOVE and ARCH_DOVE
> to DOVE_THERMAL.

Here on patchwork:

https://patches.linaro.org/31238/

It would be really nice to get it to 3.16 since Sebastians original
patch already slipped from 3.15 :(

Riku


> Sebastian
>
>> Eduardo,
>> I would queue the proper patch for next rc, what's your opinion?
>>
>>>> [1] https://lkml.kernel.org/r/1395295065.3571.10.camel@rzhang1-mobl4
>>>>
>>>>> v2: non-ascii char creeped in somehow
>>>>>
>>>>> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
>>>>> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>>>>> Cc: Zhang Rui <rui.zhang@intel.com>
>>>>> Cc: Eduardo Valentin <edubezval@gmail.com>
>>>>> Cc: linux-pm@vger.kernel.org
>>>>> Cc: linux-arm-kernel@lists.infradead.org
>>>>> ---
>>>>>   drivers/thermal/Kconfig | 2 +-
>>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
>>>>> index 2d51912..5783c72 100644
>>>>> --- a/drivers/thermal/Kconfig
>>>>> +++ b/drivers/thermal/Kconfig
>>>>> @@ -151,7 +151,7 @@ config KIRKWOOD_THERMAL
>>>>>
>>>>>   config DOVE_THERMAL
>>>>>        tristate "Temperature sensor on Marvell Dove SoCs"
>>>>> -     depends on ARCH_DOVE
>>>>> +     depends on ARCH_DOVE || MACH_DOVE
>>>>>        depends on OF
>>>>>        help
>>>>>          Support for the Dove thermal sensor driver in the Linux
>>>
>>> thermal
>>>>>
>>>>>
>>>>
>>
>>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 2d51912..5783c72 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -151,7 +151,7 @@  config KIRKWOOD_THERMAL
 
 config DOVE_THERMAL
 	tristate "Temperature sensor on Marvell Dove SoCs"
-	depends on ARCH_DOVE
+	depends on ARCH_DOVE || MACH_DOVE
 	depends on OF
 	help
 	  Support for the Dove thermal sensor driver in the Linux thermal