Unverified Commit 982e6e19 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt64-6.5-1' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents e86147a2 0ee03b8c

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

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
		l2: l2-cache {

			compatible = "cache";

			cache-level = <2>;

			cache-unified;

		};

	};

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

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
		ethernet5 = &switch0port4;

	};



	/delete-node/ regulator;



	reg_usb3_vbus: usb3-vbus {

		compatible = "regulator-fixed";

		regulator-name = "usb3-vbus";
@@ -66,6 +68,7 @@ 
};



&sdhci1 {

	/delete-property/ vqmmc-supply;

	status = "disabled";

};

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

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ 
	pinctrl-0 = <&cp0_i2c1_pins>;

	status = "okay";



	i2c-switch@70 {

	i2c-mux@70 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;

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

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ 
	pinctrl-0 = <&cp0_i2c1_pins>;

	status = "okay";



	i2c-switch@70 {

	i2c-mux@70 {

		compatible = "nxp,pca9544";

		#address-cells = <1>;

		#size-cells = <0>;

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

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
			cache-line-size = <64>;

			cache-sets = <512>;

			cache-level = <2>;

			cache-unified;

		};

	};