From patchwork Fri Mar 25 23:43:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 12792155 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C98EC433EF for ; Fri, 25 Mar 2022 23:43:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229446AbiCYXpY (ORCPT ); Fri, 25 Mar 2022 19:45:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229755AbiCYXpX (ORCPT ); Fri, 25 Mar 2022 19:45:23 -0400 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A282D0 for ; Fri, 25 Mar 2022 16:43:47 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id n7-20020a17090aab8700b001c6aa871860so9951053pjq.2 for ; Fri, 25 Mar 2022 16:43:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gk13iQejWKPW6c6v9tAWF5sh/iK/Ier5YfnNfQ8r5uE=; b=DOVxLHU3lgNxYO54K1GNToW/aF7F5LOVtIGQ8ikD1g7KY8uF+lVoP1/u7A/TP7327J 1ERpFYvMsXJNWK8Gd9GtKZ5mICHhWz2LRL6j8tRInLAMovZBWEfNX8aMXJnpMoMA5f9d ImdwyID+qpNH6B9ORdSUpQpqTpJZ4x8fVWqj0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gk13iQejWKPW6c6v9tAWF5sh/iK/Ier5YfnNfQ8r5uE=; b=RmnrI+HP7Njysrk5EmpGCGYrcTY6uEWpZKzHt3S4R4cjKtg7EA1vPl0e1nEFlqvNi+ bUMrTfKzfUIZzdtpNIC87FhNlPFJUExdSDKV7GlnT0vfcVlsXfjkgA9HfjJTg7un618P yBcDM5iQEvrHNNhvNsG7RrdZUMos27XSQtOgMb8m2cEmYvl8XmPUOas69VVgOqZDx41y zObnDenZ03N8R0YPVL8DwvB4pC+pHIgDrbXNpXTNvYiXzxWE+eIY6KrBXWOaV+tZQXwy ZOS5G80otyODUvk8Du3EOPW3N8HVh8wa9RiBXxh2dZgfZN7yAo4V1VXqHxROLQ5ik9UB Zhzg== X-Gm-Message-State: AOAM532C7KPYBI8sxeryjR9xTfWzkrxPlXn3NnsHqyd1D0YVD3wqwcgd 9IBTvTgEQ49IctfTPkzTFjad6Q== X-Google-Smtp-Source: ABdhPJz6q8SL5vfomH6P8C+VGsorw2J6novE5FAsblU6Ps6gXZCaE9TV/4OK73zHRJhVRkEwMrwpig== X-Received: by 2002:a17:902:b697:b0:151:4c2e:48be with SMTP id c23-20020a170902b69700b001514c2e48bemr13937942pls.70.1648251826743; Fri, 25 Mar 2022 16:43:46 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:5662:afcf:5e0a:c3a5]) by smtp.gmail.com with ESMTPSA id b17-20020a056a000a9100b004e1b7cdb8fdsm8684525pfl.70.2022.03.25.16.43.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 16:43:46 -0700 (PDT) From: Stephen Boyd To: Andy Gross , Bjorn Andersson Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Joseph Barrera , Douglas Anderson Subject: [PATCH 1/2] arm64: dts: qcom: sc7180-trogdor: Simplify trackpad enabling Date: Fri, 25 Mar 2022 16:43:42 -0700 Message-Id: <20220325234344.199841-2-swboyd@chromium.org> X-Mailer: git-send-email 2.35.1.1021.g381101b075-goog In-Reply-To: <20220325234344.199841-1-swboyd@chromium.org> References: <20220325234344.199841-1-swboyd@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Trogdor boards with a detachable keyboard don't have a trackpad over i2c. Instead the trackpad is on the detachable keyboard base. Let's move the enabling of the trackpad i2c bus out of the base sc7180-trogdor.dtsi file so that each trogdor board that is detachable, of which there are many, doesn't have to disable the trackpad bus. Cc: Joseph Barrera Cc: Douglas Anderson Signed-off-by: Stephen Boyd --- arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 4 ---- arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 4 ---- arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 4 ++++ arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 - 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi index c81805ef2250..8da61a52f150 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi @@ -111,10 +111,6 @@ ap_ts: touchscreen@5d { }; }; -&i2c7 { - status = "disabled"; -}; - &i2c9 { status = "disabled"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi index bff2b556cc75..532c7dcc3f73 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi @@ -88,10 +88,6 @@ map1 { }; }; -&ap_tp_i2c { - status = "disabled"; -}; - ap_ts_pen_1v8: &i2c4 { status = "okay"; clock-frequency = <400000>; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index 69666f92176a..75df5d1633b2 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -19,6 +19,10 @@ &ap_sar_sensor { semtech,avg-pos-strength = <64>; }; +&ap_tp_i2c { + status = "okay"; +}; + /* * Lazor is stuffed with a 47k NTC as charger thermistor which currently is * not supported by the PM6150 ADC driver. Disable the charger thermal zone diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index 732e1181af48..3bf40b6abcba 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -728,7 +728,6 @@ ap_sar_sensor: proximity@28 { }; ap_tp_i2c: &i2c7 { - status = "okay"; clock-frequency = <400000>; trackpad: trackpad@15 { From patchwork Fri Mar 25 23:43:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 12792156 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47D1BC433F5 for ; Fri, 25 Mar 2022 23:43:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229499AbiCYXpZ (ORCPT ); Fri, 25 Mar 2022 19:45:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229839AbiCYXpZ (ORCPT ); Fri, 25 Mar 2022 19:45:25 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 686CC117 for ; Fri, 25 Mar 2022 16:43:48 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id o13so7629993pgc.12 for ; Fri, 25 Mar 2022 16:43:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FSWUNqTS/J7688At5bZOQtpG3+9Hz7weNAL/xXN4vlw=; b=Q3uuErJzFFUe83QDREvO9Nsf+uoPteWy3fC98dw6WwmBfoPKY1Qaaf+0YlxzKFGJZ+ YExYnPANIW5BqYAlDfiEg3X+OaI9RyiP9vMkZXTj0TcsxRDwAajLwpa1lgBUmlsHMDTX mK1puREcHQxT9xgoA+cL5zPBpx/GCCBtcmYmk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FSWUNqTS/J7688At5bZOQtpG3+9Hz7weNAL/xXN4vlw=; b=aECayVVsnfTRQewdV0dIQbj903yKhMtLMLK8RRHe60bqa1erXCxOW5JjogpGDaacp8 EUjA2SPvK5nZ8OFHMNywc1XDiJGy7IQwLoeh56s47WFMM9PAz8khowcRSCibAhWehFvM zfATJijQhK9Ki0MgcHwcxCyIXXgxJbqCTrXnrLbsdeDsCeQaaZxAdYBIZwn36QZ7IA3a Qcn27sMO2nYilMRm9FPKEV++pQWuyRog0vMR7X69GSoe/Ht0FlF7PSrR0oOy7PmdDr3+ 9Z4YPH2P0SGn8mT5hf9Mzh05x2XZY9LcaWzo9cNMkaoU3v3Sbhx5WAxNJjlGndOR4RgB Bf5w== X-Gm-Message-State: AOAM532GmqScAP8pgU5OXJWVb3TQ1gsiS9CnjG9E31TMP25+X2hBa3cH pAjLpHm0W/akPp+ccM4CFrtYeA== X-Google-Smtp-Source: ABdhPJyjq+wtj3gMGv265JeGRq8z2mL+7OD4zA6obYgYBju68n4sA6WnryDMKOeSJEE4AYIFUFhgVg== X-Received: by 2002:a05:6a00:14d5:b0:4fb:2adf:dcdd with SMTP id w21-20020a056a0014d500b004fb2adfdcddmr1086184pfu.72.1648251827775; Fri, 25 Mar 2022 16:43:47 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:5662:afcf:5e0a:c3a5]) by smtp.gmail.com with ESMTPSA id b17-20020a056a000a9100b004e1b7cdb8fdsm8684525pfl.70.2022.03.25.16.43.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 16:43:47 -0700 (PDT) From: Stephen Boyd To: Andy Gross , Bjorn Andersson Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Joseph Barrera , Douglas Anderson Subject: [PATCH 2/2] arm64: dts: qcom: sc7180-trogdor: Simplify spi0/spi6 labeling Date: Fri, 25 Mar 2022 16:43:43 -0700 Message-Id: <20220325234344.199841-3-swboyd@chromium.org> X-Mailer: git-send-email 2.35.1.1021.g381101b075-goog In-Reply-To: <20220325234344.199841-1-swboyd@chromium.org> References: <20220325234344.199841-1-swboyd@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org We had to do this spi0/spi6 flip-flop on trogdor-r0 because the spi buses got swizzled between r0 and r1. The swizzle stopped after r1, but we kept this around to support either hardware possibility and to keep trogdor-r0 working. trogdor-r0 isn't supported upstream, so this swizzle is not doing anything besides making a pattern that others try to copy for the EC and H1 nodes. Let's remove it and simplify the dts files. Cc: Joseph Barrera Cc: Douglas Anderson Signed-off-by: Stephen Boyd --- arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 5 ----- arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 3 --- arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 3 --- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 5 +++-- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi index 8da61a52f150..186be3f419d7 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi @@ -5,11 +5,6 @@ * Copyright 2020 Google LLC. */ -#include "sc7180.dtsi" - -ap_ec_spi: &spi6 {}; -ap_h1_spi: &spi0 {}; - #include "sc7180-trogdor.dtsi" #include "sc7180-trogdor-ti-sn65dsi86.dtsi" diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi index 532c7dcc3f73..9b3e3d13c165 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi @@ -5,9 +5,6 @@ * Copyright 2021 Google LLC. */ -ap_ec_spi: &spi6 {}; -ap_h1_spi: &spi0 {}; - #include "sc7180-trogdor.dtsi" / { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index 75df5d1633b2..fe2369c29aad 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -5,9 +5,6 @@ * Copyright 2020 Google LLC. */ -ap_ec_spi: &spi6 {}; -ap_h1_spi: &spi0 {}; - #include "sc7180-trogdor.dtsi" &ap_sar_sensor { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index 3bf40b6abcba..3123665f6c3c 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -11,6 +11,7 @@ #include #include +#include "sc7180.dtsi" /* PMICs depend on spmi_bus label and so must come after SoC */ #include "pm6150.dtsi" #include "pm6150l.dtsi" @@ -626,7 +627,7 @@ src_vreg_bob: bob { }; }; -&ap_ec_spi { +ap_ec_spi: &spi6 { status = "okay"; cros_ec: ec@0 { compatible = "google,cros-ec-spi"; @@ -675,7 +676,7 @@ usb_c1: connector@1 { }; }; -&ap_h1_spi { +ap_h1_spi: &spi0 { status = "okay"; cr50: tpm@0 { compatible = "google,cr50";