diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-29 10:24:10 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-29 10:24:10 +0100 |
| commit | 7e8ca10d5ead95a0a5039a6d0853723cce1a0510 (patch) | |
| tree | 3f6c03d33e6c763006f67bbd6886726d028c9f6b /dts | |
| parent | 27ee6010f89b4b2cd1e9e05975c1af2887ef04c5 (diff) | |
| download | barebox-7e8ca10d5ead95a0a5039a6d0853723cce1a0510.tar.gz barebox-7e8ca10d5ead95a0a5039a6d0853723cce1a0510.tar.xz | |
dts: update to v5.4-rc4
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts')
| -rw-r--r-- | dts/Bindings/interrupt-controller/atmel,aic.txt | 7 | ||||
| -rw-r--r-- | dts/src/arm/mt7629-rfb.dts | 13 | ||||
| -rw-r--r-- | dts/src/arm/mt7629.dtsi | 2 | ||||
| -rw-r--r-- | dts/src/riscv/sifive/hifive-unleashed-a00.dts | 1 | ||||
| -rw-r--r-- | dts/src/xtensa/virt.dts | 2 |
5 files changed, 19 insertions, 6 deletions
diff --git a/dts/Bindings/interrupt-controller/atmel,aic.txt b/dts/Bindings/interrupt-controller/atmel,aic.txt index f4c5d34c41..7079d44bf3 100644 --- a/dts/Bindings/interrupt-controller/atmel,aic.txt +++ b/dts/Bindings/interrupt-controller/atmel,aic.txt @@ -1,8 +1,11 @@ * Advanced Interrupt Controller (AIC) Required properties: -- compatible: Should be "atmel,<chip>-aic" - <chip> can be "at91rm9200", "sama5d2", "sama5d3" or "sama5d4" +- compatible: Should be: + - "atmel,<chip>-aic" where <chip> can be "at91rm9200", "sama5d2", + "sama5d3" or "sama5d4" + - "microchip,<chip>-aic" where <chip> can be "sam9x60" + - interrupt-controller: Identifies the node as an interrupt controller. - #interrupt-cells: The number of cells to define the interrupts. It should be 3. The first cell is the IRQ number (aka "Peripheral IDentifier" on datasheet). diff --git a/dts/src/arm/mt7629-rfb.dts b/dts/src/arm/mt7629-rfb.dts index 3621b7d2b2..9980c10c6e 100644 --- a/dts/src/arm/mt7629-rfb.dts +++ b/dts/src/arm/mt7629-rfb.dts @@ -66,9 +66,21 @@ pinctrl-1 = <&ephy_leds_pins>; status = "okay"; + gmac0: mac@0 { + compatible = "mediatek,eth-mac"; + reg = <0>; + phy-mode = "2500base-x"; + fixed-link { + speed = <2500>; + full-duplex; + pause; + }; + }; + gmac1: mac@1 { compatible = "mediatek,eth-mac"; reg = <1>; + phy-mode = "gmii"; phy-handle = <&phy0>; }; @@ -78,7 +90,6 @@ phy0: ethernet-phy@0 { reg = <0>; - phy-mode = "gmii"; }; }; }; diff --git a/dts/src/arm/mt7629.dtsi b/dts/src/arm/mt7629.dtsi index 9608bc2ccb..867b88103b 100644 --- a/dts/src/arm/mt7629.dtsi +++ b/dts/src/arm/mt7629.dtsi @@ -468,14 +468,12 @@ compatible = "mediatek,mt7629-sgmiisys", "syscon"; reg = <0x1b128000 0x3000>; #clock-cells = <1>; - mediatek,physpeed = "2500"; }; sgmiisys1: syscon@1b130000 { compatible = "mediatek,mt7629-sgmiisys", "syscon"; reg = <0x1b130000 0x3000>; #clock-cells = <1>; - mediatek,physpeed = "2500"; }; }; }; diff --git a/dts/src/riscv/sifive/hifive-unleashed-a00.dts b/dts/src/riscv/sifive/hifive-unleashed-a00.dts index 104d334511..88cfcb96bf 100644 --- a/dts/src/riscv/sifive/hifive-unleashed-a00.dts +++ b/dts/src/riscv/sifive/hifive-unleashed-a00.dts @@ -13,6 +13,7 @@ compatible = "sifive,hifive-unleashed-a00", "sifive,fu540-c000"; chosen { + stdout-path = "serial0"; }; cpus { diff --git a/dts/src/xtensa/virt.dts b/dts/src/xtensa/virt.dts index a9dcd87b6e..611b98a02a 100644 --- a/dts/src/xtensa/virt.dts +++ b/dts/src/xtensa/virt.dts @@ -56,7 +56,7 @@ reg = <0xf0100000 0x03f00000>; // BUS_ADDRESS(3) CPU_PHYSICAL(1) SIZE(2) - ranges = <0x01000000 0x0 0xf0000000 0xf0000000 0x0 0x00010000>, + ranges = <0x01000000 0x0 0x00000000 0xf0000000 0x0 0x00010000>, <0x02000000 0x0 0xf4000000 0xf4000000 0x0 0x08000000>; // PCI_DEVICE(3) INT#(1) CONTROLLER(PHANDLE) CONTROLLER_DATA(2) |