Message ID | 20220316172814.v1.3.Iad21bd53f3ac14956b8dbbf3825fc7ab29abdf97@changeid (mailing list archive) |
---|---|
State | Accepted |
Commit | 533ca1c3c1996ea49a1b31a83ba978f2f96fea9b |
Headers | show |
Series | [v1,1/4] arm64: dts: qcom: sc7280: Rename crd to crd-r3 | expand |
Hi, On Wed, Mar 16, 2022 at 5:28 PM Matthias Kaehlcke <mka@chromium.org> wrote: > > Not all herobrine boards have a world facing camera or a fingerprint > sensor, disable the regulators that feed these devices by default and > only enable them for the boards that use them. > > Similarly the audio configuration can vary between boards, not all > boards have the regulator pp3300_codec, disable it by default. > > Signed-off-by: Matthias Kaehlcke <mka@chromium.org> > --- > > .../qcom/sc7280-herobrine-herobrine-r1.dts | 30 +++++++++++++++++++ > .../arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 6 ++++ > 2 files changed, 36 insertions(+) Reviewed-by: Douglas Anderson <dianders@chromium.org>
Quoting Matthias Kaehlcke (2022-03-16 17:28:19) > Not all herobrine boards have a world facing camera or a fingerprint > sensor, disable the regulators that feed these devices by default and > only enable them for the boards that use them. > > Similarly the audio configuration can vary between boards, not all > boards have the regulator pp3300_codec, disable it by default. > > Signed-off-by: Matthias Kaehlcke <mka@chromium.org> > --- This seems complicated. Maybe we should introduce some sort of mixin dts file for fingerprint and world facing camera and audio type so that boards can pick and choose what they want. Either way, that can come later when we get there. Reviewed-by: Stephen Boyd <swboyd@chromium.org>
On 3/17/2022 5:58 AM, Matthias Kaehlcke wrote: > Not all herobrine boards have a world facing camera or a fingerprint > sensor, disable the regulators that feed these devices by default and > only enable them for the boards that use them. > > Similarly the audio configuration can vary between boards, not all > boards have the regulator pp3300_codec, disable it by default. > > Signed-off-by: Matthias Kaehlcke <mka@chromium.org> > --- Reviewed-by: Rajendra Nayak <quic_rjendra@quicinc.com>
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts index f95273052da0..29c4ca095294 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts @@ -14,6 +14,36 @@ / { compatible = "google,herobrine", "qcom,sc7280"; }; +/* + * ADDITIONS TO FIXED REGULATORS DEFINED IN PARENT DEVICE TREE FILES + * + * Sort order matches the order in the parent files (parents before children). + */ + +&pp3300_codec { + status = "okay"; +}; + +&pp3300_fp_mcu { + status = "okay"; +}; + +&pp2850_vcm_wf_cam { + status = "okay"; +}; + +&pp2850_wf_cam { + status = "okay"; +}; + +&pp1800_wf_cam { + status = "okay"; +}; + +&pp1200_wf_cam { + status = "okay"; +}; + /* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */ &ap_spi_fp { diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi index dc17f2079695..40cca69b1414 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi @@ -92,6 +92,7 @@ pp3300_codec: pp3300-codec-regulator { pinctrl-0 = <&en_pp3300_codec>; vin-supply = <&pp3300_z1>; + status = "disabled"; }; pp3300_left_in_mlb: pp3300-left-in-mlb-regulator { @@ -132,6 +133,7 @@ pp3300_fp_mcu: pp3300-fp-regulator { pinctrl-0 = <&en_fp_rails>; vin-supply = <&pp3300_z1>; + status = "disabled"; }; pp3300_hub: pp3300-hub-regulator { @@ -194,6 +196,7 @@ pp2850_vcm_wf_cam: pp2850-vcm-wf-cam-regulator { pinctrl-0 = <&wf_cam_en>; vin-supply = <&pp3300_z1>; + status = "disabled"; }; pp2850_wf_cam: pp2850-wf-cam-regulator { @@ -214,6 +217,7 @@ pp2850_wf_cam: pp2850-wf-cam-regulator { */ vin-supply = <&pp3300_z1>; + status = "disabled"; }; pp1800_fp: pp1800-fp-regulator { @@ -258,6 +262,7 @@ pp1800_wf_cam: pp1800-wf-cam-regulator { */ vin-supply = <&vreg_l19b_s0>; + status = "disabled"; }; pp1200_wf_cam: pp1200-wf-cam-regulator { @@ -278,6 +283,7 @@ pp1200_wf_cam: pp1200-wf-cam-regulator { */ vin-supply = <&pp3300_z1>; + status = "disabled"; }; /* BOARD-SPECIFIC TOP LEVEL NODES */
Not all herobrine boards have a world facing camera or a fingerprint sensor, disable the regulators that feed these devices by default and only enable them for the boards that use them. Similarly the audio configuration can vary between boards, not all boards have the regulator pp3300_codec, disable it by default. Signed-off-by: Matthias Kaehlcke <mka@chromium.org> --- .../qcom/sc7280-herobrine-herobrine-r1.dts | 30 +++++++++++++++++++ .../arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 6 ++++ 2 files changed, 36 insertions(+)