| Message ID | 20201106140125.v3.2.I0ed4abdd2b2916fbedf76be254bc3457fb8b9655@changeid (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3,1/2] arm64: dts: qcom: sc7180: Add sc7180-lazor-r2/r3 | expand |
Hi, On Fri, Nov 6, 2020 at 2:01 PM Matthias Kaehlcke <mka@chromium.org> wrote: > > The trogdor design has two options for supplying the 'pp3300_hub' power > rail, it can be supplied by 'pp3300_l7c' or 'pp3300_a'. The 'pp3300_a' > path includes a load switch that can be controlled through GPIO84. > Initially trogdor boards used 'pp3300_l7c' to power the USB hub, newer > revisions (will) use 'pp3300_a' as supply for 'pp3300_hub'. > > Add a DT node for the 'pp3300_a' path and a pinctrl entry for the GPIO. > Make this path the default and keep trogdor rev1, lazor rev0 and rev1 > on 'pp3300_l7c'. These earlier revisions also allocated the GPIO to the > purpose of controlling the power switch, so there is no need to limit > the pinctrl config to newer revisions. Remove the platform-wide > 'always/boot-on' properties from 'pp3300_l7c' and add them to the > boards that use this supply. Also delete the 'always/boot-on' > properties of 'pp3300_hub' for these boards. > > Signed-off-by: Matthias Kaehlcke <mka@chromium.org> > --- > > Changes in v3: > - removed 'always-on' and 'boot-on' from 'pp3300_l7c' > - always pair 'always-on' and 'boot-on' properties > - removed comment for 'pp3300_hub' 'always-on' and 'boot-on' properties > > Changes in v2: > - added 'always-on' and 'boot-on' properties for new 'pp3300_hub' > - removed platform-wide 'always-on' property for 'pp3300_l7c' > - added 'always-on' property to 'pp3300_l7c' for boards that still > use 'pp3300_l7c' > - delete 'always-on' property of 'pp3300_hub' for boards that still > use 'pp3300_l7c' > - got rid of 'pp3300_hub_7c' label, just use 'pp3300_l7c' > - fixed position of 'en_pp3300_hub' node to respect ordering > - updated commit message > > .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 15 ++++++++ > .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 15 ++++++++ > .../arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 15 ++++++++ > arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 34 +++++++++++++++++-- > 4 files changed, 76 insertions(+), 3 deletions(-) Reviewed-by: Douglas Anderson <dianders@chromium.org>
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts index ae4c23a4fe65..b1b35f8104ca 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts @@ -14,6 +14,17 @@ / { 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 @@ -22,3 +33,7 @@ &sn65dsi86_out { */ lane-polarities = <1 0>; }; + +&usb_hub { + vdd-supply = <&pp3300_l7c>; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts index 9354d4c5ef7d..48745779720d 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts @@ -13,3 +13,18 @@ / { model = "Google Lazor (rev1 - 2)"; 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; +}; + +&pp3300_l7c { + regulator-always-on; + regulator-boot-on; +}; + +&usb_hub { + vdd-supply = <&pp3300_l7c>; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts index 0a281c24841c..e33e38dfd35b 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts @@ -58,10 +58,25 @@ ap_ts: touchscreen@10 { }; }; +&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"; }; +&usb_hub { + vdd-supply = <&pp3300_l7c>; +}; + /* PINCTRL - board-specific pinctrl */ &tlmm { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index bf875589d364..72b04a148c78 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -174,6 +174,24 @@ pp3300_fp_tp: pp3300-fp-tp-regulator { vin-supply = <&pp3300_a>; }; + pp3300_hub: pp3300-hub { + compatible = "regulator-fixed"; + regulator-name = "pp3300_hub"; + + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + gpio = <&tlmm 84 GPIO_ACTIVE_HIGH>; + enable-active-high; + pinctrl-names = "default"; + pinctrl-0 = <&en_pp3300_hub>; + + regulator-always-on; + regulator-boot-on; + + vin-supply = <&pp3300_a>; + }; + /* BOARD-SPECIFIC TOP LEVEL NODES */ backlight: backlight { @@ -469,13 +487,10 @@ ppvar_l6c: ldo6 { regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; }; - pp3300_hub: pp3300_l7c: ldo7 { regulator-min-microvolt = <3304000>; regulator-max-microvolt = <3304000>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; - regulator-always-on; - regulator-boot-on; }; pp1800_brij_vccio: @@ -1164,6 +1179,19 @@ pinconf { }; }; + en_pp3300_hub: en-pp3300-hub { + pinmux { + pins = "gpio84"; + function = "gpio"; + }; + + pinconf { + pins = "gpio84"; + drive-strength = <2>; + bias-disable; + }; + }; + fpmcu_boot0: fpmcu-boot0 { pinmux { pins = "gpio10";
The trogdor design has two options for supplying the 'pp3300_hub' power rail, it can be supplied by 'pp3300_l7c' or 'pp3300_a'. The 'pp3300_a' path includes a load switch that can be controlled through GPIO84. Initially trogdor boards used 'pp3300_l7c' to power the USB hub, newer revisions (will) use 'pp3300_a' as supply for 'pp3300_hub'. Add a DT node for the 'pp3300_a' path and a pinctrl entry for the GPIO. Make this path the default and keep trogdor rev1, lazor rev0 and rev1 on 'pp3300_l7c'. These earlier revisions also allocated the GPIO to the purpose of controlling the power switch, so there is no need to limit the pinctrl config to newer revisions. Remove the platform-wide 'always/boot-on' properties from 'pp3300_l7c' and add them to the boards that use this supply. Also delete the 'always/boot-on' properties of 'pp3300_hub' for these boards. Signed-off-by: Matthias Kaehlcke <mka@chromium.org> --- Changes in v3: - removed 'always-on' and 'boot-on' from 'pp3300_l7c' - always pair 'always-on' and 'boot-on' properties - removed comment for 'pp3300_hub' 'always-on' and 'boot-on' properties Changes in v2: - added 'always-on' and 'boot-on' properties for new 'pp3300_hub' - removed platform-wide 'always-on' property for 'pp3300_l7c' - added 'always-on' property to 'pp3300_l7c' for boards that still use 'pp3300_l7c' - delete 'always-on' property of 'pp3300_hub' for boards that still use 'pp3300_l7c' - got rid of 'pp3300_hub_7c' label, just use 'pp3300_l7c' - fixed position of 'en_pp3300_hub' node to respect ordering - updated commit message .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 15 ++++++++ .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 15 ++++++++ .../arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 15 ++++++++ arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 34 +++++++++++++++++-- 4 files changed, 76 insertions(+), 3 deletions(-)