Skip to content

L
linux
Commit 8db93c21 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

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

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.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d10ee710 4289937d
Show whitespace changes
Inline Side-by-side
Showing with 88 additions and 67 deletions
arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts
View file @ 8db93c21
......@@ -25,8 +25,6 @@ &mdio {
/* Actual device is MV88E6361 */
switch: switch@0 {
compatible = "marvell,mv88e6190";
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
status = "disabled";
......
arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
View file @ 8db93c21
......@@ -114,19 +114,36 @@ &usb3 {
};
&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 {
switch0: ethernet-switch@3 {
compatible = "marvell,mv88e6085";
reg = <3>;
reset-gpios = <&gpiosb 23 GPIO_ACTIVE_LOW>;
dsa,member = <0 0>;
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";
......@@ -160,8 +177,21 @@ switch0port5: ethernet-port@5 {
};
mdio {
#address-cells = <1>;
#size-cells = <0>;
switch0phy0: ethernet-phy@11 {
reg = <0x11>;
};
switch0phy1: ethernet-phy@12 {
reg = <0x12>;
};
switch0phy2: ethernet-phy@13 {
reg = <0x13>;
};
switch0phy3: ethernet-phy@14 {
reg = <0x14>;
};
};
};
};
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
View file @ 8db93c21
......@@ -216,8 +216,6 @@ &spi0 {
assigned-clock-rates = <20000000>;
flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <20000000>;
......
arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
View file @ 8db93c21
......@@ -61,7 +61,7 @@ config-space@f0000000 {
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;
......
arch/arm64/boot/dts/marvell/cn9130-crb.dtsi
View file @ 8db93c21
......@@ -26,7 +26,7 @@ memory@0 {
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 @@ ap0_reg_mmc_vccq: ap0_mmc_vccq@0 {
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 @@ cp0_reg_usb3_vbus1: cp0_usb3_vbus@1 {
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 @@ cp0_reg_sd_vccq: cp0_sd_vccq@0 {
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 @@ sfp: sfp {
tx-disable-gpios = <&expander0 2 GPIO_ACTIVE_HIGH>;
tx-fault-gpios = <&cp0_gpio1 24 GPIO_ACTIVE_HIGH>;
maximum-power-milliwatt = <3000>;
status = "okay";
};
};
......
arch/arm64/boot/dts/marvell/cn9130-db.dtsi
View file @ 8db93c21
......@@ -30,7 +30,7 @@ memory@0 {
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 @@ ap0_reg_sd_vccq: ap0_sd_vccq@0 {
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 @@ cp0_reg_usb3_vbus0: cp0_usb3_vbus@0 {
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 @@ cp0_reg_usb3_vbus1: cp0_usb3_vbus@1 {
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 @@ cp0_reg_sd_vccq: cp0_sd_vccq@0 {
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 @@ cp0_reg_sd_vcc: cp0_sd_vcc@0 {
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 @@ &cp0_spi1 {
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 */
......
arch/arm64/boot/dts/marvell/cn9131-db.dtsi
View file @ 8db93c21
......@@ -18,7 +18,7 @@ aliases {
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 @@ cp1_reg_usb3_vbus0: cp1_usb3_vbus@0 {
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 @@ &cp1_spi1 {
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 */
......
arch/arm64/boot/dts/marvell/cn9132-db.dtsi
View file @ 8db93c21
......@@ -17,7 +17,7 @@ aliases {
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 @@ cp2_reg_usb3_vbus0: cp2_usb3_vbus@0 {
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 @@ cp2_reg_usb3_vbus1: cp2_usb3_vbus@1 {
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 @@ cp2_reg_sd_vccq: cp2_sd_vccq@0 {
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>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7