Skip to content

Commit eeb751c

Browse files
arndbarndb
committed
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-laptop Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 7cb74e0 + afc1988 commit eeb751c

15 files changed

Lines changed: 228 additions & 291 deletions

‎arch/arm/boot/dts/marvell/armada-370-dlink-dns327l.dts‎

Lines changed: 37 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -105,54 +105,45 @@
105105
};
106106
};
107107

108-
regulators {
109-
compatible = "simple-bus";
110-
#address-cells = <1>;
111-
#size-cells = <0>;
112-
113-
usb_power: regulator@1 {
114-
compatible = "regulator-fixed";
115-
reg = <1>;
116-
pinctrl-0 = <&xhci_pwr_pin>;
117-
pinctrl-names = "default";
118-
regulator-name = "USB3.0 Port Power";
119-
regulator-min-microvolt = <5000000>;
120-
regulator-max-microvolt = <5000000>;
121-
enable-active-high;
122-
regulator-boot-on;
123-
regulator-always-on;
124-
gpio = <&gpio0 13 GPIO_ACTIVE_HIGH>;
125-
};
108+
usb_power: regulator-1 {
109+
compatible = "regulator-fixed";
110+
pinctrl-0 = <&xhci_pwr_pin>;
111+
pinctrl-names = "default";
112+
regulator-name = "USB3.0 Port Power";
113+
regulator-min-microvolt = <5000000>;
114+
regulator-max-microvolt = <5000000>;
115+
enable-active-high;
116+
regulator-boot-on;
117+
regulator-always-on;
118+
gpio = <&gpio0 13 GPIO_ACTIVE_HIGH>;
119+
};
126120

127-
sata_r_power: regulator@2 {
128-
compatible = "regulator-fixed";
129-
reg = <2>;
130-
pinctrl-0 = <&sata_r_pwr_pin>;
131-
pinctrl-names = "default";
132-
regulator-name = "SATA-R Power";
133-
regulator-min-microvolt = <5000000>;
134-
regulator-max-microvolt = <5000000>;
135-
startup-delay-us = <2000000>;
136-
enable-active-high;
137-
regulator-always-on;
138-
regulator-boot-on;
139-
gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
140-
};
121+
sata_r_power: regulator-2 {
122+
compatible = "regulator-fixed";
123+
pinctrl-0 = <&sata_r_pwr_pin>;
124+
pinctrl-names = "default";
125+
regulator-name = "SATA-R Power";
126+
regulator-min-microvolt = <5000000>;
127+
regulator-max-microvolt = <5000000>;
128+
startup-delay-us = <2000000>;
129+
enable-active-high;
130+
regulator-always-on;
131+
regulator-boot-on;
132+
gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
133+
};
141134

142-
sata_l_power: regulator@3 {
143-
compatible = "regulator-fixed";
144-
reg = <3>;
145-
pinctrl-0 = <&sata_l_pwr_pin>;
146-
pinctrl-names = "default";
147-
regulator-name = "SATA-L Power";
148-
regulator-min-microvolt = <5000000>;
149-
regulator-max-microvolt = <5000000>;
150-
startup-delay-us = <4000000>;
151-
enable-active-high;
152-
regulator-always-on;
153-
regulator-boot-on;
154-
gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>;
155-
};
135+
sata_l_power: regulator-3 {
136+
compatible = "regulator-fixed";
137+
pinctrl-0 = <&sata_l_pwr_pin>;
138+
pinctrl-names = "default";
139+
regulator-name = "SATA-L Power";
140+
regulator-min-microvolt = <5000000>;
141+
regulator-max-microvolt = <5000000>;
142+
startup-delay-us = <4000000>;
143+
enable-active-high;
144+
regulator-always-on;
145+
regulator-boot-on;
146+
gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>;
156147
};
157148
};
158149

‎arch/arm/boot/dts/marvell/armada-370-seagate-nas-4bay.dts‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -46,29 +46,26 @@
4646
};
4747
};
4848

49-
regulators {
50-
regulator@3 {
51-
compatible = "regulator-fixed";
52-
reg = <3>;
53-
regulator-name = "SATA2 power";
54-
regulator-min-microvolt = <5000000>;
55-
regulator-max-microvolt = <5000000>;
56-
enable-active-high;
57-
regulator-always-on;
58-
regulator-boot-on;
59-
gpio = <&pca9554 6 GPIO_ACTIVE_HIGH>;
60-
};
61-
regulator@4 {
62-
compatible = "regulator-fixed";
63-
reg = <4>;
64-
regulator-name = "SATA3 power";
65-
regulator-min-microvolt = <5000000>;
66-
regulator-max-microvolt = <5000000>;
67-
enable-active-high;
68-
regulator-always-on;
69-
regulator-boot-on;
70-
gpio = <&pca9554 7 GPIO_ACTIVE_HIGH>;
71-
};
49+
regulator-3 {
50+
compatible = "regulator-fixed";
51+
regulator-name = "SATA2 power";
52+
regulator-min-microvolt = <5000000>;
53+
regulator-max-microvolt = <5000000>;
54+
enable-active-high;
55+
regulator-always-on;
56+
regulator-boot-on;
57+
gpio = <&pca9554 6 GPIO_ACTIVE_HIGH>;
58+
};
59+
60+
regulator-4 {
61+
compatible = "regulator-fixed";
62+
regulator-name = "SATA3 power";
63+
regulator-min-microvolt = <5000000>;
64+
regulator-max-microvolt = <5000000>;
65+
enable-active-high;
66+
regulator-always-on;
67+
regulator-boot-on;
68+
gpio = <&pca9554 7 GPIO_ACTIVE_HIGH>;
7269
};
7370

7471
gpio-leds {

‎arch/arm/boot/dts/marvell/armada-370-seagate-nas-xbay.dtsi‎

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -70,34 +70,26 @@
7070

7171
};
7272

73-
regulators {
74-
compatible = "simple-bus";
75-
#address-cells = <1>;
76-
#size-cells = <0>;
77-
pinctrl-names = "default";
78-
79-
regulator@1 {
80-
compatible = "regulator-fixed";
81-
reg = <1>;
82-
regulator-name = "SATA0 power";
83-
regulator-min-microvolt = <5000000>;
84-
regulator-max-microvolt = <5000000>;
85-
enable-active-high;
86-
regulator-always-on;
87-
regulator-boot-on;
88-
gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
89-
};
90-
regulator@2 {
91-
compatible = "regulator-fixed";
92-
reg = <2>;
93-
regulator-name = "SATA1 power";
94-
regulator-min-microvolt = <5000000>;
95-
regulator-max-microvolt = <5000000>;
96-
enable-active-high;
97-
regulator-always-on;
98-
regulator-boot-on;
99-
gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
100-
};
73+
regulator-1 {
74+
compatible = "regulator-fixed";
75+
regulator-name = "SATA0 power";
76+
regulator-min-microvolt = <5000000>;
77+
regulator-max-microvolt = <5000000>;
78+
enable-active-high;
79+
regulator-always-on;
80+
regulator-boot-on;
81+
gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
82+
};
83+
84+
regulator-2 {
85+
compatible = "regulator-fixed";
86+
regulator-name = "SATA1 power";
87+
regulator-min-microvolt = <5000000>;
88+
regulator-max-microvolt = <5000000>;
89+
enable-active-high;
90+
regulator-always-on;
91+
regulator-boot-on;
92+
gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
10193
};
10294

10395
gpio-fan {

‎arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud-2bay.dts‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,14 @@
3232
};
3333
};
3434

35-
regulators {
36-
regulator@2 {
37-
compatible = "regulator-fixed";
38-
reg = <2>;
39-
regulator-name = "SATA1 power";
40-
regulator-min-microvolt = <5000000>;
41-
regulator-max-microvolt = <5000000>;
42-
enable-active-high;
43-
regulator-always-on;
44-
regulator-boot-on;
45-
gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
46-
};
35+
regulator-2 {
36+
compatible = "regulator-fixed";
37+
regulator-name = "SATA1 power";
38+
regulator-min-microvolt = <5000000>;
39+
regulator-max-microvolt = <5000000>;
40+
enable-active-high;
41+
regulator-always-on;
42+
regulator-boot-on;
43+
gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;
4744
};
4845
};

‎arch/arm/boot/dts/marvell/armada-370-seagate-personal-cloud.dtsi‎

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -53,32 +53,25 @@
5353
};
5454
};
5555

56-
regulators {
57-
compatible = "simple-bus";
58-
#address-cells = <1>;
59-
#size-cells = <0>;
60-
61-
regulator@0 {
62-
compatible = "regulator-fixed";
63-
reg = <0>;
64-
regulator-name = "USB Power";
65-
regulator-min-microvolt = <5000000>;
66-
regulator-max-microvolt = <5000000>;
67-
regulator-always-on;
68-
regulator-boot-on;
69-
gpio = <&gpio1 27 GPIO_ACTIVE_LOW>;
70-
};
71-
regulator@1 {
72-
compatible = "regulator-fixed";
73-
reg = <1>;
74-
regulator-name = "SATA0 power";
75-
regulator-min-microvolt = <5000000>;
76-
regulator-max-microvolt = <5000000>;
77-
enable-active-high;
78-
regulator-always-on;
79-
regulator-boot-on;
80-
gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
81-
};
56+
regulator-0 {
57+
compatible = "regulator-fixed";
58+
regulator-name = "USB Power";
59+
regulator-min-microvolt = <5000000>;
60+
regulator-max-microvolt = <5000000>;
61+
regulator-always-on;
62+
regulator-boot-on;
63+
gpio = <&gpio1 27 GPIO_ACTIVE_LOW>;
64+
};
65+
66+
regulator-1 {
67+
compatible = "regulator-fixed";
68+
regulator-name = "SATA0 power";
69+
regulator-min-microvolt = <5000000>;
70+
regulator-max-microvolt = <5000000>;
71+
enable-active-high;
72+
regulator-always-on;
73+
regulator-boot-on;
74+
gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
8275
};
8376

8477
gpio-keys {

‎arch/arm/boot/dts/marvell/armada-370-synology-ds213j.dts‎

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -142,38 +142,32 @@
142142
};
143143
};
144144

145-
regulators {
146-
compatible = "simple-bus";
147-
#address-cells = <1>;
148-
#size-cells = <0>;
149-
pinctrl-0 = <&sata1_pwr_pin &sata2_pwr_pin>;
145+
sata1_regulator: sata1-regulator-1 {
146+
compatible = "regulator-fixed";
147+
regulator-name = "SATA1 Power";
148+
regulator-min-microvolt = <5000000>;
149+
regulator-max-microvolt = <5000000>;
150+
startup-delay-us = <2000000>;
151+
enable-active-high;
152+
regulator-always-on;
153+
regulator-boot-on;
154+
gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
155+
pinctrl-0 = <&sata1_pwr_pin>;
150156
pinctrl-names = "default";
157+
};
151158

152-
sata1_regulator: sata1-regulator@1 {
153-
compatible = "regulator-fixed";
154-
reg = <1>;
155-
regulator-name = "SATA1 Power";
156-
regulator-min-microvolt = <5000000>;
157-
regulator-max-microvolt = <5000000>;
158-
startup-delay-us = <2000000>;
159-
enable-active-high;
160-
regulator-always-on;
161-
regulator-boot-on;
162-
gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
163-
};
164-
165-
sata2_regulator: sata2-regulator@2 {
166-
compatible = "regulator-fixed";
167-
reg = <2>;
168-
regulator-name = "SATA2 Power";
169-
regulator-min-microvolt = <5000000>;
170-
regulator-max-microvolt = <5000000>;
171-
startup-delay-us = <4000000>;
172-
enable-active-high;
173-
regulator-always-on;
174-
regulator-boot-on;
175-
gpio = <&gpio1 30 GPIO_ACTIVE_HIGH>;
176-
};
159+
sata2_regulator: sata2-regulator-2 {
160+
compatible = "regulator-fixed";
161+
regulator-name = "SATA2 Power";
162+
regulator-min-microvolt = <5000000>;
163+
regulator-max-microvolt = <5000000>;
164+
startup-delay-us = <4000000>;
165+
enable-active-high;
166+
regulator-always-on;
167+
regulator-boot-on;
168+
gpio = <&gpio1 30 GPIO_ACTIVE_HIGH>;
169+
pinctrl-0 = <&sata2_pwr_pin>;
170+
pinctrl-names = "default";
177171
};
178172
};
179173

‎arch/arm/boot/dts/marvell/armada-382-rd-ac3x-48g4x2xl.dts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
pinctrl-0 = <&i2c0_pins>;
4141
status = "okay";
4242

43-
eeprom@53{
43+
eeprom@53 {
4444
compatible = "atmel,24c64";
4545
reg = <0x53>;
4646
};
@@ -95,11 +95,11 @@
9595
reg = <0x00000000 0x00500000>;
9696
label = "u-boot";
9797
};
98-
partition@500000{
98+
partition@500000 {
9999
reg = <0x00500000 0x00400000>;
100100
label = "u-boot env";
101101
};
102-
partition@900000{
102+
partition@900000 {
103103
reg = <0x00900000 0x3F700000>;
104104
label = "user";
105105
};

0 commit comments

Comments
 (0)