ARM: kirkwood: cleanup lsxl board includes
Subsystems (3)
PATCH 1/2 ARM: kirkwood: cleanup lsxl board includes
Remove unneeded includes. These are leftovers from platform device registrations.
--- arch/arm/mach-kirkwood/board-lsxl.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-)
arch/arm/mach-kirkwood/board-lsxl.c +0 -8
@@ -14,17 +14,9 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h> -#include <linux/mtd/partitions.h> -#include <linux/ata_platform.h> -#include <linux/spi/flash.h> -#include <linux/spi/spi.h> #include <linux/mv643xx_eth.h> #include <linux/gpio.h> #include <linux/gpio-fan.h> -#include <linux/input.h> -#include <asm/mach-types.h> -#include <asm/mach/arch.h> -#include <mach/kirkwood.h> #include "common.h" #include "mpp.h"
Signature · 1 line
1.7.2.5
PATCH 2/2 ARM: kirkwood: use gpio-fan DT binding on lsxl
Remove board specific gpio-fan driver registration. Moved into device tree.
--- arch/arm/boot/dts/kirkwood-lsxl.dtsi | 11 ++++++++ arch/arm/mach-kirkwood/board-lsxl.c | 47 ---------------------------------- 2 files changed, 11 insertions(+), 47 deletions(-)
arch/arm/boot/dts/kirkwood-lsxl.dtsi +11 -0
@@ -94,4 +94,15 @@ gpios = <&gpio1 16 1>; }; }; + + gpio_fan { + compatible = "gpio-fan"; + gpios = <&gpio0 19 1 + &gpio0 18 1>; + gpio-fan,speed-map = <0 3 + 1500 2 + 3250 1 + 5000 0>; + alarm-gpios = <&gpio1 8 0>; + }; };
arch/arm/mach-kirkwood/board-lsxl.c +0 -47
65 lines not on this page · raw message
Signature · 1 line
1.7.2.5
PATCH 2/2 ARM: kirkwood: use gpio-fan DT binding on lsxl
Quoted 33 lines · Michael Walle
Remove board specific gpio-fan driver registration. Moved into device tree.
Signed-off-by Michael Walle <[email protected]>--- arch/arm/boot/dts/kirkwood-lsxl.dtsi | 11 ++++++++ arch/arm/mach-kirkwood/board-lsxl.c | 47 ---------------------------------- 2 files changed, 11 insertions(+), 47 deletions(-)arch/arm/boot/dts/kirkwood-lsxl.dtsi +11
-0@@ -94,4 +94,15 @@ gpios = <&gpio1 16 1>; }; }; + + gpio_fan { + compatible = "gpio-fan"; + gpios = <&gpio0 19 1 + &gpio0 18 1>; + gpio-fan,speed-map = <0 3 + 1500 2 + 3250 1 + 5000 0>; + alarm-gpios = <&gpio1 8 0>; + }; };arch/arm/mach-kirkwood/board-lsxl.c +0
-0
arch/arm/mach-kirkwood/board-lsxl.c line 20
Quoted 6 lines
arch/arm/mach-kirkwood/board-lsxl.c +0
-1@@ -16,7 +16,6 @@#include <linux/platform_device.h> #include <linux/mv643xx_eth.h> #include <linux/gpio.h> -#include <linux/gpio-fan.h> #include "common.h" #include "mpp.h"
Hi Michael
You might also be able to remove platform_device.h.
Otherwise, it looks good.
Andrew
PATCH 2/2 ARM: kirkwood: use gpio-fan DT binding on lsxl
Am Sonntag 21 Oktober 2012, 08:55:52 schrieb Andrew Lunn:
Quoted 48 lines · Michael Walle
Quoted 47 lines
Remove board specific gpio-fan driver registration. Moved into device tree.
Signed-off-by Michael Walle <[email protected]>---
arch/arm/boot/dts/kirkwood-lsxl.dtsi | 11 ++++++++ arch/arm/mach-kirkwood/board-lsxl.c | 47---------------------------------- 2 files changed, 11 insertions(+), 47 deletions(-)
(quoted diff) +0
-0
b/arch/arm/boot/dts/kirkwood-lsxl.dtsiindex 8fea375..798e60e 100644arch/arm/boot/dts/kirkwood-lsxl.dtsi +11
-0@@ -94,4 +94,15 @@ gpios = <&gpio1 16 1>; }; }; + + gpio_fan { + compatible = "gpio-fan"; + gpios = <&gpio0 19 1 + &gpio0 18 1>; + gpio-fan,speed-map = <0 3 + 1500 2 + 3250 1 + 5000 0>; + alarm-gpios = <&gpio1 8 0>; + }; };(quoted diff) +0
-0
b/arch/arm/mach-kirkwood/board-lsxl.cindex 64e5cc6..7e18cad 100644arch/arm/mach-kirkwood/board-lsxl.c +0
-0@@ -16,7 +16,6 @@#include <linux/platform_device.h> #include <linux/mv643xx_eth.h> #include <linux/gpio.h>
Quoted 8 lines
Quoted 4 lines
arch/arm/mach-kirkwood/board-lsxl.c +0
-1-#include <linux/gpio-fan.h> #include "
common.h"
#include "mpp.h"Hi Michael
You might also be able to remove
platform_device.h.
Mh, pm_power_off, although defined in linux/pm.h, is somehow pulled with this include. So either we leave it that way (looking at other boards only a few has included pm.h) or i'll post a third patch which replaces that include.
Signature · 1 line
Michael
PATCH 2/2 ARM: kirkwood: use gpio-fan DT binding on lsxl
Quoted 7 lines
Quoted 3 lines
Hi Michael
You might also be able to remove
platform_device.h.Mh,
pm_power_off, although defined inlinux/pm.h, is somehow pulled with this include. So either we leave it that way (looking at other boards only a few has includedpm.h) or i'll post a third patch which replaces that include.
O.K, leave it as it is.
I hope to look at a DT solution for pm_power_off sometime soon.
Andrew
PATCH 2/2 ARM: kirkwood: use gpio-fan DT binding on lsxl
In reply to Michael WalleQuoted 7 lines · Michael Walle
Remove board specific gpio-fan driver registration. Moved into device tree.
Signed-off-by Michael Walle <[email protected]>--- arch/arm/boot/dts/kirkwood-lsxl.dtsi | 11 ++++++++ arch/arm/mach-kirkwood/board-lsxl.c | 47 ---------------------------------- 2 files changed, 11 insertions(+), 47 deletions(-)
Applied to:
git://git.infradead.org/users/jcooper/linux.git kirkwood/boards
thx,
Jason.
PATCH 1/2 ARM: kirkwood: cleanup lsxl board includes
In reply to Michael WalleQuoted 7 lines · Michael Walle
Remove unneeded includes. These are leftovers from platform device registrations.
Signed-off-by Michael Walle <[email protected]>--- arch/arm/mach-kirkwood/board-lsxl.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-)
Applied to:
git://git.infradead.org/users/jcooper/linux.git kirkwood/cleanup
thx,
Jason.