diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-02-22 10:29:38 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-02-22 10:29:38 +0100 |
| commit | 14297b84171e1b044197a41dbb0f0dbf08abd7b1 (patch) | |
| tree | 18d4ba9e75eb4ac1cc29a4b9fb1dacc1b7472416 /dts/src/arm64/amlogic | |
| parent | 2d168d3f68a7826cda53c8bb713965953b2c93fc (diff) | |
| download | barebox-14297b84171e1b044197a41dbb0f0dbf08abd7b1.tar.gz barebox-14297b84171e1b044197a41dbb0f0dbf08abd7b1.tar.xz | |
dts: update to v5.11-rc7
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src/arm64/amlogic')
| -rw-r--r-- | dts/src/arm64/amlogic/meson-axg.dtsi | 2 | ||||
| -rw-r--r-- | dts/src/arm64/amlogic/meson-g12-common.dtsi | 4 | ||||
| -rw-r--r-- | dts/src/arm64/amlogic/meson-gx.dtsi | 3 | ||||
| -rw-r--r-- | dts/src/arm64/amlogic/meson-sm1-odroid-c4.dts | 2 |
4 files changed, 2 insertions, 9 deletions
diff --git a/dts/src/arm64/amlogic/meson-axg.dtsi b/dts/src/arm64/amlogic/meson-axg.dtsi index ba1c6dfdc4..d945c84ab6 100644 --- a/dts/src/arm64/amlogic/meson-axg.dtsi +++ b/dts/src/arm64/amlogic/meson-axg.dtsi @@ -280,8 +280,6 @@ "timing-adjustment"; rx-fifo-depth = <4096>; tx-fifo-depth = <2048>; - resets = <&reset RESET_ETHERNET>; - reset-names = "stmmaceth"; power-domains = <&pwrc PWRC_AXG_ETHERNET_MEM_ID>; status = "disabled"; }; diff --git a/dts/src/arm64/amlogic/meson-g12-common.dtsi b/dts/src/arm64/amlogic/meson-g12-common.dtsi index 9c90d562ad..b858c5e43c 100644 --- a/dts/src/arm64/amlogic/meson-g12-common.dtsi +++ b/dts/src/arm64/amlogic/meson-g12-common.dtsi @@ -224,8 +224,6 @@ "timing-adjustment"; rx-fifo-depth = <4096>; tx-fifo-depth = <2048>; - resets = <&reset RESET_ETHERNET>; - reset-names = "stmmaceth"; status = "disabled"; mdio0: mdio { @@ -2390,7 +2388,7 @@ interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; dr_mode = "host"; snps,dis_u2_susphy_quirk; - snps,quirk-frame-length-adjustment; + snps,quirk-frame-length-adjustment = <0x20>; snps,parkmode-disable-ss-quirk; }; }; diff --git a/dts/src/arm64/amlogic/meson-gx.dtsi b/dts/src/arm64/amlogic/meson-gx.dtsi index 726b91d3a9..0edd137151 100644 --- a/dts/src/arm64/amlogic/meson-gx.dtsi +++ b/dts/src/arm64/amlogic/meson-gx.dtsi @@ -13,7 +13,6 @@ #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/power/meson-gxbb-power.h> -#include <dt-bindings/reset/amlogic,meson-gxbb-reset.h> #include <dt-bindings/thermal/thermal.h> / { @@ -576,8 +575,6 @@ interrupt-names = "macirq"; rx-fifo-depth = <4096>; tx-fifo-depth = <2048>; - resets = <&reset RESET_ETHERNET>; - reset-names = "stmmaceth"; power-domains = <&pwrc PWRC_GXBB_ETHERNET_MEM_ID>; status = "disabled"; }; diff --git a/dts/src/arm64/amlogic/meson-sm1-odroid-c4.dts b/dts/src/arm64/amlogic/meson-sm1-odroid-c4.dts index cf5a98f0e4..a712273c90 100644 --- a/dts/src/arm64/amlogic/meson-sm1-odroid-c4.dts +++ b/dts/src/arm64/amlogic/meson-sm1-odroid-c4.dts @@ -52,7 +52,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; + gpio = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>; enable-active-high; regulator-always-on; }; |