leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: kirkwood: Move NSA310 common parts to include file

Browse Source 
Move definitions that are common to both nsa-310.dts and
 nsa310a.dts and that will also be used in nsa320 into
 kirkwood-nsa310-common.dtsi. Also rename the USB
 Regulator to remove the word off from its name as the
 state of a regulator shouldn't be part of its name.

Signed-off-by: Adam Baker <linux@baker-net.org.uk>
Link: https://lkml.kernel.org/r/1396820569-3841-1-git-send-email-linux@baker-net.org.uk
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Adam Baker 2014-04-06 22:42:47 +01:00 committed by Jason Cooper
parent c9eaa447e7
commit 655220960f
3 changed files with 54 additions and 104 deletions

58
arch/arm/boot/dts/kirkwood-nsa310-common.dtsi
View File

@ -7,15 +7,40 @@
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pinctrl@10000 {
pmx_usb_power_off: pmx-usb-power-off { pmx_usb_power: pmx-usb-power {
marvell,pins = "mpp21"; marvell,pins = "mpp21";
marvell,function = "gpio"; marvell,function = "gpio";
}; };
pmx_pwr_off: pmx-pwr-off { pmx_pwr_off: pmx-pwr-off {
marvell,pins = "mpp48"; marvell,pins = "mpp48";
marvell,function = "gpio"; marvell,function = "gpio";
}; };
pmx_btn_reset: pmx-btn-reset {
marvell,pins = "mpp36";
marvell,function = "gpio";
};
pmx_btn_copy: pmx-btn-copy {
marvell,pins = "mpp37";
marvell,function = "gpio";
};
pmx_btn_power: pmx-btn-power {
marvell,pins = "mpp46";
marvell,function = "gpio";
};
pmx_led_copy_green: pmx-led-copy-green {
marvell,pins = "mpp39";
marvell,function = "gpio";
};
pmx_led_copy_red: pmx-led-copy-red {
marvell,pins = "mpp40";
marvell,function = "gpio";
};
}; };
serial@12000 { serial@12000 {
@ -43,17 +68,42 @@
gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>;
}; };
gpio_keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>;
pinctrl-names = "default";
button@1 {
label = "Power Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
};
button@2 {
label = "Copy Button";
linux,code = <KEY_COPY>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
};
button@3 {
label = "Reset Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
};
};
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
pinctrl-0 = <&pmx_usb_power_off>; pinctrl-0 = <&pmx_usb_power>;
pinctrl-names = "default"; pinctrl-names = "default";
usb0_power_off: regulator@1 { usb0_power: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; reg = <1>;
regulator-name = "USB Power Off"; regulator-name = "USB Power";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-always-on; regulator-always-on;

48
arch/arm/boot/dts/kirkwood-nsa310.dts
View File

@ -59,26 +59,6 @@
marvell,function = "gpio"; marvell,function = "gpio";
}; };
pmx_btn_reset: pmx-btn-reset {
marvell,pins = "mpp36";
marvell,function = "gpio";
};
pmx_btn_copy: pmx-btn-copy {
marvell,pins = "mpp37";
marvell,function = "gpio";
};
pmx_led_copy_green: pmx-led-copy-green {
marvell,pins = "mpp39";
marvell,function = "gpio";
};
pmx_led_copy_red: pmx-led-copy-red {
marvell,pins = "mpp40";
marvell,function = "gpio";
};
pmx_led_hdd_green: pmx-led-hdd-green { pmx_led_hdd_green: pmx-led-hdd-green {
marvell,pins = "mpp41"; marvell,pins = "mpp41";
marvell,function = "gpio"; marvell,function = "gpio";
@ -94,10 +74,6 @@
marvell,function = "gpio"; marvell,function = "gpio";
}; };
pmx_btn_power: pmx-btn-power {
marvell,pins = "mpp46";
marvell,function = "gpio";
};
}; };
i2c@11000 { i2c@11000 {
@ -110,30 +86,6 @@
}; };
}; };
gpio_keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>;
pinctrl-names = "default";
button@1 {
label = "Power Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
};
button@2 {
label = "Copy Button";
linux,code = <KEY_COPY>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
};
button@3 {
label = "Reset Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
};
};
gpio-leds { gpio-leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-0 = <&pmx_led_esata_green &pmx_led_esata_red pinctrl-0 = <&pmx_led_esata_green &pmx_led_esata_red

52
arch/arm/boot/dts/kirkwood-nsa310a.dts
View File

@ -38,11 +38,6 @@
marvell,function = "gpio"; marvell,function = "gpio";
}; };
pmx_usb_power_off: pmx-usb-power-off {
marvell,pins = "mpp21";
marvell,function = "gpio";
};
pmx_led_sys_green: pmx-led-sys-green { pmx_led_sys_green: pmx-led-sys-green {
marvell,pins = "mpp28"; marvell,pins = "mpp28";
marvell,function = "gpio"; marvell,function = "gpio";
@ -53,26 +48,6 @@
marvell,function = "gpio"; marvell,function = "gpio";
}; };
pmx_btn_reset: pmx-btn-reset {
marvell,pins = "mpp36";
marvell,function = "gpio";
};
pmx_btn_copy: pmx-btn-copy {
marvell,pins = "mpp37";
marvell,function = "gpio";
};
pmx_led_copy_green: pmx-led-copy-green {
marvell,pins = "mpp39";
marvell,function = "gpio";
};
pmx_led_copy_red: pmx-led-copy-red {
marvell,pins = "mpp40";
marvell,function = "gpio";
};
pmx_led_hdd_green: pmx-led-hdd-green { pmx_led_hdd_green: pmx-led-hdd-green {
marvell,pins = "mpp41"; marvell,pins = "mpp41";
marvell,function = "gpio"; marvell,function = "gpio";
@ -83,11 +58,6 @@
marvell,function = "gpio"; marvell,function = "gpio";
}; };
pmx_btn_power: pmx-btn-power {
marvell,pins = "mpp46";
marvell,function = "gpio";
};
}; };
i2c@11000 { i2c@11000 {
@ -100,28 +70,6 @@
}; };
}; };
gpio_keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
button@1 {
label = "Power Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
};
button@2 {
label = "Copy Button";
linux,code = <KEY_COPY>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
};
button@3 {
label = "Reset Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
};
};
gpio-leds { gpio-leds {
compatible = "gpio-leds"; compatible = "gpio-leds";