UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm: kirkwood: sheevaplug: move pinmux configs to the right devices 

When the pinmux mechanism was added in Kirkwood, the device driver
core was not yet providing the possibility of attaching pinmux
configurations to all devices, drivers had to do it explicitly, and
not all drivers were doing this.

Now that the driver core does that in a generic way, it makes sense to
attach the pinmux configuration to their corresponding devices.

Signed-off-by: Simon Baatz <gmbnomis@gmail.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Simon Baatz 2013-06-04 23:32:32 +02:00 committed by Jason Cooper
parent be5a9389e8
commit a649277e79
3 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
View File

@ -44,10 +44,14 @@
}; };
}; };
serial@12000 { serial@12000 {
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "okay"; status = "okay";
}; };
nand@3000000 { nand@3000000 {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
status = "okay"; status = "okay";
partition@0 { partition@0 {
@ -71,6 +75,8 @@
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
pinctrl-0 = <&pmx_usb_power_enable>;
pinctrl-names = "default";
usb_power: regulator@1 { usb_power: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
@ -84,14 +90,4 @@
gpio = <&gpio0 29 0>; gpio = <&gpio0 29 0>;
}; };
}; };
gpio-leds {
compatible = "gpio-leds";
health {
label = "sheevaplug:blue:health";
gpios = <&gpio1 17 1>;
linux,default-trigger = "default-on";
};
};
}; };

21
arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts
View File

@ -15,15 +15,6 @@
compatible = "globalscale,sheevaplug-esata-rev13", "globalscale,sheevaplug-esata", "globalscale,sheevaplug", "marvell,kirkwood-88f6281", "marvell,kirkwood"; compatible = "globalscale,sheevaplug-esata-rev13", "globalscale,sheevaplug-esata", "globalscale,sheevaplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl-0 = < &pmx_nand &pmx_uart0
&pmx_usb_power_enable
&pmx_led_blue>;
pinctrl-names = "default";
};
sata@80000 { sata@80000 {
status = "okay"; status = "okay";
nr-ports = <2>; nr-ports = <2>;
@ -37,4 +28,16 @@
wp-gpios = <&gpio1 15 0>; wp-gpios = <&gpio1 15 0>;
}; };
}; };
gpio-leds {
compatible = "gpio-leds";
pinctrl-0 = <&pmx_led_blue>;
pinctrl-names = "default";
health {
label = "sheevaplug:blue:health";
gpios = <&gpio1 17 1>;
linux,default-trigger = "default-on";
};
};
}; };

18
arch/arm/boot/dts/kirkwood-sheevaplug.dts
View File

@ -15,16 +15,6 @@
compatible = "globalscale,sheevaplug", "marvell,kirkwood-88f6281", "marvell,kirkwood"; compatible = "globalscale,sheevaplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl-0 = < &pmx_nand &pmx_uart0
&pmx_usb_power_enable
&pmx_led_red
&pmx_led_blue>;
pinctrl-names = "default";
};
mvsdio@90000 { mvsdio@90000 {
pinctrl-0 = <&pmx_sdio>; pinctrl-0 = <&pmx_sdio>;
pinctrl-names = "default"; pinctrl-names = "default";
@ -36,6 +26,14 @@
gpio-leds { gpio-leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-0 = <&pmx_led_blue &pmx_led_red>;
pinctrl-names = "default";
health {
label = "sheevaplug:blue:health";
gpios = <&gpio1 17 1>;
linux,default-trigger = "default-on";
};
misc { misc {
label = "sheevaplug:red:misc"; label = "sheevaplug:red:misc";