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>
This commit is contained in:
Arnd Bergmann
2023-06-20 23:01:57 +02:00
8 changed files with 12 additions and 3 deletions

View File

@@ -50,6 +50,7 @@
l2: l2-cache {
compatible = "cache";
cache-level = <2>;
cache-unified;
};
};

View File

@@ -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";
};

View File

@@ -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>;

View File

@@ -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>;

View File

@@ -52,6 +52,7 @@
cache-line-size = <64>;
cache-sets = <512>;
cache-level = <2>;
cache-unified;
};
};

View File

@@ -82,6 +82,7 @@
cache-line-size = <64>;
cache-sets = <512>;
cache-level = <2>;
cache-unified;
};
l2_1: l2-cache1 {
@@ -90,6 +91,7 @@
cache-line-size = <64>;
cache-sets = <512>;
cache-level = <2>;
cache-unified;
};
};
};

View File

@@ -82,6 +82,7 @@
cache-line-size = <64>;
cache-sets = <512>;
cache-level = <2>;
cache-unified;
};
l2_1: l2-cache1 {
@@ -90,6 +91,7 @@
cache-line-size = <64>;
cache-sets = <512>;
cache-level = <2>;
cache-unified;
};
};
};

View File

@@ -468,7 +468,7 @@
status = "disabled";
};
CP11X_LABEL(nand_controller): nand@720000 {
CP11X_LABEL(nand_controller): nand-controller@720000 {
/*
* Due to the limitation of the pins available
* this controller is only usable on the CPM