thermal: allow building dove_thermal with mvebu

PATCH Superseded Riku Voipio 3 participants 6 messages May 30, 2014 – Jul 15, 2014 1 message not in the archive Thermal

Share & tools

Riku Voipio

author

2014-05-30 12:28 UTC #0 lore raw

PATCH 1/1 thermal: allow building dove_thermal with mvebu

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.

Signed-off-by Riku Voipio <[email protected]>

Cc Sebastian Hesselbarth <[email protected]>

Cc Zhang Rui <[email protected]>

Cc Eduardo Valentin <[email protected]>

Cc linux-pm at vger.kernel.org

Cc linux-arm-kernel at lists.infradead.org

---
 drivers/thermal/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/thermal/Kconfig +1 -1

index 2d51912..5783c72 100644
@@ -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

Signature · 1 line

2.0.0.rc2

Riku Voipio

author

2014-05-31 11:50 UTC #1 lore raw

PATCH v2 1/1 thermal: allow building dove_thermal with mvebu

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 <[email protected]>

Cc Sebastian Hesselbarth <[email protected]>

Cc Zhang Rui <[email protected]>

Cc Eduardo Valentin <[email protected]>

Cc linux-pm at vger.kernel.org

Cc linux-arm-kernel at lists.infradead.org

---
 drivers/thermal/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/thermal/Kconfig +1 -1

index 2d51912..5783c72 100644
@@ -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

Signature · 1 line

2.0.0.rc2

Sebastian Hesselbarth

2014-05-31 12:54 UTC #2 lore raw

PATCH v2 1/1 thermal: allow building dove_thermal with mvebu

Quoted 10 lines · Riku Voipio

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 <[email protected]>

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

Quoted 26 lines

v2: non-ascii char creeped in somehow
Signed-off-by Riku Voipio <[email protected]>
Cc Sebastian Hesselbarth <[email protected]>
Cc Zhang Rui <[email protected]>
Cc Eduardo Valentin <[email protected]>
Cc linux-pm at vger.kernel.org
Cc linux-arm-kernel at lists.infradead.org
---
 drivers/thermal/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/Kconfig +1 -1
index 2d51912..5783c72 100644
@@ -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

A message that is not in the archive (sent off-list or not yet received): CAAqcGHkcnm_JjyzWewEcdGuGyyBwtDT_6EWxFzKSqS7NEUaerA@mail.gmail.com

Zhang Rui

reviewer

2014-07-01 02:04 UTC #4 lore raw

Quoted 10 lines · Riku Voipio

Quoted 6 lines · Sebastian Hesselbarth
Riku,
looking through my mails, the corresponding patch should have already been applied [1].
If not, you get my

Quoted 8 lines

Quoted 1 line
Acked-by Sebastian Hesselbarth <[email protected]>
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

Quoted 30 lines

Quoted 20 lines
[1] https://lkml.kernel.org/r/1395295065.3571.10.camel@rzhang1-mobl4
Quoted 18 lines
v2: non-ascii char creeped in somehow
Signed-off-by Riku Voipio <[email protected]>
Cc Sebastian Hesselbarth <[email protected]>
Cc Zhang Rui <[email protected]>
Cc Eduardo Valentin <[email protected]>
Cc [email protected]
Cc [email protected]
---
 drivers/thermal/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/Kconfig +0 -0
index 2d51912..5783c72 100644
@@ -151,7 +151,7 @@ config KIRKWOOD_THERMAL
 
Quoted 7 lines
drivers/thermal/Kconfig config KIRKWOOD_THERMAL
Quoted 7 lines
drivers/thermal/Kconfig +1 -1
 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
Quoted 2 lines
Quoted 1 line

Sebastian Hesselbarth

2014-07-01 08:51 UTC #5 lore raw

Quoted 19 lines · Zhang Rui

Quoted 10 lines · Riku Voipio
Quoted 6 lines · Sebastian Hesselbarth
Riku,
looking through my mails, the corresponding patch should have already been applied [1].
If not, you get my
Quoted 8 lines
Quoted 1 line
Acked-by Sebastian Hesselbarth <[email protected]>
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.

Quoted 7 lines

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

Quoted 35 lines

Eduardo,
I would queue the proper patch for next rc, what's your opinion?
Quoted 30 lines
Quoted 20 lines
[1] https://lkml.kernel.org/r/1395295065.3571.10.camel@rzhang1-mobl4
Quoted 18 lines
v2: non-ascii char creeped in somehow
Signed-off-by Riku Voipio <[email protected]>
Cc Sebastian Hesselbarth <[email protected]>
Cc Zhang Rui <[email protected]>
Cc Eduardo Valentin <[email protected]>
Cc [email protected]
Cc [email protected]
---
  drivers/thermal/Kconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/Kconfig +0 -0
index 2d51912..5783c72 100644
@@ -151,7 +151,7 @@ config KIRKWOOD_THERMAL
 
Quoted 7 lines
drivers/thermal/Kconfig config KIRKWOOD_THERMAL
Quoted 7 lines
drivers/thermal/Kconfig +1 -1
  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
Quoted 2 lines
Quoted 1 line

Riku Voipio

author

2014-07-15 14:00 UTC #6 lore raw

Quoted 10 lines · Sebastian Hesselbarth

Quoted 2 lines · Zhang Rui
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.

Quoted 8 lines

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

Quoted 40 lines

Sebastian
Quoted 37 lines
Eduardo,
I would queue the proper patch for next rc, what's your opinion?
Quoted 32 lines
Quoted 20 lines
[1] https://lkml.kernel.org/r/1395295065.3571.10.camel@rzhang1-mobl4
Quoted 18 lines
v2: non-ascii char creeped in somehow
Signed-off-by Riku Voipio <[email protected]>
Cc Sebastian Hesselbarth <[email protected]>
Cc Zhang Rui <[email protected]>
Cc Eduardo Valentin <[email protected]>
Cc [email protected]
Cc [email protected]
---
  drivers/thermal/Kconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/Kconfig +0 -0
index 2d51912..5783c72 100644
@@ -151,7 +151,7 @@ config KIRKWOOD_THERMAL
 
Quoted 7 lines
drivers/thermal/Kconfig config KIRKWOOD_THERMAL
Quoted 7 lines
drivers/thermal/Kconfig +1 -1
  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
Quoted 3 lines
Quoted 2 lines