forked from Minki/linux
ARM: dts: kirkwood: rename pin-controller nodes
To prepare pin-controller consolidation, first rename all pinctrl nodes to a more appropriate name regarding ePAPR recommended names. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Andrew Lunn <andrew@lunn.ch> Link: https://lkml.kernel.org/r/1398862602-29595-6-git-send-email-sebastian.hesselbarth@gmail.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
parent
e37e01112a
commit
a948396981
@ -35,7 +35,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
compatible = "marvell,88f6192-pinctrl";
|
||||
reg = <0x10000 0x20>;
|
||||
|
||||
|
@ -35,7 +35,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
compatible = "marvell,88f6281-pinctrl";
|
||||
reg = <0x10000 0x20>;
|
||||
|
||||
|
@ -56,7 +56,7 @@
|
||||
};
|
||||
ocp@f1000000 {
|
||||
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
compatible = "marvell,88f6282-pinctrl";
|
||||
reg = <0x10000 0x20>;
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
/ {
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
compatible = "marvell,98dx4122-pinctrl";
|
||||
reg = <0x10000 0x20>;
|
||||
|
||||
|
@ -45,7 +45,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pmx_button_power: pmx-button-power {
|
||||
marvell,pins = "mpp39";
|
||||
marvell,function = "gpio";
|
||||
|
@ -18,7 +18,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pmx_cloudbox_sata0: pmx-cloudbox-sata0 {
|
||||
marvell,pins = "mpp15";
|
||||
marvell,function = "sata0";
|
||||
|
@ -26,7 +26,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl@10000 {
|
||||
pin-controller@10000 {
|
||||
pmx_sdio_gpios: pmx-sdio-gpios {
|
||||
marvell,pins = "mpp37", "mpp38";
|
||||
marvell,function = "gpio";
|
||||
|
@ -50,7 +50,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
|
||||
pinctrl-0 = <&pmx_power_back_on &pmx_present_sata0
|
||||
&pmx_present_sata1 &pmx_fan_tacho
|
||||
|
@ -18,7 +18,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pmx_usb_power_enable: pmx-usb-power-enable {
|
||||
marvell,pins = "mpp29";
|
||||
marvell,function = "gpio";
|
||||
|
@ -18,7 +18,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pmx_led_bluetooth: pmx-led-bluetooth {
|
||||
marvell,pins = "mpp47";
|
||||
marvell,function = "gpio";
|
||||
|
@ -18,7 +18,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pmx_usb_power_enable: pmx-usb-power-enable {
|
||||
marvell,pins = "mpp29";
|
||||
marvell,function = "gpio";
|
||||
|
@ -18,7 +18,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pmx_led_health_r: pmx-led-health-r {
|
||||
marvell,pins = "mpp46";
|
||||
marvell,function = "gpio";
|
||||
|
@ -18,7 +18,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pmx_led_os_red: pmx-led-os-red {
|
||||
marvell,pins = "mpp22";
|
||||
marvell,function = "gpio";
|
||||
|
@ -30,7 +30,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pmx_button_reset: pmx-button-reset {
|
||||
marvell,pins = "mpp12";
|
||||
marvell,function = "gpio";
|
||||
|
@ -18,7 +18,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pinctrl-0 = < &pmx_led_sata_brt_ctrl_1
|
||||
&pmx_led_sata_brt_ctrl_2
|
||||
&pmx_led_backup_brt_ctrl_1
|
||||
|
@ -18,7 +18,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pinctrl-0 = < &pmx_i2c_gpio_sda &pmx_i2c_gpio_scl >;
|
||||
pinctrl-names = "default";
|
||||
|
||||
|
@ -55,7 +55,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pmx_usb_power_enable: pmx-usb-power-enable {
|
||||
marvell,pins = "mpp14";
|
||||
marvell,function = "gpio";
|
||||
|
@ -8,7 +8,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pmx_power_hdd: pmx-power-hdd {
|
||||
marvell,pins = "mpp10";
|
||||
marvell,function = "gpo";
|
||||
|
@ -28,7 +28,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pmx_led_health: pmx-led-health {
|
||||
marvell,pins = "mpp7";
|
||||
marvell,function = "gpo";
|
||||
|
@ -32,7 +32,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl@10000 {
|
||||
pin-controller@10000 {
|
||||
pmx_usb_led: pmx-usb-led {
|
||||
marvell,pins = "mpp12";
|
||||
marvell,function = "gpo";
|
||||
|
@ -39,7 +39,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pmx_button_power: pmx-button-power {
|
||||
marvell,pins = "mpp47";
|
||||
marvell,function = "gpio";
|
||||
|
@ -41,7 +41,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pmx_button_power: pmx-button-power {
|
||||
marvell,pins = "mpp47";
|
||||
marvell,function = "gpio";
|
||||
|
@ -8,7 +8,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pmx_ns2_sata0: pmx-ns2-sata0 {
|
||||
marvell,pins = "mpp21";
|
||||
marvell,function = "sata0";
|
||||
|
@ -26,7 +26,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pinctrl-0 = <&pmx_unknown>;
|
||||
pinctrl-names = "default";
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pinctrl-names = "default";
|
||||
|
||||
pmx_led_esata_green: pmx-led-esata-green {
|
||||
|
@ -38,7 +38,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pinctrl-names = "default";
|
||||
|
||||
/* SATA Activity and Present pins are not connected */
|
||||
|
@ -5,7 +5,7 @@
|
||||
model = "ZyXEL NSA310";
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
|
||||
pmx_usb_power: pmx-usb-power {
|
||||
marvell,pins = "mpp21";
|
||||
|
@ -46,7 +46,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;
|
||||
pinctrl-names = "default";
|
||||
|
||||
|
@ -58,7 +58,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;
|
||||
pinctrl-names = "default";
|
||||
|
||||
|
@ -40,7 +40,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pinctrl-0 = <&pmx_usb_power>;
|
||||
pinctrl-names = "default";
|
||||
|
||||
|
@ -36,7 +36,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pinctrl-0 = <&pmx_sdio_cd>;
|
||||
pinctrl-names = "default";
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
|
||||
pmx_usb_power_enable: pmx-usb-power-enable {
|
||||
marvell,pins = "mpp29";
|
||||
|
@ -25,7 +25,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pmx_alarmled_12: pmx-alarmled-12 {
|
||||
marvell,pins = "mpp12";
|
||||
marvell,function = "gpio";
|
||||
|
@ -41,7 +41,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pinctrl-0 = <&pmx_i2s &pmx_sysrst>;
|
||||
pinctrl-names = "default";
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
/*
|
||||
* Switch positions
|
||||
*
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
/ {
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
|
||||
pinctrl-0 = <&pmx_ram_size &pmx_board_id>;
|
||||
pinctrl-names = "default";
|
||||
|
@ -16,7 +16,7 @@
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
|
||||
pinctrl-0 = <&pmx_ram_size &pmx_board_id>;
|
||||
pinctrl-names = "default";
|
||||
|
@ -14,7 +14,7 @@
|
||||
compatible = "qnap,ts419", "marvell,kirkwood";
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pinctrl@10000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pinctrl-names = "default";
|
||||
|
||||
pmx_USB_copy_button: pmx-USB-copy-button {
|
||||
|
Loading…
Reference in New Issue
Block a user