Skip to content

L
linux
Commit a9483969 authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth Committed by Jason Cooper
Browse files
Options

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: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-6-git-send-email-sebastian.hesselbarth@gmail.comSigned-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent e37e0111
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
arch/arm/boot/dts/kirkwood-6192.dtsi
View file @ a9483969
......@@ -35,7 +35,7 @@ pcie0: pcie@1,0 {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
compatible = "marvell,88f6192-pinctrl";
reg = <0x10000 0x20>;
......
arch/arm/boot/dts/kirkwood-6281.dtsi
View file @ a9483969
......@@ -35,7 +35,7 @@ pcie0: pcie@1,0 {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
compatible = "marvell,88f6281-pinctrl";
reg = <0x10000 0x20>;
......
arch/arm/boot/dts/kirkwood-6282.dtsi
View file @ a9483969
......@@ -56,7 +56,7 @@ pcie1: pcie@2,0 {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
compatible = "marvell,88f6282-pinctrl";
reg = <0x10000 0x20>;
......
arch/arm/boot/dts/kirkwood-98dx4122.dtsi
View file @ a9483969
/ {
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
compatible = "marvell,98dx4122-pinctrl";
reg = <0x10000 0x20>;
......
arch/arm/boot/dts/kirkwood-b3.dts
View file @ a9483969
......@@ -45,7 +45,7 @@ pcie@1,0 {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pmx_button_power: pmx-button-power {
marvell,pins = "mpp39";
marvell,function = "gpio";
......
arch/arm/boot/dts/kirkwood-cloudbox.dts
View file @ a9483969
......@@ -18,7 +18,7 @@ chosen {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pmx_cloudbox_sata0: pmx-cloudbox-sata0 {
marvell,pins = "mpp15";
marvell,function = "sata0";
......
arch/arm/boot/dts/kirkwood-db.dtsi
View file @ a9483969
......@@ -26,7 +26,7 @@ chosen {
};
ocp@f1000000 {
pinctrl@10000 {
pin-controller@10000 {
pmx_sdio_gpios: pmx-sdio-gpios {
marvell,pins = "mpp37", "mpp38";
marvell,function = "gpio";
......
arch/arm/boot/dts/kirkwood-dnskw.dtsi
View file @ a9483969
......@@ -50,7 +50,7 @@ gpio_poweroff {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_power_back_on &pmx_present_sata0
&pmx_present_sata1 &pmx_fan_tacho
......
arch/arm/boot/dts/kirkwood-dockstar.dts
View file @ a9483969
......@@ -18,7 +18,7 @@ chosen {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pmx_usb_power_enable: pmx-usb-power-enable {
marvell,pins = "mpp29";
marvell,function = "gpio";
......
arch/arm/boot/dts/kirkwood-dreamplug.dts
View file @ a9483969
......@@ -18,7 +18,7 @@ chosen {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pmx_led_bluetooth: pmx-led-bluetooth {
marvell,pins = "mpp47";
marvell,function = "gpio";
......
arch/arm/boot/dts/kirkwood-goflexnet.dts
View file @ a9483969
......@@ -18,7 +18,7 @@ chosen {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pmx_usb_power_enable: pmx-usb-power-enable {
marvell,pins = "mpp29";
marvell,function = "gpio";
......
arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
View file @ a9483969
......@@ -18,7 +18,7 @@ chosen {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pmx_led_health_r: pmx-led-health-r {
marvell,pins = "mpp46";
marvell,function = "gpio";
......
arch/arm/boot/dts/kirkwood-ib62x0.dts
View file @ a9483969
......@@ -18,7 +18,7 @@ chosen {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pmx_led_os_red: pmx-led-os-red {
marvell,pins = "mpp22";
marvell,function = "gpio";
......
arch/arm/boot/dts/kirkwood-iconnect.dts
View file @ a9483969
......@@ -30,7 +30,7 @@ pcie@1,0 {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pmx_button_reset: pmx-button-reset {
marvell,pins = "mpp12";
marvell,function = "gpio";
......
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
View file @ a9483969
......@@ -18,7 +18,7 @@ chosen {
};
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
......
arch/arm/boot/dts/kirkwood-km_kirkwood.dts
View file @ a9483969
......@@ -18,7 +18,7 @@ chosen {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pinctrl-0 = < &pmx_i2c_gpio_sda &pmx_i2c_gpio_scl >;
pinctrl-names = "default";
......
arch/arm/boot/dts/kirkwood-laplug.dts
View file @ a9483969
......@@ -55,7 +55,7 @@ eeprom@50 {
};
};
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pmx_usb_power_enable: pmx-usb-power-enable {
marvell,pins = "mpp14";
marvell,function = "gpio";
......
arch/arm/boot/dts/kirkwood-lsxl.dtsi
View file @ a9483969
......@@ -8,7 +8,7 @@ chosen {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pmx_power_hdd: pmx-power-hdd {
marvell,pins = "mpp10";
marvell,function = "gpo";
......
arch/arm/boot/dts/kirkwood-mplcec4.dts
View file @ a9483969
......@@ -28,7 +28,7 @@ pcie@1,0 {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pmx_led_health: pmx-led-health {
marvell,pins = "mpp7";
marvell,function = "gpo";
......
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
View file @ a9483969
......@@ -32,7 +32,7 @@ chosen {
};
ocp@f1000000 {
pinctrl@10000 {
pin-controller@10000 {
pmx_usb_led: pmx-usb-led {
marvell,pins = "mpp12";
marvell,function = "gpo";
......
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
View file @ a9483969
......@@ -39,7 +39,7 @@ pcie@1,0 {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pmx_button_power: pmx-button-power {
marvell,pins = "mpp47";
marvell,function = "gpio";
......
arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
View file @ a9483969
......@@ -41,7 +41,7 @@ pcie@1,0 {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pmx_button_power: pmx-button-power {
marvell,pins = "mpp47";
marvell,function = "gpio";
......
arch/arm/boot/dts/kirkwood-ns2-common.dtsi
View file @ a9483969
......@@ -8,7 +8,7 @@ chosen {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pmx_ns2_sata0: pmx-ns2-sata0 {
marvell,pins = "mpp21";
marvell,function = "sata0";
......
arch/arm/boot/dts/kirkwood-nsa310.dts
View file @ a9483969
......@@ -26,7 +26,7 @@ pcie@1,0 {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_unknown>;
pinctrl-names = "default";
......
arch/arm/boot/dts/kirkwood-nsa310a.dts
View file @ a9483969
......@@ -21,7 +21,7 @@ chosen {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pinctrl-names = "default";
pmx_led_esata_green: pmx-led-esata-green {
......
arch/arm/boot/dts/kirkwood-nsa320.dts
View file @ a9483969
......@@ -38,7 +38,7 @@ pcie@1,0 {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pinctrl-names = "default";
/* SATA Activity and Present pins are not connected */
......
arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
View file @ a9483969
......@@ -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";
......
arch/arm/boot/dts/kirkwood-openblocks_a6.dts
View file @ a9483969
......@@ -46,7 +46,7 @@ s35390a: s35390a@30 {
};
};
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;
pinctrl-names = "default";
......
arch/arm/boot/dts/kirkwood-openblocks_a7.dts
View file @ a9483969
......@@ -58,7 +58,7 @@ s24c02: s24c02@50 {
};
};
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;
pinctrl-names = "default";
......
arch/arm/boot/dts/kirkwood-rd88f6192.dts
View file @ a9483969
......@@ -40,7 +40,7 @@ pcie@1,0 {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_usb_power>;
pinctrl-names = "default";
......
arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
View file @ a9483969
......@@ -36,7 +36,7 @@ pcie@1,0 {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_sdio_cd>;
pinctrl-names = "default";
......
arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
View file @ a9483969
......@@ -21,7 +21,7 @@ chosen {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pmx_usb_power_enable: pmx-usb-power-enable {
marvell,pins = "mpp29";
......
arch/arm/boot/dts/kirkwood-synology.dtsi
View file @ a9483969
......@@ -25,7 +25,7 @@ pcie2: pcie@2,0 {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pmx_alarmled_12: pmx-alarmled-12 {
marvell,pins = "mpp12";
marvell,function = "gpio";
......
arch/arm/boot/dts/kirkwood-t5325.dts
View file @ a9483969
......@@ -41,7 +41,7 @@ pcie@1,0 {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_i2s &pmx_sysrst>;
pinctrl-names = "default";
......
arch/arm/boot/dts/kirkwood-topkick.dts
View file @ a9483969
......@@ -18,7 +18,7 @@ chosen {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
/*
* Switch positions
*
......
arch/arm/boot/dts/kirkwood-ts219-6281.dts
View file @ a9483969
......@@ -6,7 +6,7 @@
/ {
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_ram_size &pmx_board_id>;
pinctrl-names = "default";
......
arch/arm/boot/dts/kirkwood-ts219-6282.dts
View file @ a9483969
......@@ -16,7 +16,7 @@ pcie@2,0 {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_ram_size &pmx_board_id>;
pinctrl-names = "default";
......
arch/arm/boot/dts/kirkwood-ts419.dtsi
View file @ a9483969
......@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7