mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-07 00:59:06 +00:00
Code Issues Releases Wiki Activity

mvebu dt64 for 6.5 (part 1)

Browse source 
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)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCZIxbqgAKCRALBhiOFHI7
 1d54AJ0byix3TvJ4uDW2mSD6cQPDuT/k+QCfehNv7uPLD8FIIh81tOMc1529cZo=
 =JYkk
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmSSE8YACgkQYKtH/8kJ
 UicXBRAAkQ7hez1rnpEaNVV5X5HUrx2CieZJI5FfpagBi6xkAQ93iWulji9ADMpY
 893qBc7yXsf4LpxJ4lhwhDQETJXZEN/kL3CXMIc6HycsS9Qvrab8/QNxuHQMuL67
 lGGpX8VFDjyySl1RHp0YH7N5F4VtpnOLVOidizuoinxl7HixQaXSbHWJpu2GfRI5
 nqAjX7xU9Y4lLXWC8ZYgQUnshkL25YlDSgv3uwJzafGfta7hwsQG04XIAu7TQf5L
 K1EQbcdetn8s3c6cNqcxZ0NlGnEH2j7sM40YFeay4+yCH6aeQz2hSEIsZlvdkL/X
 vWDy08lwHeFB5SCJMcJA66WgMXz5qu1hvrpi3mWBk7IWgWZeUt5wMBPK2xSIU9SQ
 MnUWwkhObXNIVuhBgzGI5KOViH6srU7pLXK7yfxMgUGN2uD7sbb6YXxsbxqUu1LU
 hSCwZXkEIyACA8g1qhpAPqJhzQnTByf1CXXGqXGsFH/HjVvtpffOpoaXKqnEjlBh
 e1t/FL2y/9NlHI7vSP5bQxxr2suabmo/lJr/VvxG6ttPaJTTZoSL0qyIMURy/+Qo
 xiK6ene3xOHefM5FWQ5XxHLn5mgSZP2tV5KnviK8aLUvF2DuJj338kS7c2mrcxGd
 uEJ/AmcDtKziKUCOvlN6VNIf17/DS1kusD/slk5332mRcR3TYGY=
 =DvBf
 -----END PGP SIGNATURE-----

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
commit 982e6e1966
8 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -24,6 +24,8 @@ aliases {
ethernet5 = &switch0port4;
};
/delete-node/ regulator;
reg_usb3_vbus: usb3-vbus {
compatible = "regulator-fixed";
regulator-name = "usb3-vbus";
@ -66,6 +68,7 @@ &sdhci0 {
};
&sdhci1 {
/delete-property/ vqmmc-supply;
status = "disabled";
};

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

@ -135,7 +135,7 @@ &cp0_i2c1 {
pinctrl-0 = <&cp0_i2c1_pins>;
status = "okay";
i2c-switch@70 {
i2c-mux@70 {
compatible = "nxp,pca9548";
#address-cells = <1>;
#size-cells = <0>;

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

@ -285,7 +285,7 @@ &cp0_i2c1 {
pinctrl-0 = <&cp0_i2c1_pins>;
status = "okay";
i2c-switch@70 {
i2c-mux@70 {
compatible = "nxp,pca9544";
#address-cells = <1>;
#size-cells = <0>;

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

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

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

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

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

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

2
arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
View file

@ -468,7 +468,7 @@ CP11X_LABEL(uart3): serial@702300 {
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