Skip to contentSkip to conversation

0/7] Remove mach-kirkwood

PATCH Superseded Andrew Lunn 7 participants 16 messages Aug 30, 2014 – Sep 9, 2014

Subsystems (7)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 0/7] Remove mach-kirkwood

This is mostly a resend of these patches, removing mach-kirkwood. Not all maintainers picked up there patches, which has resulted in some dead kernel configuration in v3.17-rcX.

The patch set has been rebased on v3.17-rc2, and it is intended that Jason Cooper will submit them for inclusion in an RC. Subsystem maintainers do not need to do anything.

The last patch "cpufreq: Remove ARCH_KIRKWOOD dependency" is new, since what it is removing was added during v3.16-rcX. It follows the pattern of all the other patches.

Andrew Lunn (7):
cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency
ata: Remove ARCH_KIRKWOOD dependency
thermal: Remove ARCH_KIRKWOOD dependency
leds: Remove ARCH_KIRKWOOD dependency
rtc: Remove ARCH_KIRKWOOD dependency
watchdog: Remove ARCH_KIRKWOOD dependency
cpufreq: Remove ARCH_KIRKWOOD dependency

 drivers/ata/Kconfig         | 2 +-
 drivers/cpufreq/Kconfig.arm | 2 +-
 drivers/cpuidle/Kconfig.arm | 2 +-
 drivers/leds/Kconfig        | 4 ++--
 drivers/rtc/Kconfig         | 2 +-
 drivers/thermal/Kconfig     | 2 +-
 drivers/watchdog/Kconfig    | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

--
2.1.0

Cc Daniel Lezcano <[email protected]>
Cc Rafael J. Wysocki <[email protected]>
Cc linux-pm at vger.kernel.org
Cc Tejun Heo <[email protected]>
Cc linux-ide at vger.kernel.org
Cc Zhang Rui <[email protected]>
Cc linux-pm at vger.kernel.org
Cc Richard Purdie <[email protected]>
Cc linux-leds at vger.kernel.org
Cc Alessandro Zummo <[email protected]>
Cc rtc-linux at googlegroups.com
Cc Wim Van Sebroeck <[email protected]>
Cc linux-watchdog at vger.kernel.org
Cc Viresh Kumar <[email protected]>
#1 lore raw

PATCH v3 1/1 1/7] cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. Use MACH_KIRKWOOD, which is set when kirkwood is built as part of mach-mvebu.

Cc Daniel Lezcano <[email protected]>
Cc Rafael J. Wysocki <[email protected]>
Cc linux-pm at vger.kernel.org
---
 drivers/cpuidle/Kconfig.arm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpuidle/Kconfig.arm +1 -1
index 38cff69ffe06..58bcd0d166ec 100644
@@ -28,7 +28,7 @@ config ARM_HIGHBANK_CPUIDLE
 
 config ARM_KIRKWOOD_CPUIDLE
 	bool "CPU Idle Driver for Marvell Kirkwood SoCs"
-	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+	depends on MACH_KIRKWOOD
 	help
 	  This adds the CPU Idle driver for Marvell Kirkwood SoCs.
 
Signature · 1 line
2.1.0
#2 lore raw

PATCH v3 1/1 1/7] cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency

Quoted 8 lines · Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. Use MACH_KIRKWOOD, which is set when kirkwood is built as part of mach-mvebu.

Cc Daniel Lezcano <[email protected]>
Cc Rafael J. Wysocki <[email protected]>
Cc linux-pm at vger.kernel.org
Quoted 18 lines
---
  drivers/cpuidle/Kconfig.arm | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpuidle/Kconfig.arm +1 -1
index 38cff69ffe06..58bcd0d166ec 100644
@@ -28,7 +28,7 @@ config ARM_HIGHBANK_CPUIDLE
 
  config ARM_KIRKWOOD_CPUIDLE
  	bool "CPU Idle Driver for Marvell Kirkwood SoCs"
-	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+	depends on MACH_KIRKWOOD
  	help
  	  This adds the CPU Idle driver for Marvell Kirkwood SoCs.
 
Signature · 5 lines
  <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
#3 lore raw

PATCH v3 1/1 2/7] ata: Remove ARCH_KIRKWOOD dependency

In reply to Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. ARCH_MVEBU is sufficient.

Cc Tejun Heo <[email protected]>
Cc linux-ide at vger.kernel.org
---
 drivers/ata/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/Kconfig +1 -1
index e1b92788c225..cd4cccbfd2ab 100644
@@ -299,7 +299,7 @@ config SATA_HIGHBANK
 
 config SATA_MV
 	tristate "Marvell SATA support"
-	depends on PCI || ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \
+	depends on PCI || ARCH_DOVE || ARCH_MV78XX0 || \
 		   ARCH_MVEBU || ARCH_ORION5X || COMPILE_TEST
 	select GENERIC_PHY
 	help
Signature · 1 line
2.1.0
#5 lore raw

PATCH v3 1/1 3/7] thermal: Remove ARCH_KIRKWOOD dependency

In reply to Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. Depend on MACH_KIRKWOOD, which will be set when kirkwood is built as part of ARCH_MVEBU.

Cc Zhang Rui <[email protected]>
Cc linux-pm at vger.kernel.org
---
 drivers/thermal/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/Kconfig +1 -1
index 693208eb9047..ef5587fe2c69 100644
@@ -143,7 +143,7 @@ config RCAR_THERMAL
 
 config KIRKWOOD_THERMAL
 	tristate "Temperature sensor on Marvell Kirkwood SoCs"
-	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+	depends on MACH_KIRKWOOD
 	depends on OF
 	help
 	  Support for the Kirkwood thermal sensor driver into the Linux thermal
Signature · 1 line
2.1.0
#6 lore raw

PATCH v3 1/1 3/7] thermal: Remove ARCH_KIRKWOOD dependency

Andrew,

Quoted 16 lines · Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. Depend on MACH_KIRKWOOD, which will be set when kirkwood is built as part of ARCH_MVEBU.

Cc Zhang Rui <[email protected]>
Cc linux-pm at vger.kernel.org
---
 drivers/thermal/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/Kconfig +0 -0
index 693208eb9047..ef5587fe2c69 100644

drivers/thermal/Kconfig config RCAR_THERMAL · line 146

Quoted 5 lines
drivers/thermal/Kconfig +1 -1
@@ -143,7 +143,7 @@ config RCAR_THERMAL
 
 config KIRKWOOD_THERMAL
        tristate "Temperature sensor on Marvell Kirkwood SoCs"
-       depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+       depends on MACH_KIRKWOOD

I have no objections with this change. So, wrt thermal:

Quoted 10 lines
drivers/thermal/Kconfig +0 -1
        depends on OF
        help
          Support for the Kirkwood thermal sensor driver into the Linux thermal
--

2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 1 line
Eduardo Bezerra Valentin
#7 lore raw

PATCH v3 1/1 4/7] leds: Remove ARCH_KIRKWOOD dependency

In reply to Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. Use MACH_KIRKWOOD which will be set when kirkwood is built as part of mach-mvebu.

Cc Richard Purdie <[email protected]>
Cc linux-leds at vger.kernel.org
---
 drivers/leds/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/leds/Kconfig +2 -2
index 8c96e2ddf43b..f6ef7bb2dc11 100644
@@ -410,7 +410,7 @@ config LEDS_MC13783
 config LEDS_NS2
 	tristate "LED support for Network Space v2 GPIO LEDs"
 	depends on LEDS_CLASS
-	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+	depends on MACH_KIRKWOOD
 	default y
 	help
 	  This option enable support for the dual-GPIO LED found on the
@@ -420,7 +420,7 @@ config LEDS_NS2
 config LEDS_NETXBIG
 	tristate "LED support for Big Network series LEDs"
 	depends on LEDS_CLASS
-	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+	depends on MACH_KIRKWOOD
 	default y
 	help
 	  This option enable support for LEDs found on the LaCie 2Big
Signature · 1 line
2.1.0
#8 lore raw

PATCH v3 1/1 5/7] rtc: Remove ARCH_KIRKWOOD dependency

In reply to Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. ARCH_MVEBU is sufficient.

Cc Alessandro Zummo <[email protected]>
Cc rtc-linux at googlegroups.com
---
 drivers/rtc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/Kconfig +1 -1
index a168e96142b9..fae9464eed9c 100644
@@ -1198,7 +1198,7 @@ config RTC_DRV_TX4939
 
 config RTC_DRV_MV
 	tristate "Marvell SoC RTC"
-	depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU
+	depends on ARCH_DOVE || ARCH_MVEBU
 	help
 	  If you say yes here you will get support for the in-chip RTC
 	  that can be found in some of Marvell's SoC devices, such as
Signature · 1 line
2.1.0
#9 lore raw

PATCH v3 1/1 6/7] watchdog: Remove ARCH_KIRKWOOD dependency

In reply to Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. ARCH_MVEBU is sufficient.

Cc Wim Van Sebroeck <[email protected]>
Cc linux-watchdog at vger.kernel.org
---
 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/Kconfig +1 -1
index f57312fced80..1d1330a78af3 100644
@@ -301,7 +301,7 @@ config DAVINCI_WATCHDOG
 
 config ORION_WATCHDOG
 	tristate "Orion watchdog"
-	depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU
+	depends on ARCH_ORION5X || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU
 	select WATCHDOG_CORE
 	help
 	  Say Y here if to include support for the watchdog timer
Signature · 1 line
2.1.0
#10 lore raw

PATCH v3 1/1 7/7] cpufreq: Remove ARCH_KIRKWOOD dependency

In reply to Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. ARCH_MVEBU is sufficient.

Cc "Rafael J. Wysocki" <[email protected]>
Cc Viresh Kumar <[email protected]>
---
 drivers/cpufreq/Kconfig.arm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/Kconfig.arm +1 -1
index 7364a538e056..8c5cf4bdeab8 100644
@@ -119,7 +119,7 @@ config ARM_INTEGRATOR
 	  If in doubt, say Y.
 
 config ARM_KIRKWOOD_CPUFREQ
-	def_bool ARCH_KIRKWOOD || MACH_KIRKWOOD
+	def_bool MACH_KIRKWOOD
 	help
 	  This adds the CPUFreq driver for Marvell Kirkwood
 	  SoCs.
Signature · 1 line
2.1.0
maintainer
#11 lore raw

PATCH v3 1/1 7/7] cpufreq: Remove ARCH_KIRKWOOD dependency

Quoted 15 lines · Andrew Lunn

mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. ARCH_MVEBU is sufficient.

Cc "Rafael J. Wysocki" <[email protected]>
Cc Viresh Kumar <[email protected]>
---
 drivers/cpufreq/Kconfig.arm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/Kconfig.arm +0 -0
index 7364a538e056..8c5cf4bdeab8 100644

drivers/cpufreq/Kconfig.arm config ARM_INTEGRATOR · line 125

Quoted 8 lines
drivers/cpufreq/Kconfig.arm +1 -1
@@ -119,7 +119,7 @@ config ARM_INTEGRATOR
          If in doubt, say Y.
 
 config ARM_KIRKWOOD_CPUFREQ
-       def_bool ARCH_KIRKWOOD || MACH_KIRKWOOD
+       def_bool MACH_KIRKWOOD
        help
          This adds the CPUFreq driver for Marvell Kirkwood
          SoCs.
#12 lore raw

PATCH v3 1/1 0/7] Remove mach-kirkwood

In reply to Andrew Lunn
Quoted 12 lines · Andrew Lunn

This is mostly a resend of these patches, removing mach-kirkwood. Not all maintainers picked up there patches, which has resulted in some dead kernel configuration in v3.17-rcX.

The patch set has been rebased on v3.17-rc2, and it is intended that Jason Cooper will submit them for inclusion in an RC. Subsystem maintainers do not need to do anything.

The last patch "cpufreq: Remove ARCH_KIRKWOOD dependency" is new, since what it is removing was added during v3.16-rcX. It follows the pattern of all the other patches.

Quoted 8 lines

Andrew Lunn (7):
cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency
ata: Remove ARCH_KIRKWOOD dependency
thermal: Remove ARCH_KIRKWOOD dependency
leds: Remove ARCH_KIRKWOOD dependency
rtc: Remove ARCH_KIRKWOOD dependency
watchdog: Remove ARCH_KIRKWOOD dependency
cpufreq: Remove ARCH_KIRKWOOD dependency

I have no problems with these changes, but what exactly am I supposed to do?

Rafael

#13 lore raw

PATCH v3 1/1 0/7] Remove mach-kirkwood

Quoted 22 lines · Rafael J. Wysocki
Quoted 12 lines · Andrew Lunn

This is mostly a resend of these patches, removing mach-kirkwood. Not all maintainers picked up there patches, which has resulted in some dead kernel configuration in v3.17-rcX.

The patch set has been rebased on v3.17-rc2, and it is intended that Jason Cooper will submit them for inclusion in an RC. Subsystem maintainers do not need to do anything.

The last patch "cpufreq: Remove ARCH_KIRKWOOD dependency" is new, since what it is removing was added during v3.16-rcX. It follows the pattern of all the other patches.

Quoted 8 lines

Andrew Lunn (7):
cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency
ata: Remove ARCH_KIRKWOOD dependency
thermal: Remove ARCH_KIRKWOOD dependency
leds: Remove ARCH_KIRKWOOD dependency
rtc: Remove ARCH_KIRKWOOD dependency
watchdog: Remove ARCH_KIRKWOOD dependency
cpufreq: Remove ARCH_KIRKWOOD dependency

Quoted 1 line

I have no problems with these changes, but what exactly am I supposed to do?

Jason will submit the whole series. So an Acked-by: would be nice.

Andrew

#14 lore raw

PATCH v3 1/1 0/7] Remove mach-kirkwood

Quoted 23 lines · Andrew Lunn
Quoted 22 lines · Rafael J. Wysocki
Quoted 20 lines · Andrew Lunn

This is mostly a resend of these patches, removing mach-kirkwood. Not all maintainers picked up there patches, which has resulted in some dead kernel configuration in v3.17-rcX.

The patch set has been rebased on v3.17-rc2, and it is intended that Jason Cooper will submit them for inclusion in an RC. Subsystem maintainers do not need to do anything.

The last patch "cpufreq: Remove ARCH_KIRKWOOD dependency" is new, since what it is removing was added during v3.16-rcX. It follows the pattern of all the other patches.

Andrew Lunn (7):
cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency
ata: Remove ARCH_KIRKWOOD dependency
thermal: Remove ARCH_KIRKWOOD dependency
leds: Remove ARCH_KIRKWOOD dependency
rtc: Remove ARCH_KIRKWOOD dependency
watchdog: Remove ARCH_KIRKWOOD dependency
cpufreq: Remove ARCH_KIRKWOOD dependency

Quoted 3 lines
Quoted 1 line

I have no problems with these changes, but what exactly am I supposed to do?

Jason will submit the whole series. So an Acked-by: would be nice.

OK, so please regard the cpuidle and cpufreq patches as ACKed.

Rafael

#15 lore raw

PATCH v3 1/1 0/7] Remove mach-kirkwood

In reply to Andrew Lunn

Andrew,

Quoted 21 lines · Andrew Lunn

This is mostly a resend of these patches, removing mach-kirkwood. Not all maintainers picked up there patches, which has resulted in some dead kernel configuration in v3.17-rcX.

The patch set has been rebased on v3.17-rc2, and it is intended that Jason Cooper will submit them for inclusion in an RC. Subsystem maintainers do not need to do anything.

The last patch "cpufreq: Remove ARCH_KIRKWOOD dependency" is new, since what it is removing was added during v3.16-rcX. It follows the pattern of all the other patches.

Andrew Lunn (7):
cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency
ata: Remove ARCH_KIRKWOOD dependency
thermal: Remove ARCH_KIRKWOOD dependency
leds: Remove ARCH_KIRKWOOD dependency
rtc: Remove ARCH_KIRKWOOD dependency
watchdog: Remove ARCH_KIRKWOOD dependency
cpufreq: Remove ARCH_KIRKWOOD dependency

Quoted 8 lines
 drivers/ata/Kconfig         | 2 +-
 drivers/cpufreq/Kconfig.arm | 2 +-
 drivers/cpuidle/Kconfig.arm | 2 +-
 drivers/leds/Kconfig        | 4 ++--
 drivers/rtc/Kconfig         | 2 +-
 drivers/thermal/Kconfig     | 2 +-
 drivers/watchdog/Kconfig    | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

Applied to mvebu/fixes for v3.17 with all the various Acks. Also, please don't add the extra ']' in the Subject lines, 'git am' threw a gasket on that so I had to manually edit before applying. Not a big deal, just an fyi.

thx,

Jason.