diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-06-10 09:11:41 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-06-10 09:11:41 +0200 |
| commit | 198b75efb228d3d0d0c7e7c602fd57b5c872053a (patch) | |
| tree | 24b83c7155f24be8f906b2408ce430645de3a95a /dts/src/arm64/amlogic | |
| parent | 04f17f893cf6885b6caffb732c5b6c1dc9d6bb8e (diff) | |
| download | barebox-198b75efb228d3d0d0c7e7c602fd57b5c872053a.tar.gz barebox-198b75efb228d3d0d0c7e7c602fd57b5c872053a.tar.xz | |
dts: update to v5.7-rc6
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src/arm64/amlogic')
| -rw-r--r-- | dts/src/arm64/amlogic/meson-g12-common.dtsi | 2 | ||||
| -rw-r--r-- | dts/src/arm64/amlogic/meson-g12.dtsi | 1 | ||||
| -rw-r--r-- | dts/src/arm64/amlogic/meson-g12b-khadas-vim3.dtsi | 4 | ||||
| -rw-r--r-- | dts/src/arm64/amlogic/meson-g12b-ugoos-am6.dts | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/dts/src/arm64/amlogic/meson-g12-common.dtsi b/dts/src/arm64/amlogic/meson-g12-common.dtsi index 0882ea215b..c0aef7d691 100644 --- a/dts/src/arm64/amlogic/meson-g12-common.dtsi +++ b/dts/src/arm64/amlogic/meson-g12-common.dtsi @@ -2319,7 +2319,7 @@ reg = <0x0 0xff400000 0x0 0x40000>; interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clkc CLKID_USB1_DDR_BRIDGE>; - clock-names = "ddr"; + clock-names = "otg"; phys = <&usb2_phy1>; phy-names = "usb2-phy"; dr_mode = "peripheral"; diff --git a/dts/src/arm64/amlogic/meson-g12.dtsi b/dts/src/arm64/amlogic/meson-g12.dtsi index 783e5a397f..55d39020ec 100644 --- a/dts/src/arm64/amlogic/meson-g12.dtsi +++ b/dts/src/arm64/amlogic/meson-g12.dtsi @@ -1,4 +1,3 @@ - // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (c) 2019 BayLibre, SAS diff --git a/dts/src/arm64/amlogic/meson-g12b-khadas-vim3.dtsi b/dts/src/arm64/amlogic/meson-g12b-khadas-vim3.dtsi index c33e85fbda..c6c8caed83 100644 --- a/dts/src/arm64/amlogic/meson-g12b-khadas-vim3.dtsi +++ b/dts/src/arm64/amlogic/meson-g12b-khadas-vim3.dtsi @@ -154,6 +154,10 @@ clock-latency = <50000>; }; +&frddr_a { + status = "okay"; +}; + &frddr_b { status = "okay"; }; diff --git a/dts/src/arm64/amlogic/meson-g12b-ugoos-am6.dts b/dts/src/arm64/amlogic/meson-g12b-ugoos-am6.dts index 325e448eb0..06c5430eb9 100644 --- a/dts/src/arm64/amlogic/meson-g12b-ugoos-am6.dts +++ b/dts/src/arm64/amlogic/meson-g12b-ugoos-am6.dts @@ -545,7 +545,7 @@ &usb { status = "okay"; dr_mode = "host"; - vbus-regulator = <&usb_pwr_en>; + vbus-supply = <&usb_pwr_en>; }; &usb2_phy0 { |