Commit a73dd03b authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Bjorn Andersson
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.

For anyone using trogdor-based devices on Linux, it should be
noted that this requires "CONFIG_USB_ONBOARD_HUB=y".

Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220722093238.v24.1.I7a1a6448d50bdd38e6082204a9818c59cc7a9bfd@changeid
parent eddc917d

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

+8 −11
Original line number Diff line number Diff line
@@ -16,17 +16,6 @@ / { 
	compatible = "google,lazor-rev0", "qcom,sc7180";

};



&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
@@ -35,3 +24,11 @@ &sn65dsi86_out { 
	 */

	lane-polarities = <1 0>;

};



&usb_hub_2_x {

	 vdd-supply = <&pp3300_l7c>;

};



&usb_hub_3_x {

	 vdd-supply = <&pp3300_l7c>;

};

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

+5 −7
Original line number Diff line number Diff line
@@ -16,13 +16,11 @@ / { 
	compatible = "google,lazor-rev1", "google,lazor-rev2", "qcom,sc7180";

};



&pp3300_hub {

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

	/delete-property/regulator-always-on;

	/delete-property/regulator-boot-on;



&usb_hub_2_x {

	 vdd-supply = <&pp3300_l7c>;

};



&pp3300_l7c {

	regulator-always-on;

	regulator-boot-on;

&usb_hub_3_x {

	 vdd-supply = <&pp3300_l7c>;

};

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

+4 −7
Original line number Diff line number Diff line
@@ -34,13 +34,10 @@ &pm6150_adc_tm { 
	/delete-node/ charger-thermistor@0;

};



&pp3300_hub {

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

	/delete-property/regulator-always-on;

	/delete-property/regulator-boot-on;

&usb_hub_2_x {

	 vdd-supply = <&pp3300_l7c>;

};



&pp3300_l7c {

	regulator-always-on;

	regulator-boot-on;

&usb_hub_3_x {

	 vdd-supply = <&pp3300_l7c>;

};

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

+8 −11
Original line number Diff line number Diff line
@@ -44,17 +44,6 @@ &panel { 
	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";

};
@@ -63,6 +52,14 @@ &trackpad { 
	interrupts = <58 IRQ_TYPE_EDGE_FALLING>;

};



&usb_hub_2_x {

	 vdd-supply = <&pp3300_l7c>;

};



&usb_hub_3_x {

	 vdd-supply = <&pp3300_l7c>;

};



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



&trackpad_int_1v8_odl {

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

+19 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ pp3300_hub: pp3300-hub-regulator { 
		pinctrl-names = "default";

		pinctrl-0 = <&en_pp3300_hub>;



		regulator-always-on;

		/* The BIOS leaves this regulator on */

		regulator-boot-on;



		vin-supply = <&pp3300_a>;
@@ -936,6 +936,24 @@ &usb_1 { 


&usb_1_dwc3 {

	dr_mode = "host";

	#address-cells = <1>;

	#size-cells = <0>;



	/* 2.x hub on port 1 */

	usb_hub_2_x: hub@1 {

		compatible = "usbbda,5411";

		reg = <1>;

		vdd-supply = <&pp3300_hub>;

		peer-hub = <&usb_hub_3_x>;

	};



	/* 3.x hub on port 2 */

	usb_hub_3_x: hub@2 {

		compatible = "usbbda,411";

		reg = <2>;

		vdd-supply = <&pp3300_hub>;

		peer-hub = <&usb_hub_2_x>;

	};

};



&usb_1_hsphy {