Commit 7b069b11 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 fixes

Pull "Amlogic fixes for v4.17-rc1" from Kevin Hilman:
- add / enable USB host support for GX boards

* tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM64: dts: meson-gxm-khadas-vim2: enable the USB controller
  ARM64: dts: meson-gxl-nexbox-a95x: enable the USB controller
  ARM64: dts: meson-gxl-s905x-libretech-cc: enable the USB controller
  ARM64: dts: meson-gx-p23x-q20x: enable the USB controller
  ARM64: dts: meson-gxl-s905x-p212: enable the USB controller
  ARM64: dts: meson-gxm: add GXM specific USB host configuration
  ARM64: dts: meson-gxl: add USB host support
parents 1c3bc8fb 4b7b0d7b

arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -212,3 +212,7 @@ 
	pinctrl-0 = <&uart_ao_a_pins>;

	pinctrl-names = "default";

};



&usb0 {

	status = "okay";

};

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts

+12 −0
Original line number Diff line number Diff line
@@ -271,3 +271,15 @@ 
	pinctrl-0 = <&uart_ao_a_pins>;

	pinctrl-names = "default";

};



&usb0 {

	status = "okay";

};



&usb2_phy0 {

	/*

	 * even though the schematics don't show it:

	 * HDMI_5V is also used as supply for the USB VBUS.

	 */

	phy-supply = <&hdmi_5v>;

};

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts

+4 −0
Original line number Diff line number Diff line
@@ -215,3 +215,7 @@ 
	pinctrl-0 = <&uart_ao_a_pins>;

	pinctrl-names = "default";

};



&usb0 {

	status = "okay";

};

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -185,3 +185,7 @@ 
	pinctrl-0 = <&uart_ao_a_pins>;

	pinctrl-names = "default";

};



&usb0 {

	status = "okay";

};

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

+61 −0
Original line number Diff line number Diff line
@@ -20,6 +20,67 @@ 
			no-map;

		};

	};



	soc {

		usb0: usb@c9000000 {

			status = "disabled";

			compatible = "amlogic,meson-gxl-dwc3";

			#address-cells = <2>;

			#size-cells = <2>;

			ranges;



			clocks = <&clkc CLKID_USB>;

			clock-names = "usb_general";

			resets = <&reset RESET_USB_OTG>;

			reset-names = "usb_otg";



			dwc3: dwc3@c9000000 {

				compatible = "snps,dwc3";

				reg = <0x0 0xc9000000 0x0 0x100000>;

				interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;

				dr_mode = "host";

				maximum-speed = "high-speed";

				snps,dis_u2_susphy_quirk;

				phys = <&usb3_phy>, <&usb2_phy0>, <&usb2_phy1>;

			};

		};

	};

};



&apb {

	usb2_phy0: phy@78000 {

		compatible = "amlogic,meson-gxl-usb2-phy";

		#phy-cells = <0>;

		reg = <0x0 0x78000 0x0 0x20>;

		clocks = <&clkc CLKID_USB>;

		clock-names = "phy";

		resets = <&reset RESET_USB_OTG>;

		reset-names = "phy";

		status = "okay";

	};



	usb2_phy1: phy@78020 {

		compatible = "amlogic,meson-gxl-usb2-phy";

		#phy-cells = <0>;

		reg = <0x0 0x78020 0x0 0x20>;

		clocks = <&clkc CLKID_USB>;

		clock-names = "phy";

		resets = <&reset RESET_USB_OTG>;

		reset-names = "phy";

		status = "okay";

	};



	usb3_phy: phy@78080 {

		compatible = "amlogic,meson-gxl-usb3-phy";

		#phy-cells = <0>;

		reg = <0x0 0x78080 0x0 0x20>;

		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clkc CLKID_USB>, <&clkc_AO CLKID_AO_CEC_32K>;

		clock-names = "phy", "peripheral";

		resets = <&reset RESET_USB_OTG>, <&reset RESET_USB_OTG>;

		reset-names = "phy", "peripheral";

		status = "okay";

	};

};



&ethmac {

CRA Git | Maintained and supported by SUSTech CRA and CCSE