iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mvebu dt64 for 6.10 (part 1)

Browse Source 
Few dts fix for dt validation
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCZjf6GgAKCRALBhiOFHI7
 1RdOAJ9/2i3xP4EcGlOIOYEwMhRpegEuXQCgkFgWJM0kIHoJoWGuYSLw8ApEVlw=
 =USEH
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmY54LYACgkQYKtH/8kJ
 UiePqxAAta8+WuabDzrWtWrkqRr71E4/2i7YxcBy5uuFGG79dKSA5ZDxIhm/L6KI
 v3yqXNBRH7pT8w46iYeYR46PysCEXGy+i9hO0oDIFgIAp76xV+6O0W0XYSxFmh/c
 qEHm90ugKe1xhrjatcONwFW8BT7eFH+GoCHesXtW3nEe/aIsE6sKAUuvJ6QRtv8p
 XGrfZ/McvZc15M4h590iIgCH52jhCL4WnGYeXmQDZf8c9X6ewh1ElbYZkC9RHtoB
 m5tAGti/rpt/Hslqmv1FX8f92UUDUVncTYhdTz0kEuVjPBVyUqWTAKUZwlVPT6by
 7tamLJrsNWAI7xgHAbvETR3OhdywSMIXtOTm4H04t2Vx+djb7RMK32TmAOeUcxfB
 xLjGDRyhnvVNZKlUO/Y2YSYEMkY9qfV8qIj/phTHJTufRE+Pol9N1nLqUD7wNZnH
 A4EMt26rm4MM04zEj7DxfPpg0yDsDdvhCSWti23DmTSToIVhXx5Yl596PsrNgSYh
 NMeTjDGE545HsoDUudD5gxZHUCApa6VmhifR0NcXT+EWCkcAxDSALEPLfENMOYMK
 Sj1KKVTB283Dc/Ink5IkJfyxHqBdxQufJ3EFkw5XlZFxR5ap4GQ1s0Q/FFPTc4O/
 QfxNVRnMnG3cinwygVzKoczsy/MFKbk3GJudxN9MPRsrhoHjHbk=
 =DM9C
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt64-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt

mvebu dt64 for 6.10 (part 1)

Few dts fix for dt validation

* tag 'mvebu-dt64-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  arm64: dts: marvell: espressobin-ultra: fix Ethernet Switch unit address
  arm64: dts: marvell: turris-mox: drop unneeded flash address/size-cells
  arm64: dts: marvell: eDPU: drop redundant address/size-cells
  arm64: dts: marvell: cn9130-crb: drop unneeded "status"
  arm64: dts: marvell: cn9130-crb: drop wrong unit-addresses
  arm64: dts: marvell: cn9130-db: drop wrong unit-addresses
  arm64: dts: marvell: cn9131-db: drop unneeded flash address/size-cells
  arm64: dts: marvell: cn9130-db: drop unneeded flash address/size-cells
  arm64: dts: marvell: ap80x: fix IOMMU unit address

Link: https://lore.kernel.org/r/87jzk8ndyy.fsf@BLaptop.bootlin.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-05-07 10:05:10 +02:00
commit 8db93c212e
8 changed files with 91 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts
View File

@ -25,8 +25,6 @@
/* Actual device is MV88E6361 */
switch: switch@0 {
compatible = "marvell,mv88e6190";
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
status = "disabled";

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

@ -114,54 +114,84 @@
};
&mdio {
/* Switch is @3, not @1 */
/delete-node/ ethernet-switch@1;
extphy: ethernet-phy@1 {
reg = <1>;
reset-gpios = <&gpionb 2 GPIO_ACTIVE_LOW>;
};
};
&switch0 {
reg = <3>;
switch0: ethernet-switch@3 {
compatible = "marvell,mv88e6085";
reg = <3>;
reset-gpios = <&gpiosb 23 GPIO_ACTIVE_LOW>;
reset-gpios = <&gpiosb 23 GPIO_ACTIVE_LOW>;
dsa,member = <0 0>;
ethernet-ports {
switch0port1: ethernet-port@1 {
reg = <1>;
label = "lan0";
phy-handle = <&switch0phy0>;
ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
switch0port0: ethernet-port@0 {
reg = <0>;
label = "cpu";
ethernet = <&eth0>;
phy-mode = "rgmii-id";
fixed-link {
speed = <1000>;
full-duplex;
};
};
switch0port1: ethernet-port@1 {
reg = <1>;
label = "lan0";
phy-handle = <&switch0phy0>;
};
switch0port2: ethernet-port@2 {
reg = <2>;
label = "lan1";
phy-handle = <&switch0phy1>;
};
switch0port3: ethernet-port@3 {
reg = <3>;
label = "lan2";
phy-handle = <&switch0phy2>;
};
switch0port4: ethernet-port@4 {
reg = <4>;
label = "lan3";
phy-handle = <&switch0phy3>;
};
switch0port5: ethernet-port@5 {
reg = <5>;
label = "wan";
phy-handle = <&extphy>;
phy-mode = "sgmii";
};
};
switch0port2: ethernet-port@2 {
reg = <2>;
label = "lan1";
phy-handle = <&switch0phy1>;
};
mdio {
#address-cells = <1>;
#size-cells = <0>;
switch0port3: ethernet-port@3 {
reg = <3>;
label = "lan2";
phy-handle = <&switch0phy2>;
};
switch0port4: ethernet-port@4 {
reg = <4>;
label = "lan3";
phy-handle = <&switch0phy3>;
};
switch0port5: ethernet-port@5 {
reg = <5>;
label = "wan";
phy-handle = <&extphy>;
phy-mode = "sgmii";
};
};
mdio {
switch0phy3: ethernet-phy@14 {
reg = <0x14>;
switch0phy0: ethernet-phy@11 {
reg = <0x11>;
};
switch0phy1: ethernet-phy@12 {
reg = <0x12>;
};
switch0phy2: ethernet-phy@13 {
reg = <0x13>;
};
switch0phy3: ethernet-phy@14 {
reg = <0x14>;
};
};
};
};

2
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
View File

@ -216,8 +216,6 @@
assigned-clock-rates = <20000000>;
flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <20000000>;

2
arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
View File

@ -61,7 +61,7 @@
compatible = "simple-bus";
ranges = <0x0 0x0 0xf0000000 0x1000000>;
smmu: iommu@5000000 {
smmu: iommu@100000 {
compatible = "marvell,ap806-smmu-500", "arm,mmu-500";
reg = <0x100000 0x100000>;
dma-coherent;

13
arch/arm64/boot/dts/marvell/cn9130-crb.dtsi
View File

@ -26,7 +26,7 @@
reg = <0x0 0x0 0x0 0x80000000>;
};
ap0_reg_mmc_vccq: ap0_mmc_vccq@0 {
ap0_reg_mmc_vccq: regulator-1 {
compatible = "regulator-gpio";
regulator-name = "ap0_mmc_vccq";
regulator-min-microvolt = <1800000>;
@ -36,7 +36,7 @@
3300000 0x0>;
};
cp0_reg_usb3_vbus1: cp0_usb3_vbus@1 {
cp0_reg_usb3_vbus1: regulator-2 {
compatible = "regulator-fixed";
regulator-name = "cp0-xhci1-vbus";
regulator-min-microvolt = <5000000>;
@ -45,16 +45,16 @@
gpio = <&expander0 8 GPIO_ACTIVE_HIGH>;
};
cp0_usb3_0_phy0: cp0_usb3_phy0 {
cp0_usb3_0_phy0: usb-phy-1 {
compatible = "usb-nop-xceiv";
};
cp0_usb3_0_phy1: cp0_usb3_phy1 {
cp0_usb3_0_phy1: usb-phy-2 {
compatible = "usb-nop-xceiv";
vcc-supply = <&cp0_reg_usb3_vbus1>;
};
cp0_reg_sd_vccq: cp0_sd_vccq@0 {
cp0_reg_sd_vccq: regulator-3 {
compatible = "regulator-gpio";
regulator-name = "cp0_sd_vccq";
regulator-min-microvolt = <1800000>;
@ -64,7 +64,7 @@
3300000 0x0>;
};
cp0_reg_sd_vcc: cp0_sd_vcc@0 {
cp0_reg_sd_vcc: regulator-4 {
compatible = "regulator-fixed";
regulator-name = "cp0_sd_vcc";
regulator-min-microvolt = <3300000>;
@ -82,7 +82,6 @@
tx-disable-gpios = <&expander0 2 GPIO_ACTIVE_HIGH>;
tx-fault-gpios = <&cp0_gpio1 24 GPIO_ACTIVE_HIGH>;
maximum-power-milliwatt = <3000>;
status = "okay";
};
};

18
arch/arm64/boot/dts/marvell/cn9130-db.dtsi
View File

@ -30,7 +30,7 @@
reg = <0x0 0x0 0x0 0x80000000>;
};
ap0_reg_sd_vccq: ap0_sd_vccq@0 {
ap0_reg_sd_vccq: regulator-1 {
compatible = "regulator-gpio";
regulator-name = "ap0_sd_vccq";
regulator-min-microvolt = <1800000>;
@ -39,7 +39,7 @@
states = <1800000 0x1 3300000 0x0>;
};
cp0_reg_usb3_vbus0: cp0_usb3_vbus@0 {
cp0_reg_usb3_vbus0: regulator-2 {
compatible = "regulator-fixed";
regulator-name = "cp0-xhci0-vbus";
regulator-min-microvolt = <5000000>;
@ -48,12 +48,12 @@
gpio = <&expander0 0 GPIO_ACTIVE_HIGH>;
};
cp0_usb3_0_phy0: cp0_usb3_phy@0 {
cp0_usb3_0_phy0: usb-phy-1 {
compatible = "usb-nop-xceiv";
vcc-supply = <&cp0_reg_usb3_vbus0>;
};
cp0_reg_usb3_vbus1: cp0_usb3_vbus@1 {
cp0_reg_usb3_vbus1: regulator-3 {
compatible = "regulator-fixed";
regulator-name = "cp0-xhci1-vbus";
regulator-min-microvolt = <5000000>;
@ -62,12 +62,12 @@
gpio = <&expander0 1 GPIO_ACTIVE_HIGH>;
};
cp0_usb3_0_phy1: cp0_usb3_phy@1 {
cp0_usb3_0_phy1: usb-phy-2 {
compatible = "usb-nop-xceiv";
vcc-supply = <&cp0_reg_usb3_vbus1>;
};
cp0_reg_sd_vccq: cp0_sd_vccq@0 {
cp0_reg_sd_vccq: regulator-4 {
compatible = "regulator-gpio";
regulator-name = "cp0_sd_vccq";
regulator-min-microvolt = <1800000>;
@ -77,7 +77,7 @@
3300000 0x0>;
};
cp0_reg_sd_vcc: cp0_sd_vcc@0 {
cp0_reg_sd_vcc: regulator-5 {
compatible = "regulator-fixed";
regulator-name = "cp0_sd_vcc";
regulator-min-microvolt = <3300000>;
@ -87,7 +87,7 @@
regulator-always-on;
};
cp0_sfp_eth0: sfp-eth@0 {
cp0_sfp_eth0: sfp-eth-1 {
compatible = "sff,sfp";
i2c-bus = <&cp0_sfpp0_i2c>;
los-gpios = <&cp0_module_expander1 11 GPIO_ACTIVE_HIGH>;
@ -311,8 +311,6 @@
reg = <0x700680 0x50>;
flash@0 {
#address-cells = <0x1>;
#size-cells = <0x1>;
compatible = "jedec,spi-nor";
reg = <0x0>;
/* On-board MUX does not allow higher frequencies */

8
arch/arm64/boot/dts/marvell/cn9131-db.dtsi
View File

@ -18,7 +18,7 @@
ethernet4 = &cp1_eth1;
};
cp1_reg_usb3_vbus0: cp1_usb3_vbus@0 {
cp1_reg_usb3_vbus0: regulator-6 {
compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&cp1_xhci0_vbus_pins>;
@ -29,12 +29,12 @@
gpio = <&cp1_gpio1 3 GPIO_ACTIVE_HIGH>;
};
cp1_usb3_0_phy0: cp1_usb3_phy0 {
cp1_usb3_0_phy0: usb-phy-3 {
compatible = "usb-nop-xceiv";
vcc-supply = <&cp1_reg_usb3_vbus0>;
};
cp1_sfp_eth1: sfp-eth1 {
cp1_sfp_eth1: sfp-eth-2 {
compatible = "sff,sfp";
i2c-bus = <&cp1_i2c0>;
los-gpios = <&cp1_gpio1 11 GPIO_ACTIVE_HIGH>;
@ -138,8 +138,6 @@
reg = <0x700680 0x50>;
flash@0 {
#address-cells = <0x1>;
#size-cells = <0x1>;
compatible = "jedec,spi-nor";
reg = <0x0>;
/* On-board MUX does not allow higher frequencies */

12
arch/arm64/boot/dts/marvell/cn9132-db.dtsi
View File

@ -17,7 +17,7 @@
ethernet5 = &cp2_eth0;
};
cp2_reg_usb3_vbus0: cp2_usb3_vbus@0 {
cp2_reg_usb3_vbus0: regulator-7 {
compatible = "regulator-fixed";
regulator-name = "cp2-xhci0-vbus";
regulator-min-microvolt = <5000000>;
@ -26,12 +26,12 @@
gpio = <&cp2_gpio1 2 GPIO_ACTIVE_HIGH>;
};
cp2_usb3_0_phy0: cp2_usb3_phy0 {
cp2_usb3_0_phy0: usb-phy-4 {
compatible = "usb-nop-xceiv";
vcc-supply = <&cp2_reg_usb3_vbus0>;
};
cp2_reg_usb3_vbus1: cp2_usb3_vbus@1 {
cp2_reg_usb3_vbus1: regulator-8 {
compatible = "regulator-fixed";
regulator-name = "cp2-xhci1-vbus";
regulator-min-microvolt = <5000000>;
@ -40,12 +40,12 @@
gpio = <&cp2_gpio1 3 GPIO_ACTIVE_HIGH>;
};
cp2_usb3_0_phy1: cp2_usb3_phy1 {
cp2_usb3_0_phy1: usb-phy-5 {
compatible = "usb-nop-xceiv";
vcc-supply = <&cp2_reg_usb3_vbus1>;
};
cp2_reg_sd_vccq: cp2_sd_vccq@0 {
cp2_reg_sd_vccq: regulator-9 {
compatible = "regulator-gpio";
regulator-name = "cp2_sd_vcc";
regulator-min-microvolt = <1800000>;
@ -54,7 +54,7 @@
states = <1800000 0x1 3300000 0x0>;
};
cp2_sfp_eth0: sfp-eth0 {
cp2_sfp_eth0: sfp-eth-3 {
compatible = "sff,sfp";
i2c-bus = <&cp2_sfpp0_i2c>;
los-gpios = <&cp2_module_expander1 11 GPIO_ACTIVE_HIGH>;