Commit 43f3b777 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-fixes' of... 

Merge tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/fixes

arm64: dts: fixes for v5.7-rc

Misc arm64 DT-only fixes

* tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm64: dts: meson-g12: remove spurious blank line
  arm64: dts: meson-g12b-khadas-vim3: add missing frddr_a status property
  arm64: dts: meson-g12-common: fix dwc2 clock names
  arm64: dts: meson-g12b-ugoos-am6: fix usb vbus-supply

Link: https://lore.kernel.org/r/7hmu6iyoc5.fsf@baylibre.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents deca1d1c adf27a87

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -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";

arch/arm64/boot/dts/amlogic/meson-g12.dtsi

+0 −1
Original line number Diff line number Diff line 


// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Copyright (c) 2019 BayLibre, SAS

arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -154,6 +154,10 @@ 
	clock-latency = <50000>;

};



&frddr_a {

	status = "okay";

};



&frddr_b {

	status = "okay";

};

arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts

+1 −1
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ 
&usb {

	status = "okay";

	dr_mode = "host";

	vbus-regulator = <&usb_pwr_en>;

	vbus-supply = <&usb_pwr_en>;

};



&usb2_phy0 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE