Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ada4fec2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I8da5daea,I677eccd7 into msm-next 

* changes:
  ARM: dts: msm: Add USB device node to sdm855
  arm64: defconfig: Enable USB EMU PHY for sdm855
parents 60c9e01d b01e7a02

arch/arm64/boot/dts/qcom/sdm855-rumi.dtsi

+28 −0
Original line number Diff line number Diff line
@@ -9,3 +9,31 @@ 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&soc {

	usb_emu_phy: usb_emu_phy@a720000 {

		compatible = "qcom,usb-emu-phy";

		reg = <0x0a720000 0x9500>,

		      <0x0a6f8800 0x100>;

		reg-names = "base", "qcratch_base";



		qcom,emu-init-seq = <0xfff0 0x4

				     0xfff3 0x4

				     0xfff0 0x4

				     0x100000 0x20

				     0x0 0x20

				     0x1a0 0x20

				     0x100000 0x3c

				     0x0 0x3c

				     0x10060 0x3c

				     0x0 0x4>;

	};

};



&usb0 {

	dwc3@a600000 {

		usb-phy = <&usb_emu_phy>;

		maximum-speed = "high-speed";

		dr_mode = "peripheral";

	};

};

arch/arm64/boot/dts/qcom/sdm855.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -490,6 +490,27 @@ 
				  "l3-scu-errirq",

				  "l3-scu-faultirq";

	};



	usb0: ssusb@a600000 {

		compatible = "qcom,dwc3";

		reg = <0x0a600000 0x100000>;

		reg-names = "base";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		dwc3@a600000 {

			compatible = "snps,dwc3";

			reg = <0x0a600000 0xcd00>;

			interrupt-parent = <&intc>;

			interrupts = <0 133 0>;

			tx-fifo-resize;

			linux,sysdev_is_parent;

			snps,disable-clk-gating;

			snps,has-lpm-erratum;

			snps,hird-threshold = /bits/ 8 <0x10>;

		};

	};

};



&emac_gdsc {

arch/arm64/configs/sdm855-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ CONFIG_USB_DWC3=y 
CONFIG_USB_ISP1760=y

CONFIG_USB_ISP1760_HOST_ROLE=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_QCOM_EMU_PHY=y

CONFIG_USB_GADGET=y

CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_USB_CONFIGFS=y

arch/arm64/configs/sdm855_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ CONFIG_USB_DWC3=y 
CONFIG_USB_ISP1760=y

CONFIG_USB_ISP1760_HOST_ROLE=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_QCOM_EMU_PHY=y

CONFIG_USB_GADGET=y

CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_USB_CONFIGFS=y