From patchwork Fri Nov 20 18:38:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 329244 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBC2FC64E7D for ; Fri, 20 Nov 2020 18:39:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7288B2242B for ; Fri, 20 Nov 2020 18:39:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Tu3dkzCC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730666AbgKTSim (ORCPT ); Fri, 20 Nov 2020 13:38:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731308AbgKTSi2 (ORCPT ); Fri, 20 Nov 2020 13:38:28 -0500 Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B134C0613CF for ; Fri, 20 Nov 2020 10:38:27 -0800 (PST) Received: by mail-pf1-x444.google.com with SMTP id w14so8695938pfd.7 for ; Fri, 20 Nov 2020 10:38:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WvxKdxs6M4JT+TjyiGRTBOjLUZOj8C65zt6mx45CTYU=; b=Tu3dkzCC53/KWbIL5K4tQTuhIa6w7VUb7TSqXbPv/lQ/5VZjWZPmP4ne35gz6nvYDm SVHg+L5wAD2jHTUA1wxYJn0xK9J0Gf3R1pzdomx5HCu+yiW0L8URaN6aCzZVv2pgP3XH 9+iaak5QbWWTkGwiGy6wXhbUFUUd7ehd4eq0U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WvxKdxs6M4JT+TjyiGRTBOjLUZOj8C65zt6mx45CTYU=; b=UNJw5zVR2S6sCgfg+4KQHSuHHCXeMS5X0T1eMHsw4GVIY2LX14ZrgAtXh24G86mrXm C/PS8V1j0+CX11Hj14+3+qHgozw8+PkSSw7bD3RPbAxUgAws0KTbMYdKekl2006YwHrJ kRgCvM0cu6j0bUFY6pc3mBwZ9NByTwlV46JJRYwfD6GhUImbdqPMUCW0djSVLQAetA22 HbvKtY6AHYfQUlO+/HMwAXLInDw2dw+4szn575Fky4NSoQ05DRfU2IowyFwCTt7P7gU6 8YaeNauW6AL4XFTLcvkEF6kljkQ2ZqlLNgxGD3VmJhvYlxp9fSgzMUEdl6vTzNnzBL/m inLw== X-Gm-Message-State: AOAM530hC78Ib6AcpFO6e07ehb8DPLUe+ZyVZO0qRaC3TTtmOMAhZArJ Rvuo5viJEHklJJgbIGmaB6+avA== X-Google-Smtp-Source: ABdhPJzzy12OIQ7XoGGH2+bU7dhA3J6Umwu1uVvc5icgZsY4dju4gjMNVxLJ3UqeyG+SzPis49AmFA== X-Received: by 2002:aa7:9dda:0:b029:18e:c925:ff0a with SMTP id g26-20020aa79dda0000b029018ec925ff0amr15736481pfq.43.1605897507071; Fri, 20 Nov 2020 10:38:27 -0800 (PST) Received: from smtp.gmail.com ([100.99.132.239]) by smtp.gmail.com with ESMTPSA id h7sm4343376pgi.90.2020.11.20.10.38.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Nov 2020 10:38:26 -0800 (PST) From: Stephen Boyd To: Andy Gross , Bjorn Andersson Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Douglas Anderson , Matthias Kaehlcke Subject: [PATCH v4] arm64: dts: qcom: sc7180: Add prox sensor to LTE sku Lazor boards Date: Fri, 20 Nov 2020 10:38:25 -0800 Message-Id: <20201120183825.547310-1-swboyd@chromium.org> X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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 Cc: Matthias Kaehlcke Reviewed-by: Douglas Anderson Signed-off-by: Stephen Boyd --- Changes from v3 (https://lore.kernel.org/r/20201120182426.541884-1-swboyd@chromium.org): * Remove disabled ap_sar_sensor_i2c node in trogdor-r1.dts file 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-r1.dts | 5 ----- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 - 5 files changed, 22 insertions(+), 7 deletions(-) base-commit: ead9f7d7ea9e20843e29e688b53859cea20044ee 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-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts index 0a281c24841c..59d67fb0efe8 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts @@ -34,11 +34,6 @@ panel_in_edp: endpoint { }; }; -&ap_sar_sensor_i2c { - /* Not hooked up */ - status = "disabled"; -}; - ap_ts_pen_1v8: &i2c4 { status = "okay"; clock-frequency = <400000>; 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 {