Merge "ARM: dts: msm: Add support for USB HS AC/DC coupling on SA6155" (6f499e7b) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/boot/dts/qcom/sa6155-adp-star.dtsi

+14 −0

Original line number	Diff line number	Diff line
		@@ -195,12 +195,26 @@
		qcom,host-poweroff-in-pm-suspend;
		};

		&qusb_phy0 {
		qcom,usb-hs-ac-bitmask = <0x30>;
		qcom,usb-hs-ac-value = <0x10>;
		pinctrl-names = "default";
		pinctrl-0 = <&usb0_hs_ac_en_default>;
		};

		&usb1 {
		status = "ok";
		qcom,default-mode-host;
		qcom,host-poweroff-in-pm-suspend;
		};

		&qusb_phy1 {
		qcom,usb-hs-ac-bitmask = <0xc0>;
		qcom,usb-hs-ac-value = <0x40>;
		pinctrl-names = "default";
		pinctrl-0 = <&usb1_hs_ac_en_default>;
		};

		&qupv3_se0_2uart {
		status = "ok";
		};

+27 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -1752,6 +1752,32 @@
		bias-pull-down;
		};
		};

		usb0_hs_ac_en_default: usb0_hs_ac_en_default {
		mux {
		pins = "gpio88";
		function = "usb0_hs_ac";
		};

		config {
		pins = "gpio88";
		drive-strength = <2>;
		bias-disable;
		};
		};

		usb1_hs_ac_en_default: usb1_hs_ac_en_default {
		mux {
		pins = "gpio89";
		function = "usb1_hs_ac";
		};

		config {
		pins = "gpio89";
		drive-strength = <2>;
		bias-disable;
		};
		};
		};
		};

+8 −4

Original line number	Diff line number	Diff line
		@@ -138,10 +138,12 @@
		compatible = "qcom,qusb2phy";
		reg = <0x88e2000 0x180>,
		<0x01fcb250 0x4>,
		<0x007801f8 0x4>;
		<0x007801f8 0x4>,
		<0x01fcb3e4 0x4>;
		reg-names = "qusb_phy_base",
		"tcsr_clamp_dig_n_1p8",
		"tune2_efuse_addr";
		"tune2_efuse_addr",
		"tcsr_conn_box_spare_0";

		vdd-supply = <&pm6150_l4>;
		vdda18-supply = <&pm6150_l11>;
		@@ -396,8 +398,10 @@
		/* Secondary USB port related High Speed PHY */
		qusb_phy1: qusb@88e3000 {
		compatible = "qcom,qusb2phy";
		reg = <0x88e3000 0x180>;
		reg-names = "qusb_phy_base";
		reg = <0x88e3000 0x180>,
		<0x01fcb3e4 0x4>;
		reg-names = "qusb_phy_base",
		"tcsr_conn_box_spare_0";

		vdd-supply = <&pm6150_l4>;
		vdda18-supply = <&pm6150_l11>;