From nobody Mon Feb 9 06:30:58 2026 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 3DA8EEB64DC for ; Tue, 20 Jun 2023 11:05:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232518AbjFTLFz (ORCPT ); Tue, 20 Jun 2023 07:05:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231864AbjFTLFn (ORCPT ); Tue, 20 Jun 2023 07:05:43 -0400 Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55AED10E2 for ; Tue, 20 Jun 2023 04:05:39 -0700 (PDT) Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-2b4790ff688so30529671fa.1 for ; Tue, 20 Jun 2023 04:05:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687259137; x=1689851137; 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=iPvEmuwd6DGAowfXu00FN23lI8vD4oDdNvK0TJyc+E8=; b=dcs3OAaGMnHCgtnmUbthgD886FptzIpNBnn+isu+QGHHEnqLxQosAogUEgDyW7zRMH Bovz5elSFsfnJEZ8dSbCqO3sBNI5TZmX5necIIUvCnDxTw3wau+OBCm15HosglyUil7u 7TW8pnPhGzzgGJCecSFlq41jjAz4HV1oSCWGzf9d/6GmqQqxp/5W0oNkB5qsvnVNigGK B9OR2W7S7GqztI0MJmYgu+q/Vm5g90Sl03n8hTFJO6Tsy7YuPl/r9R5xNu1j2Qq2WMnU BRxVY/8Pb3g3TXzVFFzTeS+DS/G8qhSRL6OWz77lDc6qR7Iz1LZtTlILakwd2EN0rNOs tylQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687259137; x=1689851137; 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=iPvEmuwd6DGAowfXu00FN23lI8vD4oDdNvK0TJyc+E8=; b=WrhQ6czHk0q8vlzqq77PNmQg1sol3huQ7TeDihM63b7jAl/FhXR9IfllClZjH3pdlX yNHjyuDeluJ2QBpNfSgAQaINMUB+mYWs0g4XEZbilJ6Qp9f0VEo7GqCdUX4urz/XujDn A/M7m6VfAziewTuiZeogvCvrSDxIDXAYvO9xprVsZY//DDdtVKlFFGJMwz17ojUe5Vb2 9XMa5BRV+mi06qc+68z9OvnkyDv4uCOd+zwNEi96WuL7silO7q7GyFJYKyCCM3uHB6K8 5cjMnG0pn9iKcZ2a8H/m8QY8fxqjw8PN9t3pC2YxfNof9dhLrEm+NqLQlXnBIbFCW1EW yUEA== X-Gm-Message-State: AC+VfDyZEHZXvGY3W2foTQ4ocpr8pUf3cCQ737Gk4Kd2/ejt6kERZtf3 mGe5U9+J4ojL8UzlicmOiOwkYA== X-Google-Smtp-Source: ACHHUZ6JKNfPdSk15UF/nFaEF6y7mYpRU7bk5PoZUcHQepQYWFDO/J2fk8oRiLjHOKI1+tCSrstw5w== X-Received: by 2002:a2e:8058:0:b0:2b4:5ced:b26c with SMTP id p24-20020a2e8058000000b002b45cedb26cmr6195052ljg.49.1687259137092; Tue, 20 Jun 2023 04:05:37 -0700 (PDT) Received: from [192.168.1.101] (abxj193.neoplus.adsl.tpnet.pl. [83.9.3.193]) by smtp.gmail.com with ESMTPSA id 11-20020a05651c008b00b002ac7b0fc473sm369047ljq.38.2023.06.20.04.05.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 04:05:36 -0700 (PDT) From: Konrad Dybcio Date: Tue, 20 Jun 2023 13:05:34 +0200 Subject: [PATCH v2 1/4] arm64: dts: qcom: sm8250-edo: Add gpio line names for TLMM MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230614-topic-edo_pinsgpiopmic-v2-1-6f90bba54c53@linaro.org> References: <20230614-topic-edo_pinsgpiopmic-v2-0-6f90bba54c53@linaro.org> In-Reply-To: <20230614-topic-edo_pinsgpiopmic-v2-0-6f90bba54c53@linaro.org> To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio , Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1687259134; l=10201; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=Gs8EcWkCuXLPlTR/L3C8hsNX2wpikTOpGZoHLWzmzC8=; b=zZsFu1FeRWGlWTjZPkCzaGj5Gp7ERJUg5bp5PmDETKjzstQAaHqvsBhtTDcF7vp3h66uZC2OG u04YvLrZa/JDssC0dbZsbT468zzg4/ZnjfhzpR1S7ULBOjf7Z+cHd3s X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 PDX203&206 DTSIs to better document the hardware. Diff between 203 and 206: < "CAM_PWR_A_CS", > "FRONTC_PWR_EN", < "CAM4_MCLK", < "TOF_RST_N", > "NC", > "NC", < "WLC_I2C_SDA", < "WLC_I2C_SCL", /* GPIO_120 */ > "NC", > "NC", < "WLC_INT_N", > "NC", Which makes sense, as 203 has a 3D iToF, slightly different camera power wiring and WLC (WireLess Charging). Signed-off-by: Konrad Dybcio --- .../dts/qcom/sm8250-sony-xperia-edo-pdx203.dts | 183 +++++++++++++++++= ++++ .../dts/qcom/sm8250-sony-xperia-edo-pdx206.dts | 183 +++++++++++++++++= ++++ 2 files changed, 366 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx203.dts b/a= rch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx203.dts index 356a81698731..84104d2b2010 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx203.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx203.dts @@ -14,3 +14,186 @@ / { }; =20 /delete-node/ &vreg_l7f_1p8; + +&tlmm { + gpio-line-names =3D "AP_CTI_IN", /* GPIO_0 */ + "MDM2AP_ERR_FATAL", + "AP_CTI_OUT", + "MDM2AP_STATUS", + "NFC_I2C_SDA", + "NFC_I2C_SCL", + "NFC_EN", + "NFC_CLK_REQ", + "NFC_ESE_PWR_REQ", + "DVDT_WRT_DET_AND", + "SPK_AMP_RESET_N", /* GPIO_10 */ + "SPK_AMP_INT_N", + "APPS_I2C_1_SDA", + "APPS_I2C_1_SCL", + "NC", + "TX_GTR_THRES_IN", + "HST_BT_UART_CTS", + "HST_BT_UART_RFR", + "HST_BT_UART_TX", + "HST_BT_UART_RX", + "HST_WLAN_EN", /* GPIO_20 */ + "HST_BT_EN", + "RGBC_IR_PWR_EN", + "FP_INT_N", + "NC", + "NC", + "NC", + "NC", + "NFC_ESE_SPI_MISO", + "NFC_ESE_SPI_MOSI", + "NFC_ESE_SPI_SCLK", /* GPIO_30 */ + "NFC_ESE_SPI_CS_N", + "WCD_RST_N", + "NC", + "SDM_DEBUG_UART_TX", + "SDM_DEBUG_UART_RX", + "TS_I2C_SDA", + "TS_I2C_SCL", + "TS_INT_N", + "FP_SPI_MISO", /* GPIO_40 */ + "FP_SPI_MOSI", + "FP_SPI_SCLK", + "FP_SPI_CS_N", + "APPS_I2C_0_SDA", + "APPS_I2C_0_SCL", + "DISP_ERR_FG", + "UIM2_DETECT_EN", + "NC", + "NC", + "NC", /* GPIO_50 */ + "NC", + "MDM_UART_CTS", + "MDM_UART_RFR", + "MDM_UART_TX", + "MDM_UART_RX", + "AP2MDM_STATUS", + "AP2MDM_ERR_FATAL", + "MDM_IPC_HS_UART_TX", + "MDM_IPC_HS_UART_RX", + "NC", /* GPIO_60 */ + "NC", + "NC", + "NC", + "NC", + "USB_CC_DIR", + "DISP_VSYNC", + "NC", + "NC", + "CAM_PWR_B_CS", + "NC", /* GPIO_70 */ + "CAM_PWR_A_CS", + "SBU_SW_SEL", + "SBU_SW_OE", + "FP_RESET_N", + "FP_RESET_N", + "DISP_RESET_N", + "DEBUG_GPIO0", + "TRAY_DET", + "CAM2_RST_N", + "PCIE0_RST_N", + "PCIE0_CLK_REQ_N", /* GPIO_80 */ + "PCIE0_WAKE_N", + "DVDT_ENABLE", + "DVDT_WRT_DET_OR", + "NC", + "PCIE2_RST_N", + "PCIE2_CLK_REQ_N", + "PCIE2_WAKE_N", + "MDM_VFR_IRQ0", + "MDM_VFR_IRQ1", + "SW_SERVICE", /* GPIO_90 */ + "CAM_SOF", + "CAM1_RST_N", + "CAM0_RST_N", + "CAM0_MCLK", + "CAM1_MCLK", + "CAM2_MCLK", + "CAM3_MCLK", + "CAM4_MCLK", + "TOF_RST_N", + "NC", /* GPIO_100 */ + "CCI0_I2C_SDA", + "CCI0_I2C_SCL", + "CCI1_I2C_SDA", + "CCI1_I2C_SCL_", + "CCI2_I2C_SDA", + "CCI2_I2C_SCL", + "CCI3_I2C_SDA", + "CCI3_I2C_SCL", + "CAM3_RST_N", + "NFC_DWL_REQ", /* GPIO_110 */ + "NFC_IRQ", + "XVS", + "NC", + "RF_ID_EXTENSION", + "SPK_AMP_I2C_SDA", + "SPK_AMP_I2C_SCL", + "NC", + "NC", + "WLC_I2C_SDA", + "WLC_I2C_SCL", /* GPIO_120 */ + "ACC_COVER_OPEN", + "ALS_PROX_INT_N", + "ACCEL_INT", + "WLAN_SW_CTRL", + "CAMSENSOR_I2C_SDA", + "CAMSENSOR_I2C_SCL", + "UDON_SWITCH_SEL", + "WDOG_DISABLE", + "BAROMETER_INT", + "NC", /* GPIO_130 */ + "NC", + "FORCED_USB_BOOT", + "NC", + "NC", + "WLC_INT_N", + "NC", + "NC", + "RGBC_IR_INT", + "NC", + "NC", /* GPIO_140 */ + "NC", + "BT_SLIMBUS_CLK", + "BT_SLIMBUS_DATA", + "HW_ID_0", + "HW_ID_1", + "WCD_SWR_TX_CLK", + "WCD_SWR_TX_DATA0", + "WCD_SWR_TX_DATA1", + "WCD_SWR_RX_CLK", + "WCD_SWR_RX_DATA0", /* GPIO_150 */ + "WCD_SWR_RX_DATA1", + "SDM_DMIC_CLK1", + "SDM_DMIC_DATA1", + "SDM_DMIC_CLK2", + "SDM_DMIC_DATA2", + "SPK_AMP_I2S_CLK", + "SPK_AMP_I2S_WS", + "SPK_AMP_I2S_ASP_DIN", + "SPK_AMP_I2S_ASP_DOUT", + "COMPASS_I2C_SDA", /* GPIO_160 */ + "COMPASS_I2C_SCL", + "NC", + "NC", + "SSC_SPI_1_MISO", + "SSC_SPI_1_MOSI", + "SSC_SPI_1_CLK", + "SSC_SPI_1_CS_N", + "NC", + "NC", + "SSC_SENSOR_I2C_SDA", /* GPIO_170 */ + "SSC_SENSOR_I2C_SCL", + "NC", + "NC", + "NC", + "NC", + "HST_BLE_SNS_UART6_TX", + "HST_BLE_SNS_UART6_RX", + "HST_WLAN_UART_TX", + "HST_WLAN_UART_RX"; +}; diff --git a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts b/a= rch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts index 01fe3974ee72..fae6568cb79e 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts @@ -30,6 +30,189 @@ g-assist-key { }; }; =20 +&tlmm { + gpio-line-names =3D "AP_CTI_IN", /* GPIO_0 */ + "MDM2AP_ERR_FATAL", + "AP_CTI_OUT", + "MDM2AP_STATUS", + "NFC_I2C_SDA", + "NFC_I2C_SCL", + "NFC_EN", + "NFC_CLK_REQ", + "NFC_ESE_PWR_REQ", + "DVDT_WRT_DET_AND", + "SPK_AMP_RESET_N", /* GPIO_10 */ + "SPK_AMP_INT_N", + "APPS_I2C_1_SDA", + "APPS_I2C_1_SCL", + "NC", + "TX_GTR_THRES_IN", + "HST_BT_UART_CTS", + "HST_BT_UART_RFR", + "HST_BT_UART_TX", + "HST_BT_UART_RX", + "HST_WLAN_EN", /* GPIO_20 */ + "HST_BT_EN", + "RGBC_IR_PWR_EN", + "FP_INT_N", + "NC", + "NC", + "NC", + "NC", + "NFC_ESE_SPI_MISO", + "NFC_ESE_SPI_MOSI", + "NFC_ESE_SPI_SCLK", /* GPIO_30 */ + "NFC_ESE_SPI_CS_N", + "WCD_RST_N", + "NC", + "SDM_DEBUG_UART_TX", + "SDM_DEBUG_UART_RX", + "TS_I2C_SDA", + "TS_I2C_SCL", + "TS_INT_N", + "FP_SPI_MISO", /* GPIO_40 */ + "FP_SPI_MOSI", + "FP_SPI_SCLK", + "FP_SPI_CS_N", + "APPS_I2C_0_SDA", + "APPS_I2C_0_SCL", + "DISP_ERR_FG", + "UIM2_DETECT_EN", + "NC", + "NC", + "NC", /* GPIO_50 */ + "NC", + "MDM_UART_CTS", + "MDM_UART_RFR", + "MDM_UART_TX", + "MDM_UART_RX", + "AP2MDM_STATUS", + "AP2MDM_ERR_FATAL", + "MDM_IPC_HS_UART_TX", + "MDM_IPC_HS_UART_RX", + "NC", /* GPIO_60 */ + "NC", + "NC", + "NC", + "NC", + "USB_CC_DIR", + "DISP_VSYNC", + "NC", + "NC", + "CAM_PWR_B_CS", + "NC", /* GPIO_70 */ + "FRONTC_PWR_EN", + "SBU_SW_SEL", + "SBU_SW_OE", + "FP_RESET_N", + "FP_RESET_N", + "DISP_RESET_N", + "DEBUG_GPIO0", + "TRAY_DET", + "CAM2_RST_N", + "PCIE0_RST_N", + "PCIE0_CLK_REQ_N", /* GPIO_80 */ + "PCIE0_WAKE_N", + "DVDT_ENABLE", + "DVDT_WRT_DET_OR", + "NC", + "PCIE2_RST_N", + "PCIE2_CLK_REQ_N", + "PCIE2_WAKE_N", + "MDM_VFR_IRQ0", + "MDM_VFR_IRQ1", + "SW_SERVICE", /* GPIO_90 */ + "CAM_SOF", + "CAM1_RST_N", + "CAM0_RST_N", + "CAM0_MCLK", + "CAM1_MCLK", + "CAM2_MCLK", + "CAM3_MCLK", + "NC", + "NC", + "NC", /* GPIO_100 */ + "CCI0_I2C_SDA", + "CCI0_I2C_SCL", + "CCI1_I2C_SDA", + "CCI1_I2C_SCL_", + "CCI2_I2C_SDA", + "CCI2_I2C_SCL", + "CCI3_I2C_SDA", + "CCI3_I2C_SCL", + "CAM3_RST_N", + "NFC_DWL_REQ", /* GPIO_110 */ + "NFC_IRQ", + "XVS", + "NC", + "RF_ID_EXTENSION", + "SPK_AMP_I2C_SDA", + "SPK_AMP_I2C_SCL", + "NC", + "NC", + "NC", + "NC", + "ACC_COVER_OPEN", + "ALS_PROX_INT_N", + "ACCEL_INT", + "WLAN_SW_CTRL", + "CAMSENSOR_I2C_SDA", + "CAMSENSOR_I2C_SCL", + "UDON_SWITCH_SEL", + "WDOG_DISABLE", + "BAROMETER_INT", + "NC", /* GPIO_130 */ + "NC", + "FORCED_USB_BOOT", + "NC", + "NC", + "NC", + "NC", + "NC", + "RGBC_IR_INT", + "NC", + "NC", /* GPIO_140 */ + "NC", + "BT_SLIMBUS_CLK", + "BT_SLIMBUS_DATA", + "HW_ID_0", + "HW_ID_1", + "WCD_SWR_TX_CLK", + "WCD_SWR_TX_DATA0", + "WCD_SWR_TX_DATA1", + "WCD_SWR_RX_CLK", + "WCD_SWR_RX_DATA0", /* GPIO_150 */ + "WCD_SWR_RX_DATA1", + "SDM_DMIC_CLK1", + "SDM_DMIC_DATA1", + "SDM_DMIC_CLK2", + "SDM_DMIC_DATA2", + "SPK_AMP_I2S_CLK", + "SPK_AMP_I2S_WS", + "SPK_AMP_I2S_ASP_DIN", + "SPK_AMP_I2S_ASP_DOUT", + "COMPASS_I2C_SDA", /* GPIO_160 */ + "COMPASS_I2C_SCL", + "NC", + "NC", + "SSC_SPI_1_MISO", + "SSC_SPI_1_MOSI", + "SSC_SPI_1_CLK", + "SSC_SPI_1_CS_N", + "NC", + "NC", + "SSC_SENSOR_I2C_SDA", /* GPIO_170 */ + "SSC_SENSOR_I2C_SCL", + "NC", + "NC", + "NC", + "NC", + "HST_BLE_SNS_UART6_TX", + "HST_BLE_SNS_UART6_RX", + "HST_WLAN_UART_TX", + "HST_WLAN_UART_RX"; +}; + &vreg_l2f_1p3 { regulator-min-microvolt =3D <1200000>; regulator-max-microvolt =3D <1200000>; --=20 2.41.0 From nobody Mon Feb 9 06:30:58 2026 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 9C13BEB64D7 for ; Tue, 20 Jun 2023 11:06:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231646AbjFTLGA (ORCPT ); Tue, 20 Jun 2023 07:06:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232491AbjFTLFn (ORCPT ); Tue, 20 Jun 2023 07:05:43 -0400 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34BE010F8 for ; Tue, 20 Jun 2023 04:05:40 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2b46d4e1b0aso41680541fa.2 for ; Tue, 20 Jun 2023 04:05:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687259138; x=1689851138; 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=2GKvZ616V2FdbMtm5spz/6erBtMA2Hst579nyomUNLg=; b=yBccGiTRR4lEKp1+KYswDniK+5Hxy2l2y74eSoPb3CWHPw1GSHDVzTNLAc283tPjMc YL/cfHBno+CXTT6IG1NtuRczYaYtbM1gf/bMzPkxpKl6q1qlS9bRLLpQdJeHyfRg8Yj5 WRgrux6SQ2jZre54QLUVCAlAUn1gw0QSMAkNTEnHQCb4vKC/0SkimLWvTb1WRpE3grkf ejI4KmKkyq1EIxn3/ug/ViqlR9kpO0qY9fjbeaoRQjpG5veeOYFP+kM6Rhl/qwVnHR/X /peMJgOfX0jrgA0GuQStggcsbTxF/rC9HxhyaFa5GC8laiobqLeEM1tP52TdpKEe49Dd mn3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687259138; x=1689851138; 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=2GKvZ616V2FdbMtm5spz/6erBtMA2Hst579nyomUNLg=; b=inZ9KoBLigX3Zt3bvNHavUCBhx1yYInVfx2gnDP4UchJZmus3sF8D4PWSvTiUdHpr8 qzHOYe0s2+E7jT1lJduhVNA7Okm3MeXFwuI6d+UPifgQjjRFz7llGm0fO5mjt5jFJ/i4 4aMZ3QPZ06UAOnIsAb14bCYd7sNkmvTWPCZ2wHghknbGJMVgezYVNCRsA+M1FQs6CLSR hoK8NKzxOYiwth7YQa82vgkkmTsW7b0PXqw3oMGATT3v6U7QhTD/ENITo8Q+rVTeUAiy fspj0cYyLoAW3CBRm/Yz3hAXEL7w/xm6JfYqAjlqFyZvmeUE7NTQfNG4TMREe2tCAMdG wt9A== X-Gm-Message-State: AC+VfDxFR1vsSHsMIlvBXdGEFdFDxcFWbZ5Ktpk/ZFMkEGrAmeJi/jv2 8NSDmuZrVBiigyPr7xHRYlQKJQ== X-Google-Smtp-Source: ACHHUZ49AlK3pHJZ4kMbZVdSMohKbXJ1bBkuIzj1NP2HhtyWhnXfvDsVQn0blDlbQIFspveF1zUhZQ== X-Received: by 2002:a2e:80c9:0:b0:2b1:c039:e977 with SMTP id r9-20020a2e80c9000000b002b1c039e977mr7228915ljg.16.1687259138478; Tue, 20 Jun 2023 04:05:38 -0700 (PDT) Received: from [192.168.1.101] (abxj193.neoplus.adsl.tpnet.pl. [83.9.3.193]) by smtp.gmail.com with ESMTPSA id 11-20020a05651c008b00b002ac7b0fc473sm369047ljq.38.2023.06.20.04.05.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 04:05:38 -0700 (PDT) From: Konrad Dybcio Date: Tue, 20 Jun 2023 13:05:35 +0200 Subject: [PATCH v2 2/4] arm64: dts: qcom: sm8250-edo: Add GPIO line names for PMIC GPIOs MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230614-topic-edo_pinsgpiopmic-v2-2-6f90bba54c53@linaro.org> References: <20230614-topic-edo_pinsgpiopmic-v2-0-6f90bba54c53@linaro.org> In-Reply-To: <20230614-topic-edo_pinsgpiopmic-v2-0-6f90bba54c53@linaro.org> To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio , Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1687259134; l=3755; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=NNKUHsnSrdS4vf/kgCib1So5nPpERojtp2HUS+mt0M8=; b=VF7AdfTa283XVSrfTDqN6ZmLAcTISR3/ZP4TLCQwFV8IHYg0+6TxFfeFd2A98bmuyBeU3wZde wZc59fQ+AqXAHS8AADnudXyUK0+jdmZ5XcH7AybIkyKVGbx7UPoYEz2 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 PDX203&206 DTSIs to better document the hardware. Diff between 203 and 206: pm8009_gpios < "CAM_PWR_LD_EN", > "NC", pm8150_gpios < "NC", > "G_ASSIST_N", < "WLC_EN_N", /* GPIO_10 */ > "NC", /* GPIO_10 */ Which is due to 5 II having an additional Google Assistant hardware button and 1 II having a wireless charger & different camera wiring to accommodate the additional 3D iToF sensor. Signed-off-by: Konrad Dybcio --- .../dts/qcom/sm8250-sony-xperia-edo-pdx203.dts | 50 ++++++++++++++++++= ++++ .../dts/qcom/sm8250-sony-xperia-edo-pdx206.dts | 50 ++++++++++++++++++= ++++ 2 files changed, 100 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx203.dts b/a= rch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx203.dts index 84104d2b2010..62590c6bd306 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx203.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx203.dts @@ -15,6 +15,56 @@ / { =20 /delete-node/ &vreg_l7f_1p8; =20 +&pm8009_gpios { + gpio-line-names =3D "NC", /* GPIO_1 */ + "CAM_PWR_LD_EN", + "WIDEC_PWR_EN", + "NC"; +}; + +&pm8150_gpios { + gpio-line-names =3D "VOL_DOWN_N", /* GPIO_1 */ + "OPTION_2", + "NC", + "PM_SLP_CLK_IN", + "OPTION_1", + "NC", + "NC", + "SP_ARI_PWR_ALARM", + "NC", + "NC"; /* GPIO_10 */ +}; + +&pm8150b_gpios { + gpio-line-names =3D "SNAPSHOT_N", /* GPIO_1 */ + "FOCUS_N", + "NC", + "NC", + "RF_LCD_ID_EN", + "NC", + "NC", + "LCD_ID", + "NC", + "WLC_EN_N", /* GPIO_10 */ + "NC", + "RF_ID"; +}; + +&pm8150l_gpios { + gpio-line-names =3D "NC", /* GPIO_1 */ + "PM3003A_EN", + "NC", + "NC", + "NC", + "AUX2_THERM", + "BB_HP_EN", + "FP_LDO_EN", + "PMX_RESET_N", + "AUX3_THERM", /* GPIO_10 */ + "DTV_PWR_EN", + "PM3003A_MODE"; +}; + &tlmm { gpio-line-names =3D "AP_CTI_IN", /* GPIO_0 */ "MDM2AP_ERR_FATAL", diff --git a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts b/a= rch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts index fae6568cb79e..ea4571bf4fbf 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts @@ -30,6 +30,56 @@ g-assist-key { }; }; =20 +&pm8009_gpios { + gpio-line-names =3D "NC", /* GPIO_1 */ + "NC", + "WIDEC_PWR_EN", + "NC"; +}; + +&pm8150_gpios { + gpio-line-names =3D "VOL_DOWN_N", /* GPIO_1 */ + "OPTION_2", + "NC", + "PM_SLP_CLK_IN", + "OPTION_1", + "G_ASSIST_N", + "NC", + "SP_ARI_PWR_ALARM", + "NC", + "NC"; /* GPIO_10 */ +}; + +&pm8150b_gpios { + gpio-line-names =3D "SNAPSHOT_N", /* GPIO_1 */ + "FOCUS_N", + "NC", + "NC", + "RF_LCD_ID_EN", + "NC", + "NC", + "LCD_ID", + "NC", + "NC", /* GPIO_10 */ + "NC", + "RF_ID"; +}; + +&pm8150l_gpios { + gpio-line-names =3D "NC", /* GPIO_1 */ + "PM3003A_EN", + "NC", + "NC", + "NC", + "AUX2_THERM", + "BB_HP_EN", + "FP_LDO_EN", + "PMX_RESET_N", + "NC", /* GPIO_10 */ + "NC", + "PM3003A_MODE"; +}; + &tlmm { gpio-line-names =3D "AP_CTI_IN", /* GPIO_0 */ "MDM2AP_ERR_FATAL", --=20 2.41.0 From nobody Mon Feb 9 06:30:58 2026 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 D7A0EEB64D8 for ; Tue, 20 Jun 2023 11:06:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232491AbjFTLGI (ORCPT ); Tue, 20 Jun 2023 07:06:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232159AbjFTLFv (ORCPT ); Tue, 20 Jun 2023 07:05:51 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1950100 for ; Tue, 20 Jun 2023 04:05:49 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2b4826ba943so23044631fa.0 for ; Tue, 20 Jun 2023 04:05:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687259140; x=1689851140; 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=ToCmia0PXRpaSenikhacrjnmxFSrHT1/63mpMtPp/dU=; b=ZaYRGZzCQcqA0eB5LkknyimTp5qTWWEm3BSMUW6cH3+XYkqxxTeNaGvRG3dDQBWDSS 15Tkkb6uqEDEA+xIgneoE3u02qqbGyCSXpXZux+SU3a8LYUxoHs18qU9crbOMJ/IOXiU 6GC3sJLZNEKrmYO6+ueUaV2u4fGt3cOPrPoyO/fmWCU3venuMxzkyDFC4RIRlgtBwvqg vSc6XovhhnkdZ1TW7+0fyBWbbjtGO7FyJM0ksXUVPzWWhQ7CJUE6i0afUlQ6+dESVwUU 5UfnyWs4UDMiKip69lR0qPwQK0702Tn/qt44wAJx6n/IzoLDFgGyNO7tdGI0mjv5rNGR zaTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687259140; x=1689851140; 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=ToCmia0PXRpaSenikhacrjnmxFSrHT1/63mpMtPp/dU=; b=Yei6DY2AlgzHiVAy42EG1sbFGHMx6bnbrE71A5VgWqedtTt/SwJ0s00opUN52CulRx SJaGPOjaziYHZzKFE8LFbq8TE0u/ZY+IV/HOLmbTHQbaxmsFnrTEFJbp9KGgwYRuQn+h c4NZga/CARUpCpIu7q7SzmmmSjihaf0D9iryXZveOvItQ3VsCG/aQTSr/8rmQeVuNcOU otZm11xaEwIF5n8RzgFhIrIw0ryRgAbf8G7HF1/LFbdDh6XusJLx6Er7Qp51M6jXWZM6 LoDZsla6G5vHL3wA13kbV+BegsGpE35d1YLFp8wRlBaQMwiu9otxBeW/+AcEbCMeRNHO 2Ivg== X-Gm-Message-State: AC+VfDzgp7Aupb1435fmJ3KvGIrB9lOJ15W/w5V8JBDrVjQGq9Xvlwa1 kisZClkAGF5w8eC6teY5BRp9aw== X-Google-Smtp-Source: ACHHUZ5xUesOcnI+PzghCY2RHYS5gUieS4t/zAkpgFT7e/jZu9P2j30qma69aEr7JriPHz4wrpvw4w== X-Received: by 2002:a05:651c:23a:b0:2b5:7ecc:bb08 with SMTP id z26-20020a05651c023a00b002b57eccbb08mr784328ljn.10.1687259140312; Tue, 20 Jun 2023 04:05:40 -0700 (PDT) Received: from [192.168.1.101] (abxj193.neoplus.adsl.tpnet.pl. [83.9.3.193]) by smtp.gmail.com with ESMTPSA id 11-20020a05651c008b00b002ac7b0fc473sm369047ljq.38.2023.06.20.04.05.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 04:05:40 -0700 (PDT) From: Konrad Dybcio Date: Tue, 20 Jun 2023 13:05:36 +0200 Subject: [PATCH v2 3/4] arm64: dts: qcom: sm8250-pdx203: Configure SLG51000 PMIC MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230614-topic-edo_pinsgpiopmic-v2-3-6f90bba54c53@linaro.org> References: <20230614-topic-edo_pinsgpiopmic-v2-0-6f90bba54c53@linaro.org> In-Reply-To: <20230614-topic-edo_pinsgpiopmic-v2-0-6f90bba54c53@linaro.org> To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio , Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1687259134; l=4795; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=ntXT2oOXZaov8tiTHi3wvxvjxZX5gQ3JPbXY/oE7Ou4=; b=nJwpL+3TCbjE8BVievBS4IWiZCALKT824ptCOtSgJcx6KeH9oArzVHaw6DOyd5wSBKGud/cn5 G+cDSxHbduBBZGf55wgTPAIu69kzbaOXb9pod8pq43srQmpiAWMyXhT X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Xperia 1 II / PRO use the Dialog SLG51000 PMIC for powering some camera sensors. Add the required nodes to support it and remove its remnants from -edo.dtsi, as it's absent on 5 II. Signed-off-by: Konrad Dybcio --- .../dts/qcom/sm8250-sony-xperia-edo-pdx203.dts | 131 +++++++++++++++++= ++++ .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 7 -- 2 files changed, 131 insertions(+), 7 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx203.dts b/a= rch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx203.dts index 62590c6bd306..f4c4575eb03b 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx203.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx203.dts @@ -15,6 +15,123 @@ / { =20 /delete-node/ &vreg_l7f_1p8; =20 +&i2c5 { + clock-frequency =3D <400000>; + status =3D "okay"; + + pmic@75 { + compatible =3D "dlg,slg51000"; + reg =3D <0x75>; + dlg,cs-gpios =3D <&tlmm 69 GPIO_ACTIVE_HIGH>; + vin5-supply =3D <&vreg_s1f_1p2>; + vin6-supply =3D <&vreg_s1f_1p2>; + + pinctrl-0 =3D <&cam_pwr_b_cs>; + pinctrl-names =3D "default"; + + regulators { + slg51000_1_ldo1: ldo1 { + regulator-name =3D "slg51000_b_ldo1"; + regulator-min-microvolt =3D <2400000>; + regulator-max-microvolt =3D <3300000>; + }; + + slg51000_1_ldo2: ldo2 { + regulator-name =3D "slg51000_b_ldo2"; + regulator-min-microvolt =3D <2400000>; + regulator-max-microvolt =3D <3300000>; + }; + + slg51000_1_ldo3: ldo3 { + regulator-name =3D "slg51000_b_ldo3"; + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <3750000>; + }; + + slg51000_1_ldo4: ldo4 { + regulator-name =3D "slg51000_b_ldo4"; + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <3750000>; + }; + + slg51000_1_ldo5: ldo5 { + regulator-name =3D "slg51000_b_ldo5"; + regulator-min-microvolt =3D <500000>; + regulator-max-microvolt =3D <1200000>; + }; + + slg51000_1_ldo6: ldo6 { + regulator-name =3D "slg51000_b_ldo6"; + regulator-min-microvolt =3D <500000>; + regulator-max-microvolt =3D <1200000>; + }; + + slg51000_1_ldo7: ldo7 { + regulator-name =3D "slg51000_b_ldo7"; + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <3750000>; + }; + }; + }; +}; + +&i2c15 { + pmic@75 { + compatible =3D "dlg,slg51000"; + reg =3D <0x75>; + dlg,cs-gpios =3D <&tlmm 71 GPIO_ACTIVE_HIGH>; + vin5-supply =3D <&vreg_l2f_1p3>; + vin6-supply =3D <&vreg_l2f_1p3>; + + pinctrl-0 =3D <&cam_pwr_a_cs>; + pinctrl-names =3D "default"; + + regulators { + slg51000_0_ldo1: ldo1 { + regulator-name =3D "slg51000_a_ldo1"; + regulator-min-microvolt =3D <2400000>; + regulator-max-microvolt =3D <3300000>; + }; + + slg51000_0_ldo2: ldo2 { + regulator-name =3D "slg51000_a_ldo2"; + regulator-min-microvolt =3D <2400000>; + regulator-max-microvolt =3D <3300000>; + }; + + slg51000_0_ldo3: ldo3 { + regulator-name =3D "slg51000_a_ldo3"; + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <3750000>; + }; + + slg51000_0_ldo4: ldo4 { + regulator-name =3D "slg51000_a_ldo4"; + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <3750000>; + }; + + slg51000_0_ldo5: ldo5 { + regulator-name =3D "slg51000_a_ldo5"; + regulator-min-microvolt =3D <500000>; + regulator-max-microvolt =3D <1200000>; + }; + + slg51000_0_ldo6: ldo6 { + regulator-name =3D "slg51000_a_ldo6"; + regulator-min-microvolt =3D <500000>; + regulator-max-microvolt =3D <1200000>; + }; + + slg51000_0_ldo7: ldo7 { + regulator-name =3D "slg51000_a_ldo7"; + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <3750000>; + }; + }; + }; +}; + &pm8009_gpios { gpio-line-names =3D "NC", /* GPIO_1 */ "CAM_PWR_LD_EN", @@ -246,4 +363,18 @@ &tlmm { "HST_BLE_SNS_UART6_RX", "HST_WLAN_UART_TX", "HST_WLAN_UART_RX"; + + cam_pwr_b_cs: cam-pwr-b-state { + pins =3D "gpio69"; + drive-strength =3D <2>; + bias-disable; + output-low; + }; + + cam_pwr_a_cs: cam-pwr-a-state { + pins =3D "gpio71"; + drive-strength =3D <2>; + bias-disable; + output-low; + }; }; diff --git a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi b/arch/ar= m64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi index 8ab82bacba81..70da10fb9d9d 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi @@ -486,13 +486,6 @@ cs35l41_r: speaker-amp@41 { }; }; =20 -&i2c5 { - status =3D "okay"; - clock-frequency =3D <400000>; - - /* Dialog SLG51000 CMIC @ 75 */ -}; - &i2c9 { status =3D "okay"; clock-frequency =3D <400000>; --=20 2.41.0 From nobody Mon Feb 9 06:30:58 2026 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 86EDFEB64D8 for ; Tue, 20 Jun 2023 11:06:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232571AbjFTLGE (ORCPT ); Tue, 20 Jun 2023 07:06:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232511AbjFTLFq (ORCPT ); Tue, 20 Jun 2023 07:05:46 -0400 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3937210DA for ; Tue, 20 Jun 2023 04:05:44 -0700 (PDT) Received: by mail-lj1-x236.google.com with SMTP id 38308e7fff4ca-2b46d270ea1so41400611fa.1 for ; Tue, 20 Jun 2023 04:05:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687259141; x=1689851141; 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=VnfEhtDDR79cB+JFtObt/sWNnZM5L1YdVH546wXBYs8=; b=wU/8UQ6nXqxYFGp68FTCKcSnWpb/gYUxxrIcc9aDr0TNcWJ77k8M0UvXKKLLAYHxEP 3+c7TZaiHOynszRfHfpALcvykypFvwaWo7ycXt9/Uy4G6xH54leb/97SsImTBfG60dXl QC9f89iF4xo4zfECxO9lOmdeIAHXG6cTJZvyOHQNe9hv/Q0We+RVWmigN9TU5r5J064g KzpOZzj0QuPwkLZzfwuHz3IXsLJerYg4kYlykkR22dkIYmZeFT0RSD0xB6Wo3arQLPTI R9AaGI9sqELUsOtF8F/zBneiPZqz9l4P0GTzZGXmIDaocBGCt4Z0GtxnUjK3yMdSO14L QOKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687259141; x=1689851141; 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=VnfEhtDDR79cB+JFtObt/sWNnZM5L1YdVH546wXBYs8=; b=O5K2ZjsZhZPnkpyt5Oa2HHIjm//2z8+G+cempU58nSJPD5M+hEDJevGrhpr6bxJzJL cROuZKxyu2abrqG7TYdRI2QHlPOdPcIu8HoUhGFJrCXwaIPub+0OT7Fpte9+9HS2f2TW mtEIumgNS60o7pLZlL6HcXwLqmMqYXDZop3riEcavTz3K1F2kHbMN3WOxTHLLIu8v8vD kZ6QXzKCTPDbCmMGSDlEsR47CZ5yn2/fppKTzyywhNWW8qhui9Jjs5haKx4Jhd6O9c7O /6MkeoQat27C5TmA0r9M7gl2KPDlGqgiEu+zJnWBZ+rNBaosT53OWg/6jwZoCkFvVOgE 1rdw== X-Gm-Message-State: AC+VfDwlmousaTkUqlqVVKeqpshDJ0mvRSbVayqSDqXzV69FE7lSbu30 dntPoTnkYBaSLtTQClaglUeetA== X-Google-Smtp-Source: ACHHUZ5z0plB70c5G+uV6as3l0ESzn6YBCngAMY2mllmoSMD9KtsOE7+Low5QUJYp2bDbucXoMEmZA== X-Received: by 2002:a2e:b1c7:0:b0:2af:c9d8:87b4 with SMTP id e7-20020a2eb1c7000000b002afc9d887b4mr7761776lja.29.1687259141664; Tue, 20 Jun 2023 04:05:41 -0700 (PDT) Received: from [192.168.1.101] (abxj193.neoplus.adsl.tpnet.pl. [83.9.3.193]) by smtp.gmail.com with ESMTPSA id 11-20020a05651c008b00b002ac7b0fc473sm369047ljq.38.2023.06.20.04.05.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 04:05:41 -0700 (PDT) From: Konrad Dybcio Date: Tue, 20 Jun 2023 13:05:37 +0200 Subject: [PATCH v2 4/4] arm64: dts: qcom: sm8250-edo: Rectify gpio-keys MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230614-topic-edo_pinsgpiopmic-v2-4-6f90bba54c53@linaro.org> References: <20230614-topic-edo_pinsgpiopmic-v2-0-6f90bba54c53@linaro.org> In-Reply-To: <20230614-topic-edo_pinsgpiopmic-v2-0-6f90bba54c53@linaro.org> To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio , Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1687259134; l=3233; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=0Nd+IdxLUHksSzQLBMfzn4JECl7I9SIpO0+ZAvt3EYc=; b=bc2ot/iKUegdQZ8gQDU/jocKCigfCb/6ZURQiAG07ACxdMU4T15qYmbOuuNKWjmy/XIFsODcA WcfqRF27u7BCtu9Rhtu6rAvMEfD7VIxpBUkWObGlF/QBdR888aZWlFr X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Set up the corresponding GPIOs properly and add the leftover hardware buttons to mark this piece of the puzzle complete. Fixes: 46e14907c716 ("arm64: dts: qcom: sm8250-edo: Add hardware keys") Reviewed-by: Marijn Suijten Signed-off-by: Konrad Dybcio --- .../dts/qcom/sm8250-sony-xperia-edo-pdx206.dts | 10 ++++ .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 54 ++++++++++++++++++= +--- 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts b/a= rch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts index ea4571bf4fbf..58a521046f5f 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts @@ -20,6 +20,8 @@ &framebuffer { }; =20 &gpio_keys { + pinctrl-0 =3D <&focus_n &snapshot_n &vol_down_n &g_assist_n>; + g-assist-key { label =3D "Google Assistant Key"; linux,code =3D ; @@ -48,6 +50,14 @@ &pm8150_gpios { "SP_ARI_PWR_ALARM", "NC", "NC"; /* GPIO_10 */ + + g_assist_n: g-assist-n-state { + pins =3D "gpio6"; + function =3D "normal"; + power-source =3D <1>; + bias-pull-up; + input-enable; + }; }; =20 &pm8150b_gpios { diff --git a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi b/arch/ar= m64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi index 70da10fb9d9d..897b97db819e 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi @@ -51,12 +51,26 @@ framebuffer: framebuffer@9c000000 { gpio_keys: gpio-keys { compatible =3D "gpio-keys"; =20 - /* - * Camera focus (light press) and camera snapshot (full press) - * seem not to work properly.. Adding the former one stalls the CPU - * and the latter kills the volume down key for whatever reason. In any - * case, they are both on &pm8150b_gpios: camera focus(2), camera snapsh= ot(1). - */ + pinctrl-0 =3D <&focus_n &snapshot_n &vol_down_n>; + pinctrl-names =3D "default"; + + key-camera-focus { + label =3D "Camera Focus"; + linux,code =3D ; + gpios =3D <&pm8150b_gpios 2 GPIO_ACTIVE_LOW>; + debounce-interval =3D <15>; + linux,can-disable; + gpio-key,wakeup; + }; + + key-camera-snapshot { + label =3D "Camera Snapshot"; + linux,code =3D ; + gpios =3D <&pm8150b_gpios 1 GPIO_ACTIVE_LOW>; + debounce-interval =3D <15>; + linux,can-disable; + gpio-key,wakeup; + }; =20 key-vol-down { label =3D "Volume Down"; @@ -544,6 +558,34 @@ &pcie2_phy { vdda-pll-supply =3D <&vreg_l9a_1p2>; }; =20 +&pm8150_gpios { + vol_down_n: vol-down-n-state { + pins =3D "gpio1"; + function =3D "normal"; + power-source =3D <0>; + bias-pull-up; + input-enable; + }; +}; + +&pm8150b_gpios { + snapshot_n: snapshot-n-state { + pins =3D "gpio1"; + function =3D "normal"; + power-source =3D <0>; + bias-pull-up; + input-enable; + }; + + focus_n: focus-n-state { + pins =3D "gpio2"; + function =3D "normal"; + power-source =3D <0>; + bias-pull-up; + input-enable; + }; +}; + &pon_pwrkey { status =3D "okay"; }; --=20 2.41.0