Commit 1da8116e authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Greg Kroah-Hartman
Browse files

arm64: dts: qcom: sc7180-trogdor: Add nodes for onboard USB hub 



Add nodes for the onboard USB hub on trogdor devices. Remove the
'always-on' property from the hub regulator, since the regulator
is now managed by the onboard_usb_hub driver.

Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Link: https://lore.kernel.org/r/20210609150159.v12.5.Ie0d2c1214b767bb5551dd4cad38398bd40e4466f@changeid


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c950686b

arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts

+8 −11
Original line number Diff line number Diff line
@@ -23,17 +23,6 @@ 
	status = "disabled";

};



&pp3300_hub {

	/* pp3300_l7c is used to power the USB hub */

	/delete-property/regulator-always-on;

	/delete-property/regulator-boot-on;

};



&pp3300_l7c {

	regulator-always-on;

	regulator-boot-on;

};



&sn65dsi86_out {

	/*

	 * Lane 0 was incorrectly mapped on the cable, but we've now decided
@@ -42,3 +31,11 @@ 
	 */

	lane-polarities = <1 0>;

};



&usb_hub_2_0 {

	 vdd-supply = <&pp3300_l7c>;

};



&usb_hub_3_0 {

	 vdd-supply = <&pp3300_l7c>;

};

arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts

+5 −7
Original line number Diff line number Diff line
@@ -23,13 +23,11 @@ 
	status = "disabled";

};



&pp3300_hub {

	/* pp3300_l7c is used to power the USB hub */

	/delete-property/regulator-always-on;

	/delete-property/regulator-boot-on;



&usb_hub_2_0 {

	 vdd-supply = <&pp3300_l7c>;

};



&pp3300_l7c {

	regulator-always-on;

	regulator-boot-on;

&usb_hub_3_0 {

	 vdd-supply = <&pp3300_l7c>;

};

arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts

+8 −11
Original line number Diff line number Diff line
@@ -42,17 +42,6 @@ ap_ts_pen_1v8: &i2c4 { 
	compatible = "auo,b116xa01";

};



&pp3300_hub {

	/* pp3300_l7c is used to power the USB hub */

	/delete-property/regulator-always-on;

	/delete-property/regulator-boot-on;

};



&pp3300_l7c {

	regulator-always-on;

	regulator-boot-on;

};



&sdhc_2 {

	status = "okay";

};
@@ -61,6 +50,14 @@ ap_ts_pen_1v8: &i2c4 { 
	interrupts = <58 IRQ_TYPE_EDGE_FALLING>;

};



&usb_hub_2_0 {

	 vdd-supply = <&pp3300_l7c>;

};



&usb_hub_3_0 {

	 vdd-supply = <&pp3300_l7c>;

};



/* PINCTRL - modifications to sc7180-trogdor.dtsi */



&trackpad_int_1v8_odl {

arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi

+18 −1
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&en_pp3300_hub>;



		regulator-always-on;

		regulator-boot-on;



		vin-supply = <&pp3300_a>;
@@ -906,6 +905,24 @@ ap_spi_fp: &spi10 { 


&usb_1_dwc3 {

	dr_mode = "host";

	#address-cells = <1>;

	#size-cells = <0>;



	/* 2.0 hub on port 1 */

	usb_hub_2_0: hub@1 {

		compatible = "usbbda,5411";

		reg = <1>;

		vdd-supply = <&pp3300_hub>;

		companion-hub = <&usb_hub_3_0>;

	};



	/* 3.0 hub on port 2 */

	usb_hub_3_0: hub@2 {

		compatible = "usbbda,411";

		reg = <2>;

		vdd-supply = <&pp3300_hub>;

		companion-hub = <&usb_hub_2_0>;

	};

};



&usb_1_hsphy {