diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-01-04 13:38:22 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-01-05 14:34:10 +0100 |
| commit | 2cd77a9163504498827eda901d0cb975c04423b9 (patch) | |
| tree | 12f9cd4a2e5e54c5a1a44f293ff114896fcf3bc5 /dts/src/mips | |
| parent | 9dfcb35ec75d263cbe8967d220934125525198ae (diff) | |
| download | barebox-2cd77a9163504498827eda901d0cb975c04423b9.tar.gz barebox-2cd77a9163504498827eda901d0cb975c04423b9.tar.xz | |
dts: update to v6.2-rc1
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src/mips')
| -rw-r--r-- | dts/src/mips/brcm/bcm63268.dtsi | 7 | ||||
| -rw-r--r-- | dts/src/mips/brcm/bcm7435.dtsi | 1 | ||||
| -rw-r--r-- | dts/src/mips/ingenic/ci20.dts | 2 | ||||
| -rw-r--r-- | dts/src/mips/mscc/jaguar2_pcb110.dts | 4 | ||||
| -rw-r--r-- | dts/src/mips/qca/ar9331.dtsi | 1 | ||||
| -rw-r--r-- | dts/src/mips/ralink/mt7621-gnubee-gb-pc2.dts | 2 | ||||
| -rw-r--r-- | dts/src/mips/ralink/mt7621.dtsi | 11 |
7 files changed, 17 insertions, 11 deletions
diff --git a/dts/src/mips/brcm/bcm63268.dtsi b/dts/src/mips/brcm/bcm63268.dtsi index 8926417a8f..7b788757cb 100644 --- a/dts/src/mips/brcm/bcm63268.dtsi +++ b/dts/src/mips/brcm/bcm63268.dtsi @@ -109,6 +109,13 @@ compatible = "brcm,bcm7038-twd", "simple-mfd", "syscon"; reg = <0x10000080 0x30>; ranges = <0x0 0x10000080 0x30>; + #address-cells = <1>; + #size-cells = <1>; + + timer@0 { + compatible = "brcm,bcm6345-timer"; + reg = <0x0 0x1c>; + }; wdt: watchdog@1c { compatible = "brcm,bcm7038-wdt"; diff --git a/dts/src/mips/brcm/bcm7435.dtsi b/dts/src/mips/brcm/bcm7435.dtsi index 8c001b944c..cfdf9804e1 100644 --- a/dts/src/mips/brcm/bcm7435.dtsi +++ b/dts/src/mips/brcm/bcm7435.dtsi @@ -422,6 +422,7 @@ reg = <0x41c800 0x600>, <0x41d000 0x100>; interrupt-parent = <&hif_l2_intc>; interrupts = <24>, <4>; + interrupt-names = "nand_ctlrdy", "flash_dma_done"; status = "disabled"; }; diff --git a/dts/src/mips/ingenic/ci20.dts b/dts/src/mips/ingenic/ci20.dts index 37c46720c7..f38c39572a 100644 --- a/dts/src/mips/ingenic/ci20.dts +++ b/dts/src/mips/ingenic/ci20.dts @@ -438,7 +438,7 @@ ingenic,nemc-tAW = <50>; ingenic,nemc-tSTRV = <100>; - reset-gpios = <&gpf 12 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpf 12 GPIO_ACTIVE_LOW>; vcc-supply = <ð0_power>; interrupt-parent = <&gpe>; diff --git a/dts/src/mips/mscc/jaguar2_pcb110.dts b/dts/src/mips/mscc/jaguar2_pcb110.dts index 0ea7bc5b57..1813f4e32e 100644 --- a/dts/src/mips/mscc/jaguar2_pcb110.dts +++ b/dts/src/mips/mscc/jaguar2_pcb110.dts @@ -208,7 +208,7 @@ }; &i2c0 { - pca9545@70 { + i2c-mux@70 { compatible = "nxp,pca9545"; reg = <0x70>; #address-cells = <1>; @@ -236,7 +236,7 @@ reg = <3>; }; }; - pca9545@71 { + i2c-mux@71 { compatible = "nxp,pca9545"; reg = <0x71>; #address-cells = <1>; diff --git a/dts/src/mips/qca/ar9331.dtsi b/dts/src/mips/qca/ar9331.dtsi index c4102b280b..768ac0f869 100644 --- a/dts/src/mips/qca/ar9331.dtsi +++ b/dts/src/mips/qca/ar9331.dtsi @@ -176,7 +176,6 @@ switch_port0: port@0 { reg = <0x0>; - label = "cpu"; ethernet = <ð1>; phy-mode = "gmii"; diff --git a/dts/src/mips/ralink/mt7621-gnubee-gb-pc2.dts b/dts/src/mips/ralink/mt7621-gnubee-gb-pc2.dts index 7515555388..e31417569e 100644 --- a/dts/src/mips/ralink/mt7621-gnubee-gb-pc2.dts +++ b/dts/src/mips/ralink/mt7621-gnubee-gb-pc2.dts @@ -113,13 +113,13 @@ &gmac1 { status = "okay"; + phy-mode = "rgmii-rxid"; phy-handle = <ðphy5>; }; &mdio { ethphy5: ethernet-phy@5 { reg = <5>; - phy-mode = "rgmii-rxid"; }; }; diff --git a/dts/src/mips/ralink/mt7621.dtsi b/dts/src/mips/ralink/mt7621.dtsi index f3f4c1f26e..aec85c7793 100644 --- a/dts/src/mips/ralink/mt7621.dtsi +++ b/dts/src/mips/ralink/mt7621.dtsi @@ -357,36 +357,35 @@ port@0 { status = "disabled"; reg = <0>; - label = "lan0"; + label = "swp0"; }; port@1 { status = "disabled"; reg = <1>; - label = "lan1"; + label = "swp1"; }; port@2 { status = "disabled"; reg = <2>; - label = "lan2"; + label = "swp2"; }; port@3 { status = "disabled"; reg = <3>; - label = "lan3"; + label = "swp3"; }; port@4 { status = "disabled"; reg = <4>; - label = "lan4"; + label = "swp4"; }; port@6 { reg = <6>; - label = "cpu"; ethernet = <&gmac0>; phy-mode = "trgmii"; |