Skip to content

Commit 982e6e1

Browse files
committed
Merge tag 'mvebu-dt64-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt
mvebu dt64 for 6.5 (part 1) Few improvements following the dt bindings: - add missing cache properties - fix nand_controller node name according to YAML - fix pca954x i2c-mux node names Fix espressobin-ultra boot failure and wifi for EspressoBIN Ultra (Armada 3720) * tag 'mvebu-dt64-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu: arm64: dts: marvell: Fix espressobin-ultra boot failure and wifi arm64: dts: marvell: Fix pca954x i2c-mux node names arm64: dts: marvell: cp11x: Fix nand_controller node name according to YAML arm64: dts: marvell: add missing cache properties Link: https://lore.kernel.org/r/877cs3h87m.fsf@BL-laptop Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents e86147a + 0ee03b8 commit 982e6e1

8 files changed

Lines changed: 12 additions & 3 deletions

arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
l2: l2-cache {
5151
compatible = "cache";
5252
cache-level = <2>;
53+
cache-unified;
5354
};
5455
};
5556

arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
ethernet5 = &switch0port4;
2525
};
2626

27+
/delete-node/ regulator;
28+
2729
reg_usb3_vbus: usb3-vbus {
2830
compatible = "regulator-fixed";
2931
regulator-name = "usb3-vbus";
@@ -66,6 +68,7 @@
6668
};
6769

6870
&sdhci1 {
71+
/delete-property/ vqmmc-supply;
6972
status = "disabled";
7073
};
7174

arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
pinctrl-0 = <&cp0_i2c1_pins>;
136136
status = "okay";
137137

138-
i2c-switch@70 {
138+
i2c-mux@70 {
139139
compatible = "nxp,pca9548";
140140
#address-cells = <1>;
141141
#size-cells = <0>;

arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285
pinctrl-0 = <&cp0_i2c1_pins>;
286286
status = "okay";
287287

288-
i2c-switch@70 {
288+
i2c-mux@70 {
289289
compatible = "nxp,pca9544";
290290
#address-cells = <1>;
291291
#size-cells = <0>;

arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
cache-line-size = <64>;
5353
cache-sets = <512>;
5454
cache-level = <2>;
55+
cache-unified;
5556
};
5657
};
5758

arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
cache-line-size = <64>;
8383
cache-sets = <512>;
8484
cache-level = <2>;
85+
cache-unified;
8586
};
8687

8788
l2_1: l2-cache1 {
@@ -90,6 +91,7 @@
9091
cache-line-size = <64>;
9192
cache-sets = <512>;
9293
cache-level = <2>;
94+
cache-unified;
9395
};
9496
};
9597
};

arch/arm64/boot/dts/marvell/armada-ap807-quad.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
cache-line-size = <64>;
8383
cache-sets = <512>;
8484
cache-level = <2>;
85+
cache-unified;
8586
};
8687

8788
l2_1: l2-cache1 {
@@ -90,6 +91,7 @@
9091
cache-line-size = <64>;
9192
cache-sets = <512>;
9293
cache-level = <2>;
94+
cache-unified;
9395
};
9496
};
9597
};

arch/arm64/boot/dts/marvell/armada-cp11x.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@
468468
status = "disabled";
469469
};
470470

471-
CP11X_LABEL(nand_controller): nand@720000 {
471+
CP11X_LABEL(nand_controller): nand-controller@720000 {
472472
/*
473473
* Due to the limitation of the pins available
474474
* this controller is only usable on the CPM

0 commit comments

Comments
 (0)