Skip to content

Commit 65ad1ca

Browse files
committed
Merge tag 'mvebu-dt-5.8-1' of git://git.infradead.org/linux-mvebu into arm/dt
mvebu dt for 5.8 (part 1) Add LCP panel support on ReadyNAS NV+v2 Add new board: Check Point L-50, kirkwood based SoC router Remove unused property 'timeout-ms' in i2c nodes * tag 'mvebu-dt-5.8-1' of git://git.infradead.org/linux-mvebu: ARM: dts: kirkwood: ReadyNAS NV+v2: Add LCD panel ARM: dts: kirkwood: Add Check Point L-50 board ARM: dts: marvell: drop i2c timeout-ms property Link: https://lore.kernel.org/r/87blmiefgw.fsf@FE-laptop Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 564ef85 + 1383d42 commit 65ad1ca

File tree

8 files changed

+453
-11
lines changed

8 files changed

+453
-11
lines changed

arch/arm/boot/dts/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
282282
kirkwood-iomega_ix2_200.dtb \
283283
kirkwood-is2.dtb \
284284
kirkwood-km_kirkwood.dtb \
285+
kirkwood-l-50.dtb \
285286
kirkwood-laplug.dtb \
286287
kirkwood-linkstation-lsqvl.dtb \
287288
kirkwood-linkstation-lsvl.dtb \

arch/arm/boot/dts/armada-370-xp.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
#address-cells = <1>;
115115
#size-cells = <0>;
116116
interrupts = <31>;
117-
timeout-ms = <1000>;
118117
clocks = <&coreclk 0>;
119118
status = "disabled";
120119
};
@@ -124,7 +123,6 @@
124123
#address-cells = <1>;
125124
#size-cells = <0>;
126125
interrupts = <32>;
127-
timeout-ms = <1000>;
128126
clocks = <&coreclk 0>;
129127
status = "disabled";
130128
};

arch/arm/boot/dts/armada-375.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@
236236
#address-cells = <1>;
237237
#size-cells = <0>;
238238
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
239-
timeout-ms = <1000>;
240239
clocks = <&coreclk 0>;
241240
status = "disabled";
242241
};
@@ -247,7 +246,6 @@
247246
#address-cells = <1>;
248247
#size-cells = <0>;
249248
interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
250-
timeout-ms = <1000>;
251249
clocks = <&coreclk 0>;
252250
status = "disabled";
253251
};

arch/arm/boot/dts/armada-38x.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@
153153
#address-cells = <1>;
154154
#size-cells = <0>;
155155
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
156-
timeout-ms = <1000>;
157156
clocks = <&coreclk 0>;
158157
status = "disabled";
159158
};
@@ -164,7 +163,6 @@
164163
#address-cells = <1>;
165164
#size-cells = <0>;
166165
interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
167-
timeout-ms = <1000>;
168166
clocks = <&coreclk 0>;
169167
status = "disabled";
170168
};

arch/arm/boot/dts/armada-39x.dtsi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@
108108
#address-cells = <1>;
109109
#size-cells = <0>;
110110
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
111-
timeout-ms = <1000>;
112111
clocks = <&coreclk 0>;
113112
status = "disabled";
114113
};
@@ -119,7 +118,6 @@
119118
#address-cells = <1>;
120119
#size-cells = <0>;
121120
interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
122-
timeout-ms = <1000>;
123121
clocks = <&coreclk 0>;
124122
status = "disabled";
125123
};
@@ -130,7 +128,6 @@
130128
#address-cells = <1>;
131129
#size-cells = <0>;
132130
interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
133-
timeout-ms = <1000>;
134131
clocks = <&coreclk 0>;
135132
status = "disabled";
136133
};
@@ -141,7 +138,6 @@
141138
#address-cells = <1>;
142139
#size-cells = <0>;
143140
interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
144-
timeout-ms = <1000>;
145141
clocks = <&coreclk 0>;
146142
status = "disabled";
147143
};

arch/arm/boot/dts/dove.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@
175175
#size-cells = <0>;
176176
interrupts = <11>;
177177
clock-frequency = <400000>;
178-
timeout-ms = <1000>;
179178
clocks = <&core_clk 0>;
180179
status = "okay";
181180
};

0 commit comments

Comments
 (0)