From patchwork Tue Apr 11 13:49:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 672367 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 E6A12C77B78 for ; Tue, 11 Apr 2023 13:49:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230351AbjDKNtX (ORCPT ); Tue, 11 Apr 2023 09:49:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230401AbjDKNtW (ORCPT ); Tue, 11 Apr 2023 09:49:22 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD8C7E48 for ; Tue, 11 Apr 2023 06:49:21 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id d7so21577693lfj.3 for ; Tue, 11 Apr 2023 06:49:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681220960; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=nqqJwELWN/hOjlu4C15VTf6hm+l2eGEBIz6GNcstEPs=; b=DNV7MqW3fFKZlLv+rkJpU8edIPWDasEBRKp2Vmx8zYdpfwkastWtpOmJbr64NBG5Cr nZkjyC5FiYOibGBXPuTG0F1lDfV7e+o4l+Q3tm49CibfoVLecHUGCjKAVbGHmaWRukxw FGKylUbmK6+GMx9osc2IEHUILhDeG6fIjJ9M4nccTxtGxVpto2HmjJrg96gL6p9qEqyD UlbqnQomu36w33WDLBQCyBRID8VYKtHbFCCBO62lIgVnXGGHPx38YE1ASUh5yXrpZcEb NbvqSwtbV+0/OAlyYAMccw6R6eqfZBv0oxYDQ6xr4FE2pdg3oy2dUwEPgkBmthZ7Mz6C FJXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681220960; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nqqJwELWN/hOjlu4C15VTf6hm+l2eGEBIz6GNcstEPs=; b=CuYtqeLA09vY2X3seS7NQZLrsIcdPhEApwwOR53zTfOez0uxTQvvw6+X7GJC/olXxX 5sSfBlKSJfRDVAQsAzhKaMQqAmZd41368v3h3ueRC4Z2bieQ2fapCt8dVBRuP2HNbqlW x/Y6FgUg4B97gQAvEDA6H73Kql5gCqMt2drar3fTinCilOUZA3E+fujttSFdpnVmzo9l ClDV7mpIQaZLLeIgSC1fWmTTS2WULPngXqRWiIiI5M7cgBeA9xJ1jovpDI+tm6c+8/Co nbQy7eSpTBy6cv9wliE1vUZ4pErdwufiyqivTwaBs1oQ46NCD1vdQem6t+nPCCiDKFm9 LYcg== X-Gm-Message-State: AAQBX9eFL2j4aRgL2RGjp05wKpqTtZ2hu+p6yuJLNUUC8NjKnenv42q8 zVKzAq4tH8GovmU+fgJrrJo5lg== X-Google-Smtp-Source: AKy350aYme6S8DX2hEjnZVyFhP57OQ4bR4ooy6Cm+5hIFb8ygRmADtmHlS71Fei3P0R2RCQkeTDnfw== X-Received: by 2002:ac2:428c:0:b0:4e8:61d2:72ee with SMTP id m12-20020ac2428c000000b004e861d272eemr4388495lfh.5.1681220960045; Tue, 11 Apr 2023 06:49:20 -0700 (PDT) Received: from [192.168.1.101] (abxj23.neoplus.adsl.tpnet.pl. [83.9.3.23]) by smtp.gmail.com with ESMTPSA id y9-20020ac255a9000000b004eb2d6160a4sm2563707lfg.32.2023.04.11.06.49.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 06:49:19 -0700 (PDT) From: Konrad Dybcio Date: Tue, 11 Apr 2023 15:49:15 +0200 Subject: [PATCH 1/4] arm64: dts: qcom: sm8150-kumano: Add GPIO line names for PMIC GPIOs MIME-Version: 1.0 Message-Id: <20230315-topic-kumano_dts0-v1-1-f1852c2a2378@linaro.org> References: <20230315-topic-kumano_dts0-v1-0-f1852c2a2378@linaro.org> In-Reply-To: <20230315-topic-kumano_dts0-v1-0-f1852c2a2378@linaro.org> To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1681220957; l=1914; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=vhljNcoTVkBBoXt4/XMAQL+2xQrVuzZ9DHcx/LIdZ+o=; b=cqUwvMqNsJt/c29SYpKHkQvIviO8e6Ruj2D3FKl1UnVXOb7LgSTvsFOZ8F7A+kylm9NQDu0kpJef 5lm2SZxtB2KOPmq9JioZ76doM2/qYf0Gr72xOqSWsfclpYzTpakI X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Sony ever so graciously provides GPIO line names in their downstream kernel (though sometimes they are not 100% accurate and you can judge that by simply looking at them and with what drivers they are used). Add these to the Griffin and Bahamut device trees to better document the hardware. They are the same on both devices! Very nice! Signed-off-by: Konrad Dybcio --- .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi b/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi index 47e2430991ca..6753c65d75bc 100644 --- a/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi @@ -456,6 +456,17 @@ &i2c10 { }; &pm8150_gpios { + gpio-line-names = "VOL_DOWN_N", /* GPIO_1 */ + "", + "NC", + "NC", + "", + "NC", + "SUPWC_PWR_EN", + "", + "NC", + "NC"; /* GPIO_10 */ + vol_down_n: vol-down-n-state { pins = "gpio1"; function = "normal"; @@ -466,6 +477,19 @@ vol_down_n: vol-down-n-state { }; &pm8150b_gpios { + gpio-line-names = "SNAPSHOT_N", /* GPIO_1 */ + "FOCUS_N", + "NC", + "NC", + "RF_LCD_ID_EN", + "NC", + "TS_VDDH_EN", + "LCD_ID", + "", + "NC", /* GPIO_10 */ + "NC", + "RF_ID"; + snapshot_n: snapshot-n-state { pins = "gpio1"; function = "normal"; @@ -483,6 +507,21 @@ focus_n: focus-n-state { }; }; +&pm8150l_gpios { + gpio-line-names = "TS_VDDIO_EN", /* GPIO_1 */ + "NC", + "MAIN_CAM_PWR_VMDR_EN", + "NC", + "", + "NC", + "NC", + "FP_LDO_EN", + "NC", + "NC", /* GPIO_10 */ + "NC", + "NC"; +}; + &pon_pwrkey { status = "okay"; }; From patchwork Tue Apr 11 13:49:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 672366 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 826EEC77B78 for ; Tue, 11 Apr 2023 13:49:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230470AbjDKNt0 (ORCPT ); Tue, 11 Apr 2023 09:49:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230458AbjDKNtZ (ORCPT ); Tue, 11 Apr 2023 09:49:25 -0400 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7D1B1BDA for ; Tue, 11 Apr 2023 06:49:23 -0700 (PDT) Received: by mail-lf1-x135.google.com with SMTP id r27so10542910lfe.0 for ; Tue, 11 Apr 2023 06:49:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681220962; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=mj8ur59QbPiShKYjIzqXNIIKKVvhR7cR6mtjrYfL6LA=; b=ZuNq/wx7JgknFqATrbdzhtaGggW3L6wfnYBqKPa7wJfvhXHHvFooSfClMbyGqf3ny+ Ic27mTkDGMbgS14Qll/yiEbz9cP+ME8GDlcT7Xh0IGLXvpToIhW4+VdwWacVB8QQVifU 2v97vWs//jcg9b6MnXLA6NrSjxC3iUkvQlXnM8ZLSq3VVJ8s0qRV7l0+qNLdKah8dWRU 5xTrFa4gaWiFCINzJioTy0+KgKqyezE33uiHnXXxrYQiPN106cJEcbYgqOopQwBjlIGI lbwcpnRIjv4Bxja1ac2P7vlgAmow7Mgt8bctoZsV9H+YP1NwXsCJoeVYU3FNqrye/bJW 9a/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681220962; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mj8ur59QbPiShKYjIzqXNIIKKVvhR7cR6mtjrYfL6LA=; b=sfmqXd7oO9CEY+im9MU61Uta2igbFT4wYr8ArLzTHt+jVgMOt0r0xzF+0OTu5DGOVg wxHzJGoZt19Gvwtq1uYeYvgfpykWNuzh6BM0GalAktVcrQWyUkMxh9/ciuBboGg2Bhvz fHOjCSddhNuKvgL+Wlm3S53A3kYUXQkHG25pgzKF2jFlvFotjNgJb+ppbNMlEpADUCRz YpXHYSKlgTpdxJAnWu61DmU5QenYuglTpS+A88iHG2jAXD42oX7SJDcHrdQMD2Vm+6Zc wvpdbl/JqYQtxFceCPyHyX811UF0uIsyDCW0MxNKghNACNW84XsbHw19Z1wm8HB40muy nh1g== X-Gm-Message-State: AAQBX9ebwPUo0bzxrYXWovi2C+F13+zfitTSeDpN/cQHRiBuy3BquDnJ ZJGe5vXeCTbaoDPtmI51S5orXQ== X-Google-Smtp-Source: AKy350YAl2csQzDqATc/+xnxNNsoN6HWJGxFX77A9M5UC11sIDUiru+BH4WIaZfCBD7RSMyyyTLHhg== X-Received: by 2002:a05:6512:6c8:b0:4eb:2b62:134f with SMTP id u8-20020a05651206c800b004eb2b62134fmr3739385lff.16.1681220962309; Tue, 11 Apr 2023 06:49:22 -0700 (PDT) Received: from [192.168.1.101] (abxj23.neoplus.adsl.tpnet.pl. [83.9.3.23]) by smtp.gmail.com with ESMTPSA id y9-20020ac255a9000000b004eb2d6160a4sm2563707lfg.32.2023.04.11.06.49.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 06:49:22 -0700 (PDT) From: Konrad Dybcio Date: Tue, 11 Apr 2023 15:49:17 +0200 Subject: [PATCH 3/4] arm64: dts: qcom: sm8150-kumano: Set up camera fixed regulators MIME-Version: 1.0 Message-Id: <20230315-topic-kumano_dts0-v1-3-f1852c2a2378@linaro.org> References: <20230315-topic-kumano_dts0-v1-0-f1852c2a2378@linaro.org> In-Reply-To: <20230315-topic-kumano_dts0-v1-0-f1852c2a2378@linaro.org> To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1681220957; l=3997; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=oVP7cBYQoOfROeLA/luuEMF40U5syFytYO2xaUCTnJ0=; b=pUQoVLDlZ6TXRgSv2Eqw6JOGG2yyO0INxHGwTEusIq5EfYsc+smOStt6PlNlX2dgUrxVhWk07czy wEcRHeW7BEUTpm+g5JFcfavyNxFkEcaew6qlNvyTzpPeO4+NdC8+ X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Sony - as per usual - used a whole bunch of GPIO-gated fixed voltage regulators for camera sensors on Kumano. Describe them and the corresponding pins. Signed-off-by: Konrad Dybcio --- .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 111 +++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi b/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi index d1a3ab836019..5fa0a83a4b2c 100644 --- a/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi @@ -6,6 +6,7 @@ /dts-v1/; #include +#include #include #include "sm8150.dtsi" #include "pm8150.dtsi" @@ -81,6 +82,66 @@ key-vol-down { }; }; + cam0_vdig_vreg: cam0-vdig-regulator { + compatible = "regulator-fixed"; + regulator-name = "camera0_vdig_vreg"; + gpio = <&tlmm 22 GPIO_ACTIVE_HIGH>; + enable-active-high; + + pinctrl-0 = <&main_cam_pwr_en>; + pinctrl-names = "default"; + }; + + cam1_vdig_vreg: cam1-vdig-regulator { + compatible = "regulator-fixed"; + regulator-name = "camera1_vdig_vreg"; + gpio = <&tlmm 79 GPIO_ACTIVE_HIGH>; + enable-active-high; + + pinctrl-0 = <&sub_cam_pwr_en>; + pinctrl-names = "default"; + }; + + cam2_vdig_vreg: cam2-vdig-regulator { + compatible = "regulator-fixed"; + regulator-name = "camera2_vdig_vreg"; + gpio = <&tlmm 25 GPIO_ACTIVE_HIGH>; + enable-active-high; + + pinctrl-0 = <&chat_cam_pwr_en>; + pinctrl-names = "default"; + }; + + cam3_vdig_vreg: cam3-vdig-regulator { + compatible = "regulator-fixed"; + regulator-name = "camera3_vdig_vreg"; + gpio = <&pm8150_gpios 7 GPIO_ACTIVE_HIGH>; + enable-active-high; + + pinctrl-0 = <&supwc_pwr_en>; + pinctrl-names = "default"; + }; + + cam_vmdr_vreg: cam-vmdr-regulator { + compatible = "regulator-fixed"; + regulator-name = "camera_vmdr_vreg"; + gpio = <&pm8150l_gpios 3 GPIO_ACTIVE_HIGH>; + enable-active-high; + + pinctrl-0 = <&main_cam_pwr_vmdr_en>; + pinctrl-names = "default"; + }; + + rgbcir_vreg: rgbcir-regulator { + compatible = "regulator-fixed"; + regulator-name = "rgbcir_vreg"; + gpio = <&tlmm 29 GPIO_ACTIVE_HIGH>; + enable-active-high; + + pinctrl-0 = <&rgbc_ir_pwr_en>; + pinctrl-names = "default"; + }; + vph_pwr: vph-pwr-regulator { compatible = "regulator-fixed"; regulator-name = "vph_pwr"; @@ -474,6 +535,15 @@ vol_down_n: vol-down-n-state { bias-pull-up; input-enable; }; + + supwc_pwr_en: supwc-pwr-en-state { + pins = "gpio7"; + function = "normal"; + qcom,drive-strength = <1>; + power-source = <1>; + drive-push-pull; + output-low; + }; }; &pm8150b_gpios { @@ -520,6 +590,15 @@ &pm8150l_gpios { "NC", /* GPIO_10 */ "NC", "NC"; + + main_cam_pwr_vmdr_en: main-cam-pwr-vmdr-en-state { + pins = "gpio3"; + function = "normal"; + qcom,drive-strength = ; + power-source = <0>; + drive-push-pull; + output-low; + }; }; &pon_pwrkey { @@ -716,6 +795,38 @@ &tlmm { "WL_CMD_DATA_CHAIN1", "WL_BT_COEX_CLK", "WL_BT_COEX_DATA"; + + main_cam_pwr_en: main-cam-pwr-en-state { + pins = "gpio22"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + output-low; + }; + + chat_cam_pwr_en: chat-cam-pwr-en-state { + pins = "gpio25"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + output-low; + }; + + rgbc_ir_pwr_en: rgbc-ir-pwr-en-state { + pins = "gpio29"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + output-low; + }; + + sub_cam_pwr_en: sub-cam-pwr-en-state { + pins = "gpio79"; + function = "gpio"; + drive-strength = <2>; + bias-pull-down; + input-enable; + }; }; &uart2 {