diff options
author | Olof Johansson <olof@lixom.net> | 2014-09-24 01:29:09 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-09-24 01:29:09 -0400 |
commit | 422d9abf99f12de5eb5fbc0f5bce87ff1066f941 (patch) | |
tree | 54104d472fddc72f0f0f43a4afac5d2c9036b400 /drivers | |
parent | 2fee8c1dd07260329e9788984b79b099456a9d11 (diff) | |
parent | ace8578182dc347b043c0825b9873f62fdaa5b77 (diff) |
Merge tag 'mvebu-fixes-3.17' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical
Merge "mvebu fixes for v3.17" from Jason Cooper:
- kirkwood
- final driver cleanup of ARCH_KIRKWOOD removal
- fix DT based DSA
- mvebu
- use BCH ECC for the RN2120 and RN104/2 nand chips
* tag 'mvebu-fixes-3.17' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Netgear RN102: Use Hardware BCH ECC
ARM: Kirkwood: Fix DT based DSA.
ARM: mvebu: Netgear RN2120: Use Hardware BCH ECC
ARM: mvebu: Netgear RN104: Use Hardware BCH ECC
cpufreq: Remove ARCH_KIRKWOOD dependency
watchdog: Remove ARCH_KIRKWOOD dependency
rtc: Remove ARCH_KIRKWOOD dependency
leds: Remove ARCH_KIRKWOOD dependency
thermal: Remove ARCH_KIRKWOOD dependency
ata: Remove ARCH_KIRKWOOD dependency
cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ata/Kconfig | 2 | ||||
-rw-r--r-- | drivers/cpufreq/Kconfig.arm | 2 | ||||
-rw-r--r-- | drivers/cpuidle/Kconfig.arm | 2 | ||||
-rw-r--r-- | drivers/leds/Kconfig | 4 | ||||
-rw-r--r-- | drivers/rtc/Kconfig | 2 | ||||
-rw-r--r-- | drivers/thermal/Kconfig | 2 | ||||
-rw-r--r-- | drivers/watchdog/Kconfig | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index e1b92788c225..cd4cccbfd2ab 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
@@ -299,7 +299,7 @@ config SATA_HIGHBANK | |||
299 | 299 | ||
300 | config SATA_MV | 300 | config SATA_MV |
301 | tristate "Marvell SATA support" | 301 | tristate "Marvell SATA support" |
302 | depends on PCI || ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \ | 302 | depends on PCI || ARCH_DOVE || ARCH_MV78XX0 || \ |
303 | ARCH_MVEBU || ARCH_ORION5X || COMPILE_TEST | 303 | ARCH_MVEBU || ARCH_ORION5X || COMPILE_TEST |
304 | select GENERIC_PHY | 304 | select GENERIC_PHY |
305 | help | 305 | help |
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index 18ad141907ff..28c666c80149 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm | |||
@@ -119,7 +119,7 @@ config ARM_INTEGRATOR | |||
119 | If in doubt, say Y. | 119 | If in doubt, say Y. |
120 | 120 | ||
121 | config ARM_KIRKWOOD_CPUFREQ | 121 | config ARM_KIRKWOOD_CPUFREQ |
122 | def_bool ARCH_KIRKWOOD || MACH_KIRKWOOD | 122 | def_bool MACH_KIRKWOOD |
123 | help | 123 | help |
124 | This adds the CPUFreq driver for Marvell Kirkwood | 124 | This adds the CPUFreq driver for Marvell Kirkwood |
125 | SoCs. | 125 | SoCs. |
diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm index 38cff69ffe06..58bcd0d166ec 100644 --- a/drivers/cpuidle/Kconfig.arm +++ b/drivers/cpuidle/Kconfig.arm | |||
@@ -28,7 +28,7 @@ config ARM_HIGHBANK_CPUIDLE | |||
28 | 28 | ||
29 | config ARM_KIRKWOOD_CPUIDLE | 29 | config ARM_KIRKWOOD_CPUIDLE |
30 | bool "CPU Idle Driver for Marvell Kirkwood SoCs" | 30 | bool "CPU Idle Driver for Marvell Kirkwood SoCs" |
31 | depends on ARCH_KIRKWOOD || MACH_KIRKWOOD | 31 | depends on MACH_KIRKWOOD |
32 | help | 32 | help |
33 | This adds the CPU Idle driver for Marvell Kirkwood SoCs. | 33 | This adds the CPU Idle driver for Marvell Kirkwood SoCs. |
34 | 34 | ||
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 8c96e2ddf43b..f6ef7bb2dc11 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig | |||
@@ -410,7 +410,7 @@ config LEDS_MC13783 | |||
410 | config LEDS_NS2 | 410 | config LEDS_NS2 |
411 | tristate "LED support for Network Space v2 GPIO LEDs" | 411 | tristate "LED support for Network Space v2 GPIO LEDs" |
412 | depends on LEDS_CLASS | 412 | depends on LEDS_CLASS |
413 | depends on ARCH_KIRKWOOD || MACH_KIRKWOOD | 413 | depends on MACH_KIRKWOOD |
414 | default y | 414 | default y |
415 | help | 415 | help |
416 | This option enable support for the dual-GPIO LED found on the | 416 | This option enable support for the dual-GPIO LED found on the |
@@ -420,7 +420,7 @@ config LEDS_NS2 | |||
420 | config LEDS_NETXBIG | 420 | config LEDS_NETXBIG |
421 | tristate "LED support for Big Network series LEDs" | 421 | tristate "LED support for Big Network series LEDs" |
422 | depends on LEDS_CLASS | 422 | depends on LEDS_CLASS |
423 | depends on ARCH_KIRKWOOD || MACH_KIRKWOOD | 423 | depends on MACH_KIRKWOOD |
424 | default y | 424 | default y |
425 | help | 425 | help |
426 | This option enable support for LEDs found on the LaCie 2Big | 426 | This option enable support for LEDs found on the LaCie 2Big |
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index a168e96142b9..fae9464eed9c 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
@@ -1198,7 +1198,7 @@ config RTC_DRV_TX4939 | |||
1198 | 1198 | ||
1199 | config RTC_DRV_MV | 1199 | config RTC_DRV_MV |
1200 | tristate "Marvell SoC RTC" | 1200 | tristate "Marvell SoC RTC" |
1201 | depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU | 1201 | depends on ARCH_DOVE || ARCH_MVEBU |
1202 | help | 1202 | help |
1203 | If you say yes here you will get support for the in-chip RTC | 1203 | If you say yes here you will get support for the in-chip RTC |
1204 | that can be found in some of Marvell's SoC devices, such as | 1204 | that can be found in some of Marvell's SoC devices, such as |
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 693208eb9047..ef5587fe2c69 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig | |||
@@ -143,7 +143,7 @@ config RCAR_THERMAL | |||
143 | 143 | ||
144 | config KIRKWOOD_THERMAL | 144 | config KIRKWOOD_THERMAL |
145 | tristate "Temperature sensor on Marvell Kirkwood SoCs" | 145 | tristate "Temperature sensor on Marvell Kirkwood SoCs" |
146 | depends on ARCH_KIRKWOOD || MACH_KIRKWOOD | 146 | depends on MACH_KIRKWOOD |
147 | depends on OF | 147 | depends on OF |
148 | help | 148 | help |
149 | Support for the Kirkwood thermal sensor driver into the Linux thermal | 149 | Support for the Kirkwood thermal sensor driver into the Linux thermal |
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index f57312fced80..1d1330a78af3 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
@@ -301,7 +301,7 @@ config DAVINCI_WATCHDOG | |||
301 | 301 | ||
302 | config ORION_WATCHDOG | 302 | config ORION_WATCHDOG |
303 | tristate "Orion watchdog" | 303 | tristate "Orion watchdog" |
304 | depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU | 304 | depends on ARCH_ORION5X || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU |
305 | select WATCHDOG_CORE | 305 | select WATCHDOG_CORE |
306 | help | 306 | help |
307 | Say Y here if to include support for the watchdog timer | 307 | Say Y here if to include support for the watchdog timer |