Skip to content

L
linux
Commit eeb751c4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'mvebu-dt-6.6-1' of... 

Merge tag 'mvebu-dt-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt

mvebu dt for 6.6 (part 1)

Fix style issue and incorrect syntax

* tag 'mvebu-dt-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  ARM: dts: marvell: dove: drop incorrect reg in fixed regulators
  ARM: dts: marvell: armada: drop incorrect reg in fixed regulators
  ARM: dts: marvell: add missing space before {

Link: https://lore.kernel.org/r/87h6p4t0lv.fsf@BL-laptopSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7cb74e0c afc19882
Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 291 deletions
arch/arm/boot/dts/marvell/armada-370-dlink-dns327l.dts
View file @ eeb751c4
...@@ -105,54 +105,45 @@ led-backup { ...@@ -105,54 +105,45 @@ led-backup {
}; };
}; };
regulators { usb_power: regulator-1 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; pinctrl-0 = <&xhci_pwr_pin>;
#size-cells = <0>; pinctrl-names = "default";
regulator-name = "USB3.0 Port Power";
usb_power: regulator@1 { regulator-min-microvolt = <5000000>;
compatible = "regulator-fixed"; regulator-max-microvolt = <5000000>;
reg = <1>; enable-active-high;
pinctrl-0 = <&xhci_pwr_pin>; regulator-boot-on;
pinctrl-names = "default"; regulator-always-on;
regulator-name = "USB3.0 Port Power"; gpio = <&gpio0 13 GPIO_ACTIVE_HIGH>;
regulator-min-microvolt = <5000000>; };
regulator-max-microvolt = <5000000>;
enable-active-high;
regulator-boot-on;
regulator-always-on;
gpio = <&gpio0 13 GPIO_ACTIVE_HIGH>;
};
sata_r_power: regulator@2 { sata_r_power: regulator-2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; pinctrl-0 = <&sata_r_pwr_pin>;
pinctrl-0 = <&sata_r_pwr_pin>; pinctrl-names = "default";
pinctrl-names = "default"; regulator-name = "SATA-R Power";
regulator-name = "SATA-R Power"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; startup-delay-us = <2000000>;
startup-delay-us = <2000000>; enable-active-high;
enable-active-high; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>; };
};
sata_l_power: regulator@3 { sata_l_power: regulator-3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; pinctrl-0 = <&sata_l_pwr_pin>;
pinctrl-0 = <&sata_l_pwr_pin>; pinctrl-names = "default";
pinctrl-names = "default"; regulator-name = "SATA-L Power";
regulator-name = "SATA-L Power"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; startup-delay-us = <4000000>;
startup-delay-us = <4000000>; enable-active-high;
enable-active-high; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>;
gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>;
};
}; };
}; };
......
arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts
View file @ eeb751c4
...@@ -46,29 +46,26 @@ pca9554: pca9554@21 { ...@@ -46,29 +46,26 @@ pca9554: pca9554@21 {
}; };
}; };
regulators { regulator-3 {
regulator@3 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; regulator-name = "SATA2 power";
reg = <3>; regulator-min-microvolt = <5000000>;
regulator-name = "SATA2 power"; regulator-max-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; enable-active-high;
regulator-max-microvolt = <5000000>; regulator-always-on;
enable-active-high; regulator-boot-on;
regulator-always-on; gpio = <&pca9554 6 GPIO_ACTIVE_HIGH>;
regulator-boot-on; };
gpio = <&pca9554 6 GPIO_ACTIVE_HIGH>;
}; regulator-4 {
regulator@4 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; regulator-name = "SATA3 power";
reg = <4>; regulator-min-microvolt = <5000000>;
regulator-name = "SATA3 power"; regulator-max-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; enable-active-high;
regulator-max-microvolt = <5000000>; regulator-always-on;
enable-active-high; regulator-boot-on;
regulator-always-on; gpio = <&pca9554 7 GPIO_ACTIVE_HIGH>;
regulator-boot-on;
gpio = <&pca9554 7 GPIO_ACTIVE_HIGH>;
};
}; };
gpio-leds { gpio-leds {
......
arch/arm/boot/dts/marvell/armada-370-seagate-nas-xbay.dtsi
View file @ eeb751c4
...@@ -70,34 +70,26 @@ rtc@6f { ...@@ -70,34 +70,26 @@ rtc@6f {
}; };
regulators { regulator-1 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "SATA0 power";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
pinctrl-names = "default"; regulator-max-microvolt = <5000000>;
enable-active-high;
regulator@1 { regulator-always-on;
compatible = "regulator-fixed"; regulator-boot-on;
reg = <1>; gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
regulator-name = "SATA0 power"; };
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-2 {
enable-active-high; compatible = "regulator-fixed";
regulator-always-on; regulator-name = "SATA1 power";
regulator-boot-on; regulator-min-microvolt = <5000000>;
gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>; regulator-max-microvolt = <5000000>;
}; enable-active-high;
regulator@2 { regulator-always-on;
compatible = "regulator-fixed"; regulator-boot-on;
reg = <2>; gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
regulator-name = "SATA1 power";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
};
}; };
gpio-fan { gpio-fan {
......
arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud-2bay.dts
View file @ eeb751c4
...@@ -32,17 +32,14 @@ sata@a0000 { ...@@ -32,17 +32,14 @@ sata@a0000 {
}; };
}; };
regulators { regulator-2 {
regulator@2 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; regulator-name = "SATA1 power";
reg = <2>; regulator-min-microvolt = <5000000>;
regulator-name = "SATA1 power"; regulator-max-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; enable-active-high;
regulator-max-microvolt = <5000000>; regulator-always-on;
enable-active-high; regulator-boot-on;
regulator-always-on; gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
regulator-boot-on;
gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
};
}; };
}; };
arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dtsi
View file @ eeb751c4
...@@ -53,32 +53,25 @@ usb@50000 { ...@@ -53,32 +53,25 @@ usb@50000 {
}; };
}; };
regulators { regulator-0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "USB Power";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; regulator-boot-on;
reg = <0>; gpio = <&gpio1 27 GPIO_ACTIVE_LOW>;
regulator-name = "USB Power"; };
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-1 {
regulator-always-on; compatible = "regulator-fixed";
regulator-boot-on; regulator-name = "SATA0 power";
gpio = <&gpio1 27 GPIO_ACTIVE_LOW>; regulator-min-microvolt = <5000000>;
}; regulator-max-microvolt = <5000000>;
regulator@1 { enable-active-high;
compatible = "regulator-fixed"; regulator-always-on;
reg = <1>; regulator-boot-on;
regulator-name = "SATA0 power"; gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
};
}; };
gpio-keys { gpio-keys {
......
arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts
View file @ eeb751c4
...@@ -142,38 +142,32 @@ disk2-led-amber { ...@@ -142,38 +142,32 @@ disk2-led-amber {
}; };
}; };
regulators { sata1_regulator: sata1-regulator-1 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "SATA1 Power";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
pinctrl-0 = <&sata1_pwr_pin &sata2_pwr_pin>; regulator-max-microvolt = <5000000>;
startup-delay-us = <2000000>;
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&sata1_pwr_pin>;
pinctrl-names = "default"; pinctrl-names = "default";
};
sata1_regulator: sata1-regulator@1 { sata2_regulator: sata2-regulator-2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "SATA2 Power";
regulator-name = "SATA1 Power"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; startup-delay-us = <4000000>;
startup-delay-us = <2000000>; enable-active-high;
enable-active-high; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; gpio = <&gpio1 30 GPIO_ACTIVE_HIGH>;
gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&sata2_pwr_pin>;
}; pinctrl-names = "default";
sata2_regulator: sata2-regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "SATA2 Power";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
startup-delay-us = <4000000>;
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio1 30 GPIO_ACTIVE_HIGH>;
};
}; };
}; };
......
arch/arm/boot/dts/marvell/armada-382-rd-ac3x-48g4x2xl.dts
View file @ eeb751c4
...@@ -40,7 +40,7 @@ &i2c0 { ...@@ -40,7 +40,7 @@ &i2c0 {
pinctrl-0 = <&i2c0_pins>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
eeprom@53{ eeprom@53 {
compatible = "atmel,24c64"; compatible = "atmel,24c64";
reg = <0x53>; reg = <0x53>;
}; };
...@@ -95,11 +95,11 @@ partition@0 { ...@@ -95,11 +95,11 @@ partition@0 {
reg = <0x00000000 0x00500000>; reg = <0x00000000 0x00500000>;
label = "u-boot"; label = "u-boot";
}; };
partition@500000{ partition@500000 {
reg = <0x00500000 0x00400000>; reg = <0x00500000 0x00400000>;
label = "u-boot env"; label = "u-boot env";
}; };
partition@900000{ partition@900000 {
reg = <0x00900000 0x3F700000>; reg = <0x00900000 0x3F700000>;
label = "user"; label = "user";
}; };
......
arch/arm/boot/dts/marvell/armada-xp-synology-ds414.dts
View file @ eeb751c4
...@@ -109,65 +109,60 @@ ethernet@74000 { ...@@ -109,65 +109,60 @@ ethernet@74000 {
}; };
}; };
regulators { sata1_regulator: sata1-regulator-1 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "SATA1 Power";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
pinctrl-0 = <&sata1_pwr_pin &sata2_pwr_pin regulator-max-microvolt = <5000000>;
&sata3_pwr_pin &sata4_pwr_pin>; startup-delay-us = <2000000>;
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&sata1_pwr_pin>;
pinctrl-names = "default"; pinctrl-names = "default";
};
sata1_regulator: sata1-regulator@1 { sata2_regulator: sata2-regulator-2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "SATA2 Power";
regulator-name = "SATA1 Power"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; startup-delay-us = <4000000>;
startup-delay-us = <2000000>; enable-active-high;
enable-active-high; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&sata2_pwr_pin>;
}; pinctrl-names = "default";
};
sata2_regulator: sata2-regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "SATA2 Power";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
startup-delay-us = <4000000>;
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
};
sata3_regulator: sata3-regulator@3 { sata3_regulator: sata3-regulator-3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; regulator-name = "SATA3 Power";
regulator-name = "SATA3 Power"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; startup-delay-us = <6000000>;
startup-delay-us = <6000000>; enable-active-high;
enable-active-high; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; gpio = <&gpio1 13 GPIO_ACTIVE_HIGH>;
gpio = <&gpio1 13 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&sata3_pwr_pin>;
}; pinctrl-names = "default";
};
sata4_regulator: sata4-regulator@4 { sata4_regulator: sata4-regulator-4 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <4>; regulator-name = "SATA4 Power";
regulator-name = "SATA4 Power"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; startup-delay-us = <8000000>;
startup-delay-us = <8000000>; enable-active-high;
enable-active-high; regulator-always-on;
regulator-always-on; regulator-boot-on;
regulator-boot-on; gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>;
gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&sata4_pwr_pin>;
}; pinctrl-names = "default";
}; };
}; };
......
arch/arm/boot/dts/marvell/dove-cm-a510.dtsi
View file @ eeb751c4
...@@ -108,18 +108,12 @@ led-system { ...@@ -108,18 +108,12 @@ led-system {
}; };
}; };
regulators { wifi_power: regulator-1 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "WiFi Power";
#size-cells = <0>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
wifi_power: regulator@1 { gpio = <&gpio2 7 GPIO_ACTIVE_HIGH>;
compatible = "regulator-fixed";
regulator-name = "WiFi Power";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&gpio2 7 GPIO_ACTIVE_HIGH>;
};
}; };
}; };
......
arch/arm/boot/dts/marvell/dove-cubox.dts
View file @ eeb751c4
...@@ -28,24 +28,17 @@ led-power { ...@@ -28,24 +28,17 @@ led-power {
}; };
}; };
regulators { usb_power: regulator-1 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "USB Power";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
usb_power: regulator@1 { enable-active-high;
compatible = "regulator-fixed"; regulator-always-on;
reg = <1>; regulator-boot-on;
regulator-name = "USB Power"; gpio = <&gpio0 1 0>;
regulator-min-microvolt = <5000000>; pinctrl-0 = <&pmx_gpio_1>;
regulator-max-microvolt = <5000000>; pinctrl-names = "default";
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio0 1 0>;
pinctrl-0 = <&pmx_gpio_1>;
pinctrl-names = "default";
};
}; };
clocks { clocks {
......
arch/arm/boot/dts/marvell/dove-d3plug.dts
View file @ eeb751c4
...@@ -37,24 +37,17 @@ led-status { ...@@ -37,24 +37,17 @@ led-status {
}; };
}; };
regulators { usb_power: regulator-1 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "USB Power";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
usb_power: regulator@1 { enable-active-high;
compatible = "regulator-fixed"; regulator-always-on;
reg = <1>; regulator-boot-on;
regulator-name = "USB Power"; gpio = <&gpio0 8 0>;
regulator-min-microvolt = <5000000>; pinctrl-0 = <&pmx_gpio_8>;
regulator-max-microvolt = <5000000>; pinctrl-names = "default";
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio0 8 0>;
pinctrl-0 = <&pmx_gpio_8>;
pinctrl-names = "default";
};
}; };
}; };
......
arch/arm/boot/dts/marvell/dove-sbc-a510.dts
View file @ eeb751c4
...@@ -76,22 +76,20 @@ chosen { ...@@ -76,22 +76,20 @@ chosen {
stdout-path = &uart0; stdout-path = &uart0;
}; };
regulators { usb0_power: regulator-2 {
usb0_power: regulator@2 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; regulator-name = "USB Power";
regulator-name = "USB Power"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio_ext 0 GPIO_ACTIVE_HIGH>;
gpio = <&gpio_ext 0 GPIO_ACTIVE_HIGH>; };
};
mmc_power: regulator-3 {
mmc_power: regulator@3 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; regulator-name = "MMC Power";
regulator-name = "MMC Power"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; gpio = <&gpio_ext 13 GPIO_ACTIVE_HIGH>;
gpio = <&gpio_ext 13 GPIO_ACTIVE_HIGH>;
};
}; };
}; };
......
arch/arm/boot/dts/marvell/kirkwood-l-50.dts
View file @ eeb751c4
...@@ -62,7 +62,7 @@ i2c@11000 { ...@@ -62,7 +62,7 @@ i2c@11000 {
status = "okay"; status = "okay";
clock-frequency = <400000>; clock-frequency = <400000>;
gpio2: gpio-expander@20{ gpio2: gpio-expander@20 {
#gpio-cells = <2>; #gpio-cells = <2>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
compatible = "semtech,sx1505q"; compatible = "semtech,sx1505q";
...@@ -76,7 +76,7 @@ gpio2: gpio-expander@20{ ...@@ -76,7 +76,7 @@ gpio2: gpio-expander@20{
* 5: mPCIE reset (active low) * 5: mPCIE reset (active low)
* 6: Express card reset (active low) * 6: Express card reset (active low)
*/ */
gpio3: gpio-expander@21{ gpio3: gpio-expander@21 {
#gpio-cells = <2>; #gpio-cells = <2>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
compatible = "semtech,sx1505q"; compatible = "semtech,sx1505q";
......
arch/arm/boot/dts/marvell/pxa168.dtsi
View file @ eeb751c4
...@@ -153,7 +153,7 @@ rtc: rtc@d4010000 { ...@@ -153,7 +153,7 @@ rtc: rtc@d4010000 {
}; };
}; };
soc_clocks: clocks{ soc_clocks: clocks {
compatible = "marvell,pxa168-clock"; compatible = "marvell,pxa168-clock";
reg = <0xd4050000 0x1000>, reg = <0xd4050000 0x1000>,
<0xd4282800 0x400>, <0xd4282800 0x400>,
......
arch/arm/boot/dts/marvell/pxa910.dtsi
View file @ eeb751c4
...@@ -163,7 +163,7 @@ rtc: rtc@d4010000 { ...@@ -163,7 +163,7 @@ rtc: rtc@d4010000 {
}; };
}; };
soc_clocks: clocks{ soc_clocks: clocks {
compatible = "marvell,pxa910-clock"; compatible = "marvell,pxa910-clock";
reg = <0xd4050000 0x1000>, reg = <0xd4050000 0x1000>,
<0xd4282800 0x400>, <0xd4282800 0x400>,
......
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