| Message ID | 20201120182426.541884-1-swboyd@chromium.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v3] arm64: dts: qcom: sc7180: Add prox sensor to LTE sku Lazor boards | expand |
Hi, On Fri, Nov 20, 2020 at 10:24 AM Stephen Boyd <swboyd@chromium.org> wrote: > > There's a proximity sensor on Lazor devices, but only for LTE SKUs. > Enable it only on the Lazor LTE SKUs and also configure it properly so > it works. > > Cc: Douglas Anderson <dianders@chromium.org> > Cc: Matthias Kaehlcke <mka@chromium.org> > Signed-off-by: Stephen Boyd <swboyd@chromium.org> > --- > > Changes from v2 (https://lore.kernel.org/r/20201120074508.3236616-1-swboyd@chromium.org): > * Also disabled ap_sar_sensor_i2c node in trogdor.dtsi file > > Changes from v1 (https://lore.kernel.org/r/20201118045454.2503325-1-swboyd@chromium.org): > * Fixed startup-sensor property to be 0 instead of 1 > * Fixed proxraw-strength to be 8 instead of 2 > > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts | 8 ++++++++ > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 8 ++++++++ > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 7 ++++++- > arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 - > 4 files changed, 22 insertions(+), 2 deletions(-) I haven't personally reviewed the actual numbers for the SAR sensor config, but things look sane. One last nit you could fix upstream is the removal of the "disabled" in "sc7180-trogdor-r1.dts" now that it's disabled by default... In any case... Reviewed-by: Douglas Anderson <dianders@chromium.org>
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts index 5a67e5baafec..e16ba7b01f25 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts @@ -13,6 +13,14 @@ / { compatible = "google,lazor-rev1-sku0", "google,lazor-rev2-sku0", "qcom,sc7180"; }; +&ap_sar_sensor { + status = "okay"; +}; + +&ap_sar_sensor_i2c { + status = "okay"; +}; + &keyboard_backlight { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts index 43836fc4d403..0881f8dd02c9 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts @@ -13,6 +13,14 @@ / { compatible = "google,lazor-sku0", "qcom,sc7180"; }; +&ap_sar_sensor { + status = "okay"; +}; + +&ap_sar_sensor_i2c { + status = "okay"; +}; + &keyboard_backlight { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index 180ef9e04306..89e5cd29ec09 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -30,7 +30,12 @@ panel_in_edp: endpoint { }; &ap_sar_sensor { - status = "okay"; + semtech,cs0-ground; + semtech,combined-sensors = <3>; + semtech,resolution = "fine"; + semtech,startup-sensor = <0>; + semtech,proxraw-strength = <8>; + semtech,avg-pos-strength = <64>; }; ap_ts_pen_1v8: &i2c4 { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index 781e61ad75a6..d48a75afdafb 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -654,7 +654,6 @@ sn65dsi86_out: endpoint { }; ap_sar_sensor_i2c: &i2c5 { - status = "okay"; clock-frequency = <400000>; ap_sar_sensor: proximity@28 {
There's a proximity sensor on Lazor devices, but only for LTE SKUs. Enable it only on the Lazor LTE SKUs and also configure it properly so it works. Cc: Douglas Anderson <dianders@chromium.org> Cc: Matthias Kaehlcke <mka@chromium.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org> --- Changes from v2 (https://lore.kernel.org/r/20201120074508.3236616-1-swboyd@chromium.org): * Also disabled ap_sar_sensor_i2c node in trogdor.dtsi file Changes from v1 (https://lore.kernel.org/r/20201118045454.2503325-1-swboyd@chromium.org): * Fixed startup-sensor property to be 0 instead of 1 * Fixed proxraw-strength to be 8 instead of 2 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts | 8 ++++++++ arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 8 ++++++++ arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 7 ++++++- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 - 4 files changed, 22 insertions(+), 2 deletions(-) base-commit: ead9f7d7ea9e20843e29e688b53859cea20044ee