From patchwork Wed Jun 14 12:11:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 107935 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1208122vqr; Wed, 14 Jun 2023 05:27:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5kq5qOLJY27LAvty62xzPx/f/fol9Oz0ZHBi4+rAHaGpSeP2qbHkI+10e82XgX5WKpvOse X-Received: by 2002:a05:6870:5a8e:b0:1a6:77e5:1467 with SMTP id dt14-20020a0568705a8e00b001a677e51467mr7688569oab.43.1686745629275; Wed, 14 Jun 2023 05:27:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686745629; cv=none; d=google.com; s=arc-20160816; b=YOPNugchNJCAGcoshBFkZeHAroDfSlG5VIlPx0dmZ3WMv1hHyLEQf0nP9Qpi5t1Gmo 0+jUxubZquNk4c9ATrtNq2pBFOKZZEvNA3UWlLEBd3kG4tXueypnuxTfQ9FN45aRdXYP HgUrJAD2YVlw66WPl9Lv1H4H4wK//RGp66vq+iqtZn8M8if+j5Kdp1Gpw8vEIfty4BA7 NUjuFerWNXENpvNLNM5HQEinbumx75f4VlvHu/Z20vbKU1/MWurilEKAbJYfdQH3cZkE bHN4chMnn7Wr9h8PFs+kj48GYJQPfTpMJqKC5KQtNONBdV6dqjx08ItHprNwShIK6NX1 ySzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=iPvEmuwd6DGAowfXu00FN23lI8vD4oDdNvK0TJyc+E8=; b=nBP65f07OWbyJ9PQhdTPYi58xQ8Z0buSRxITxSXZ47lBFbe96e6BSGl6Bx0HiSsPHI 8qksI9SZbDah3PELBoCLf3rgt7gGCn2E+rElHxBJZohTQYIzEv17sN7FallHP2ktv/Zg TjbTYx4dbxM0Yr2QO9NeLni1HHBiv8QBGJhTlz8S1omFtcutiYJKRcvIwlegK9xZGkuv RkpasiclO71y1R5ohwyhV2OyyUj90rwuY5Mk8V2XhB42qlogTaMzx8yHY48UFNZE3TKv /wsfp4sqU2AzkHouj6GHqWXG/U4iwkjcRGJz00EY079NsFLF68Da6rKQ+rez7Ak9FByc /mXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Sx0COols; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bm18-20020a656e92000000b0053074c54c3fsi11196809pgb.868.2023.06.14.05.26.56; Wed, 14 Jun 2023 05:27:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Sx0COols; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244455AbjFNMM1 (ORCPT + 99 others); Wed, 14 Jun 2023 08:12:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244487AbjFNMMI (ORCPT ); Wed, 14 Jun 2023 08:12:08 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C82642695 for ; Wed, 14 Jun 2023 05:11:56 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-4f6255ad8aeso8505847e87.2 for ; Wed, 14 Jun 2023 05:11:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686744715; x=1689336715; 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=Sx0COolsuS6zB6efJ1AbFAg5QuESp6fliBRSi6RmQaHCAMQ8wYspHoJjX34yViTrWT yGOjwJCYGSgqGrruKPCQ7bV/8LLOl8XKScHAZiJ5VbApRSw53rp1Rb3cwB1dgo2dSQVI lLO1EQj8bClh5s5hXXj3gqctsIBVtqA8z/4oF57g8Y03XROrAlfmwCPoWydmR9BkgAWy uFj1tmTCY1JGMqWdkepWfeC4mny51JINeCVS6Kc9CacEYX9SYJgVOSYBYElaD4ixYr5n 0q7Hec83SkLmhX1px8drWE0ZJytsNmOn7LhpcfZwGSy7S3/n9AMFQ/l1hqhq7+pBl2FZ M0gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686744715; x=1689336715; 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=TKmiucvydJag8C357gAXqjV1QdfWJ2jlDZLtj7e+BkaKsgDBgI867FkUbjrXu/AUcQ GM3kuuFPXIwZAvcsSwf995T8ddTgP3Wh68pbXkblcQHfaYcVBoccocK98eDKSxVfnWQj 6Zoiw6aL2a4d3lYL5/Klwr9z+U51CCGT9v9Qp5LSCMRYVGj0lXgQxYl+3dwMBDrRIBdD Lv9AK5fWlS6dgMj1D5vgNcPM8ygRS9Aa/WBPpf2+S9Zo0bYRmAcFazx+++/7MI55DSZk 8YPYzossmIqUXFRoRNdVrK/GJj0gTJtodEiiIzotCfWD8MwNHHlfSqaoeKdgRjppa+Gl ZxNQ== X-Gm-Message-State: AC+VfDwNWpKECxgV88oS9Vim3/uoTBTYrrrxYc8E2Z1Nt9bDmUgz4go+ 3f8L6eT4EN25ZcAOXFsRBD+iyA== X-Received: by 2002:a19:4f18:0:b0:4f7:6454:655d with SMTP id d24-20020a194f18000000b004f76454655dmr1516321lfb.0.1686744715070; Wed, 14 Jun 2023 05:11:55 -0700 (PDT) Received: from [192.168.1.101] (abyj190.neoplus.adsl.tpnet.pl. [83.9.29.190]) by smtp.gmail.com with ESMTPSA id d2-20020ac25ec2000000b004f24e797c55sm2109793lfq.25.2023.06.14.05.11.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 05:11:54 -0700 (PDT) From: Konrad Dybcio Date: Wed, 14 Jun 2023 14:11:46 +0200 Subject: [PATCH 1/4] arm64: dts: qcom: sm8250-edo: Add gpio line names for TLMM MIME-Version: 1.0 Message-Id: <20230614-topic-edo_pinsgpiopmic-v1-1-cf88a0bac26c@linaro.org> References: <20230614-topic-edo_pinsgpiopmic-v1-0-cf88a0bac26c@linaro.org> In-Reply-To: <20230614-topic-edo_pinsgpiopmic-v1-0-cf88a0bac26c@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=1686744712; l=10201; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=Gs8EcWkCuXLPlTR/L3C8hsNX2wpikTOpGZoHLWzmzC8=; b=Bwd2ZNEk/nXA4VxudRLMD72Vb9WSOhVcHm+A3w5vLcCRGXfJw41oRP3zoUx4sxQOSz/bEDVAQ WdtwOiaCGjVBx3/466VcPFEJO32qQTKD3dYc6M5Ab4oS7gQavOBowhs X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,UPPERCASE_50_75, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768680985053219416?= X-GMAIL-MSGID: =?utf-8?q?1768680985053219416?= 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/arch/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 @@ / { }; /delete-node/ &vreg_l7f_1p8; + +&tlmm { + gpio-line-names = "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/arch/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 { }; }; +&tlmm { + gpio-line-names = "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 = <1200000>; regulator-max-microvolt = <1200000>; From patchwork Wed Jun 14 12:11:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 107934 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1208126vqr; Wed, 14 Jun 2023 05:27:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5AbTHLjlhQtMGfPjhkF7tzdO9k4Rm5YA2jM5LBnkEAOUoH89IxX57ebCYXw18haZYg1BM5 X-Received: by 2002:a05:6870:8c30:b0:1a2:9a3c:ae20 with SMTP id ec48-20020a0568708c3000b001a29a3cae20mr10195513oab.46.1686745629257; Wed, 14 Jun 2023 05:27:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686745629; cv=none; d=google.com; s=arc-20160816; b=zyV3vcGnCQaFokaZmhQwryIfbsih8lO999v71KurGgLjNDThnEO+oT89sSY4GaUMG1 2Mf/FgPYKReAYpgHaZT8CxCOr6jC1JHXIk4LDn5pW2DkIZtqNVQDNq7ovVs4uqBmx6Pg OneauUGoZZWv2mjXfHMeZwa/Q+6TYbRRJIYuy2Wbs8N7/bMzHqdb955o3O8ICuyL72gg RO+Ep5qjV0YOU98WfO20mfkQ/1s1sYLGjTndSf1JO6UVbr1FloYh5i6lt+n3f4PQ9jVc fCV5ZHJhsR3YNZXFOtkmCuAta/V8VjjFaS0k8IiBoFrKG5FYZcubXufh2MfL7uoOMetD dhRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=2GKvZ616V2FdbMtm5spz/6erBtMA2Hst579nyomUNLg=; b=VZYGcIivxck6Qvjq0obUqK7qLuaCbwr9t/0yidbXvHQGkcjU1nysF+NIKceca238xv SgicB3QWYC1hiFpsArxyK8oQpjzxmGNo9BOvZucivZBoPckN7iYjIKgZC2S5MkKZD3hd u3VxR1jTTk5PN99RrP4c97YLQftc0w3tHn+DOtcLxKGmuPftZYvUWyjAFWCzxCwj/hJD 040hRlCZRnaFmKn361X7Qphjgry/1Cac/LeXyEj+W1fpR6DLWXS16cPUywDX/Y++X189 gJ9yFV/NE14ZFfuVmtRJTQ3Egat6j2wqtZJm61gmwa9LT6u2zqXIxEMpVMOZnTCbkEBD qPrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Bw0+UTUC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h13-20020a17090a3d0d00b00259a3c7fb52si10475647pjc.27.2023.06.14.05.26.19; Wed, 14 Jun 2023 05:27:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Bw0+UTUC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244465AbjFNMMa (ORCPT + 99 others); Wed, 14 Jun 2023 08:12:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244464AbjFNMMK (ORCPT ); Wed, 14 Jun 2023 08:12:10 -0400 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59CE126A2 for ; Wed, 14 Jun 2023 05:11:58 -0700 (PDT) Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-4f6370ddd27so8466649e87.0 for ; Wed, 14 Jun 2023 05:11:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686744716; x=1689336716; 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=Bw0+UTUC/qX0S8ZcEFmLN1g7S6E6bNXgFugnyQV4/YFAYrbS9L3rKBGw1WQal1pmaO kUhInhxIBHw9+LTsqP6eY0kCjbfYcn2HCWCj1JEDAXJEnp7apbNoacGOyFejZi1DPSWP ap/Tu4Stti5RWjktyaIf3yMWA5JtTtP9Skh7+MY+Ol8wqsiXkr/L2Xv8bMYwFTmdO/Pc bRdWfT/dF8l4kyrLrPyJmfiX6THKLmjVQ6OEjtDwW3+qrMChRxEpfYPEDmj11eRoR1KD PgADeottRZbOCca8ZRTJCN84URHocbaBCTmgy+p3pz1+d0/Ndg+uEYOBHS13SFShKbjH BLmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686744716; x=1689336716; 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=FHfr+fNxlTfd6dez6Dh5S1NVigt+8e0Tnc+oF0vBtZIMJ2yuQ0o1eB0tcY0N3iSgUp 8qAQHvmxug0MLHvgg36uDA13s3MUxy5fcy1VbWCunU/GzEscAADJbq6wvZyQViLSzaNa tiRoLDsIqxHPcdmp2mzTiYnLdAdN7PdobDZi5HmMzkYRRUh0BMEct7FlO7h3rK7tGEY9 Wqpi9ICllyzw5riFLDMhEj2JNzuMIFhSw79IcRg4PmGnwtpbifWM8JpMcACXt+RNcqZR bXdNybLGNEhDbfR5Lcc7XkUoXxxC9jFjnkS2siPH6I3Bijv0+Klxe+18gVNDe/Y/bHgh o/Ww== X-Gm-Message-State: AC+VfDzvsk+Ss9bedm03lWF/78FtPsl+0y726mPYC578MmHy2xrJRRKc B3n8YnCSfHZC6cLvbvTRYcJZ2TFe1hUsPdTvIF4= X-Received: by 2002:a19:6756:0:b0:4f1:26f5:77fb with SMTP id e22-20020a196756000000b004f126f577fbmr8018150lfj.28.1686744716565; Wed, 14 Jun 2023 05:11:56 -0700 (PDT) Received: from [192.168.1.101] (abyj190.neoplus.adsl.tpnet.pl. [83.9.29.190]) by smtp.gmail.com with ESMTPSA id d2-20020ac25ec2000000b004f24e797c55sm2109793lfq.25.2023.06.14.05.11.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 05:11:56 -0700 (PDT) From: Konrad Dybcio Date: Wed, 14 Jun 2023 14:11:47 +0200 Subject: [PATCH 2/4] arm64: dts: qcom: sm8250-edo: Add GPIO line names for PMIC GPIOs MIME-Version: 1.0 Message-Id: <20230614-topic-edo_pinsgpiopmic-v1-2-cf88a0bac26c@linaro.org> References: <20230614-topic-edo_pinsgpiopmic-v1-0-cf88a0bac26c@linaro.org> In-Reply-To: <20230614-topic-edo_pinsgpiopmic-v1-0-cf88a0bac26c@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=1686744712; l=3755; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=NNKUHsnSrdS4vf/kgCib1So5nPpERojtp2HUS+mt0M8=; b=+FciPhTwrnNb2M60+ATv4cP3yTRrZN8r0tkISE83J3oT3M5ofKFlHv1GieBCdeS3Jh2Xf9wEM qf1tEVfJWT/ANZbMkFNtfN9kpiTRaTT2RFopdnfrZLmZ696GzhB8YfO X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768680985368312804?= X-GMAIL-MSGID: =?utf-8?q?1768680985368312804?= 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/arch/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 @@ / { /delete-node/ &vreg_l7f_1p8; +&pm8009_gpios { + gpio-line-names = "NC", /* GPIO_1 */ + "CAM_PWR_LD_EN", + "WIDEC_PWR_EN", + "NC"; +}; + +&pm8150_gpios { + gpio-line-names = "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 = "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 = "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 = "AP_CTI_IN", /* GPIO_0 */ "MDM2AP_ERR_FATAL", diff --git a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts b/arch/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 { }; }; +&pm8009_gpios { + gpio-line-names = "NC", /* GPIO_1 */ + "NC", + "WIDEC_PWR_EN", + "NC"; +}; + +&pm8150_gpios { + gpio-line-names = "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 = "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 = "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 = "AP_CTI_IN", /* GPIO_0 */ "MDM2AP_ERR_FATAL", From patchwork Wed Jun 14 12:11:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 107931 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1206668vqr; Wed, 14 Jun 2023 05:24:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5XJODrvRz14u52PaCmoU/vqwJxlGRT/nRioRwVjVx4X3F/+DRGmsxHfidCXLbC8rs6u0px X-Received: by 2002:a17:90a:bb07:b0:253:727e:4b41 with SMTP id u7-20020a17090abb0700b00253727e4b41mr1055746pjr.34.1686745470590; Wed, 14 Jun 2023 05:24:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686745470; cv=none; d=google.com; s=arc-20160816; b=a3FNE72C02jfyQfAJNHiHhJ0zqEHiFUSPFqdkYrvoi6TWrdfcpuCU3y4dXHJjECjy+ Q6HBtLrIXR54y36mJU0DnmPqh2AKCU4jZ1Xr8dEFaVnzyiQTWuLcavlA1BzlPqKJfp6Z RzbfvL8IONSYhPvPQanu7sHcETSac+aMCGHc1DVE93rJxQNqJeXSU6W0ymlFRxkfKG4p IKNEqlX9BLXC3dC4OjFVV3hFvFNJJXu01GqSwN2RIM2M9spC9tYBYCyLObuvy27LSjSK /h6hFFVmSN/28OUt3gQzSfx/PMpkNvWOWccWAohg9QOTq/ecHSYUr2Bj9L0QcbGZCNGm sgHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=XKJjIqwo51G5MZT6SpaYZZUQ0YwGWBzq25MeRmDl6v0=; b=rZjZ23Ly1Pujo+TtKj3RnuKZkk8mbr/36qz+GuApoollq8niRdlkljON/n/Ce72UNw Kbp6aDOR823RTigC7j3qNAaAhbNHGVSfZFvgNsPWPNuDkB2FVlw51nhueyMTW+20vZ/X uUuicXJUF4c1lJxP1VEYTq8tHSDXlKhlkE7Xc+tvkoNWgLLkU8DBbLsKqKuuT+j96rZY GGnczaZmNYHpmVtmC6MtLmDes1vNjuk52tJv4mmQcNG9XS6iPx5SCNEaLJ20AXnsa0fy u10R+5mTg6DMvAxahjRS3DMuzMpgD1hlJ0A2+wbzu1jkcaCy0MKdSY0ykr9MPxi4ZVS2 cP3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ryLVxtsz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nh11-20020a17090b364b00b0025bf9d28b28si4365350pjb.104.2023.06.14.05.24.18; Wed, 14 Jun 2023 05:24:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ryLVxtsz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244537AbjFNMMk (ORCPT + 99 others); Wed, 14 Jun 2023 08:12:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244475AbjFNMMM (ORCPT ); Wed, 14 Jun 2023 08:12:12 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 097A21FF9 for ; Wed, 14 Jun 2023 05:12:00 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-4f762b3227dso1253875e87.1 for ; Wed, 14 Jun 2023 05:11:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686744718; x=1689336718; 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=XKJjIqwo51G5MZT6SpaYZZUQ0YwGWBzq25MeRmDl6v0=; b=ryLVxtszJHlGn9jJNvghIbxyAQ0G4AW2fFncXa/D5064gk4R+2VYntZakRZrkDvmhl r8htnxAGqnl8xP6dt2mVxAZUYrS+UC1QlxhdS79hX8u/fiC9/3yxzKPaPVgBLELbIxNW 1Ea01P3t8MoF314FVJQJhgiIWtj6yMAC5CyFX72EYBcnao/0cMeO8qtwtN17h2AnPqZX Y6nPm+DxvWDodbKwS8BuhOp/q9OsVB3FRqsShpcS//MGDooJQMnEYv2NrSAbRxT2J/DH DCxWhJlSECAJQn1iT84xRFBBCIPUCGL0NAUTP+rjEySsZM+6VrS0q2OLswEcDOGEn0pI H9Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686744718; x=1689336718; 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=XKJjIqwo51G5MZT6SpaYZZUQ0YwGWBzq25MeRmDl6v0=; b=QlVsVMHriJ38apa/6Oh3I9dgGEJNE0ChKMxoTCZpA+t4ElWx7zr20GkgDSYzhUWaAc j5H61qIYb+XAoJiIz9YGnEHG9xVup/ZreZbeiQVeIG1njlLA6eleLpGiV6Cb922pr0TD 9QLckV+PLe1OMA7QYPMbhM18IwH3PTv0S2pqVd4zDieqUqFbGglhS9/2pSbKaGxEjKdd bgfNIx9soFJzcvJX1AMQVzx7/Oh1rdZrPWmLBrckyGcWxiz/GOeobX0cJ6w9dXfhLzpI L6nXm9RgNFUddchkylg1RM9oeltGlZP8AMEwuSYLQW+sJoB2HGHi0et36rwq0pqB+fTS 9zAw== X-Gm-Message-State: AC+VfDxqnzlXtLmb/QZ9MCRhQPuEKUAB18CvFOIWiLGg9RtkJ/Ztaff1 GsHiSSD9+Y66WbvW6Kq7QEodZw== X-Received: by 2002:a19:6503:0:b0:4f7:6730:c456 with SMTP id z3-20020a196503000000b004f76730c456mr496263lfb.12.1686744718153; Wed, 14 Jun 2023 05:11:58 -0700 (PDT) Received: from [192.168.1.101] (abyj190.neoplus.adsl.tpnet.pl. [83.9.29.190]) by smtp.gmail.com with ESMTPSA id d2-20020ac25ec2000000b004f24e797c55sm2109793lfq.25.2023.06.14.05.11.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 05:11:57 -0700 (PDT) From: Konrad Dybcio Date: Wed, 14 Jun 2023 14:11:48 +0200 Subject: [PATCH 3/4] arm64: dts: qcom: sm8250-pdx203: Configure SLG51000 PMIC MIME-Version: 1.0 Message-Id: <20230614-topic-edo_pinsgpiopmic-v1-3-cf88a0bac26c@linaro.org> References: <20230614-topic-edo_pinsgpiopmic-v1-0-cf88a0bac26c@linaro.org> In-Reply-To: <20230614-topic-edo_pinsgpiopmic-v1-0-cf88a0bac26c@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=1686744712; l=4795; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=U+VpiqRYoSq3szDzn4mqCWpp8VBKg2i1duDfVUSEXA0=; b=AtEJTttxBfSQCwlzW+eZ79+BDaFTFCmIHqS6kI31PKLsK1RAtFgaEUXohqSonhz0MyM7lp7Ri hAa1lk0o2XNCsFcTlzE0eQgKpIRdpEYfbD92EvI5SXL9EHbzZpg2wpJ X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768680818823120594?= X-GMAIL-MSGID: =?utf-8?q?1768680818823120594?= 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/arch/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 @@ / { /delete-node/ &vreg_l7f_1p8; +&i2c5 { + clock-frequency = <400000>; + status = "okay"; + + pmic@75 { + compatible = "dlg,slg51000"; + reg = <0x75>; + dlg,cs-gpios = <&tlmm 69 GPIO_ACTIVE_HIGH>; + vin5-supply = <&vreg_s1f_1p2>; + vin6-supply = <&vreg_s1f_1p2>; + + pinctrl-0 = <&cam_pwr_b_cs>; + pinctrl-names = "default"; + + regulators { + slg51000_1_ldo1: ldo1 { + regulator-name = "slg51000_b_ldo1"; + regulator-min-microvolt = <2400000>; + regulator-max-microvolt = <3300000>; + }; + + slg51000_1_ldo2: ldo2 { + regulator-name = "slg51000_b_ldo2"; + regulator-min-microvolt = <2400000>; + regulator-max-microvolt = <3300000>; + }; + + slg51000_1_ldo3: ldo3 { + regulator-name = "slg51000_b_ldo3"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <3750000>; + }; + + slg51000_1_ldo4: ldo4 { + regulator-name = "slg51000_b_ldo4"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <3750000>; + }; + + slg51000_1_ldo5: ldo5 { + regulator-name = "slg51000_b_ldo5"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1200000>; + }; + + slg51000_1_ldo6: ldo6 { + regulator-name = "slg51000_b_ldo6"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1200000>; + }; + + slg51000_1_ldo7: ldo7 { + regulator-name = "slg51000_b_ldo7"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <3750000>; + }; + }; + }; +}; + +&i2c15 { + pmic@75 { + compatible = "dlg,slg51000"; + reg = <0x75>; + dlg,cs-gpios = <&tlmm 71 GPIO_ACTIVE_HIGH>; + vin5-supply = <&vreg_l2f_1p3>; + vin6-supply = <&vreg_l2f_1p3>; + + pinctrl-0 = <&cam_pwr_a_cs>; + pinctrl-names = "default"; + + regulators { + slg51000_0_ldo1: ldo1 { + regulator-name = "slg51000_a_ldo1"; + regulator-min-microvolt = <2400000>; + regulator-max-microvolt = <3300000>; + }; + + slg51000_0_ldo2: ldo2 { + regulator-name = "slg51000_a_ldo2"; + regulator-min-microvolt = <2400000>; + regulator-max-microvolt = <3300000>; + }; + + slg51000_0_ldo3: ldo3 { + regulator-name = "slg51000_a_ldo3"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <3750000>; + }; + + slg51000_0_ldo4: ldo4 { + regulator-name = "slg51000_a_ldo4"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <3750000>; + }; + + slg51000_0_ldo5: ldo5 { + regulator-name = "slg51000_a_ldo5"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1200000>; + }; + + slg51000_0_ldo6: ldo6 { + regulator-name = "slg51000_a_ldo6"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1200000>; + }; + + slg51000_0_ldo7: ldo7 { + regulator-name = "slg51000_a_ldo7"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <3750000>; + }; + }; + }; +}; + &pm8009_gpios { gpio-line-names = "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 = "gpio69"; + drive-strength = <2>; + bias-disable; + output-low; + }; + + cam_pwr_a_cs: cam-pwr-a-state { + pins = "gpio71"; + drive-strength = <2>; + bias-disable; + output-low; + }; }; diff --git a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi index 8d4352c8c543..9f9e7e9784fe 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi @@ -485,13 +485,6 @@ cs35l41_r: speaker-amp@41 { }; }; -&i2c5 { - status = "okay"; - clock-frequency = <400000>; - - /* Dialog SLG51000 CMIC @ 75 */ -}; - &i2c9 { status = "okay"; clock-frequency = <400000>; From patchwork Wed Jun 14 12:11:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 107932 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1206688vqr; Wed, 14 Jun 2023 05:24:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ670fW5938f75jSn3kHWJyYcWsCKPlrx7J5Najq/9tLUgbHH+vz4WkQfvWGqFsT++qCld9J X-Received: by 2002:a17:902:b714:b0:1b1:9218:6bf9 with SMTP id d20-20020a170902b71400b001b192186bf9mr10943028pls.43.1686745471887; Wed, 14 Jun 2023 05:24:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686745471; cv=none; d=google.com; s=arc-20160816; b=dawOdTNpsHTSi7Jkg7zztS9tbs+0FN5PXYukJdkvCTjwQxtKK0hcqD9+l/1V4CBj5K A1ZP2vF3Srb2BNCvvlx1UvIWi7fjo9PsYGv3+DPd83fBAtXhJfabq5u0Uj+PYVzDlzxn SBEpFgGMUZN8eebj7X3BmIxvRTqMtyaYFdlpfFSw9ZAG46rvLUM9J9ZwAOQRZoEXwkyH yKX00bFjOvQ0XahB/DS+npfSXHmJin/MLNizAybVRMCy1BtEvE5ZTXrEvg34xgYW/ziw BrL5Vc6fZh0uhG1Mw8VrOMee8eLZk4jL4bbEjYo4x3gvHMlPWeNJvTCrVnMh4Cj8ojz9 DsWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=Su1O/8G+NEY/y9W3jeuKWn3I4SvZSn/9II7YQB1Uo7A=; b=ItVmqp7zqU4hfE6Xh5sEDqYSIWU7iYSVHfWHK+s104X9tOMUF1LkAzN8IjJ40HhBtL 2Y1GjihPgxCzblLiPFfK47kL/mIk6R803N9ApiKO9RcLEBlzSsfzcgGzlxuUmAo0SYwx mEwbVWwkXR/bmiPO0ACIscWp69cGbk/IB1F4wl+RExQG9w1SQD3zT5RYkY1atUNcLdui POhcDfyNKlSwdBQrO9lBnlzgeAtScQDvV1tJmWhHUY3QemxW8QeHuYvFDoU3+jTmcmVx /OTSMZrxmF3fwfAPPYnMVBYXfQ8QFkrss5fkGRL8Zd3wECW9jST8D7z/xSZaw28fdkqZ 5sVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=siUuglJ6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u15-20020a170902e80f00b001adb857fc79si4092993plg.105.2023.06.14.05.24.18; Wed, 14 Jun 2023 05:24:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=siUuglJ6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236513AbjFNMMn (ORCPT + 99 others); Wed, 14 Jun 2023 08:12:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244502AbjFNMMO (ORCPT ); Wed, 14 Jun 2023 08:12:14 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 839502110 for ; Wed, 14 Jun 2023 05:12:01 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-4f62b552751so8441303e87.3 for ; Wed, 14 Jun 2023 05:12:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686744719; x=1689336719; 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=Su1O/8G+NEY/y9W3jeuKWn3I4SvZSn/9II7YQB1Uo7A=; b=siUuglJ610MvCGUp2hN7/R+TnDrl5vFoKtttyUv0MV4pIkS5i1D6ZuClQiEV3+wPje RSPamO3rZpFtWIh/R0RWaGocuM4uSHsmYOyXZbMsn7MZUi8NXuf/Ac5VxUzGfeflsnT+ irBM1PNQVn/9Lfk7Z13YtKe7YOW1Quo70d7VhrsH33VX9jUUe2so4gCJWXfjhFGIziv8 D0WYzfvIPR34BIePI1H04eWV5JEym83PDdyKszkk4jE+LIa31gTsnA5XVGUFjr2ONA3p 6iLnwh1uXV3n+1Cj/WHDiDL8+HbHpp7dLxtcd9AROPSv+hz6QfNbqxIk3ljQ0+Bul2ey u4vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686744719; x=1689336719; 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=Su1O/8G+NEY/y9W3jeuKWn3I4SvZSn/9II7YQB1Uo7A=; b=Sn7AX5ASTeH1rxM/3o/1/60duxN7do8Oz84BO45LSamu2HyRzyL6NuavLrtH605dF5 NlnlI/UpAYZSgI3Opphfli8o5g/iWj07hCxHlhoNhF6vcmJ+uwxK3VAunFVTBPWbrYCl ubDsmgD/ndQXmli64Pvjvju8YN2uqY0pZX4mfSmu++XZix+YANlrr63kZfhLWFu05Bxy 3avsNwYY/dm6hTkNOuAAoXyPrxECfBASUvALydD4VxdNuY+0+x4LqNsAGgBHxuotFo0z e/WCUEWKQRnhhYntF5/ArfD8ubPKf+lR07F0JNxuk3IQDsCFjqKQ0Qg/BITXGfaJjBv9 MKdA== X-Gm-Message-State: AC+VfDwCuUl19t7pcM8LWisf17dtDf3cVEOIfhmSotB9/hkc6JLYJD+Z TQB+7QzgpoC0CHKFgxvd/+Fz+Q== X-Received: by 2002:a19:6402:0:b0:4f6:5068:3c11 with SMTP id y2-20020a196402000000b004f650683c11mr7269507lfb.40.1686744719772; Wed, 14 Jun 2023 05:11:59 -0700 (PDT) Received: from [192.168.1.101] (abyj190.neoplus.adsl.tpnet.pl. [83.9.29.190]) by smtp.gmail.com with ESMTPSA id d2-20020ac25ec2000000b004f24e797c55sm2109793lfq.25.2023.06.14.05.11.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 05:11:59 -0700 (PDT) From: Konrad Dybcio Date: Wed, 14 Jun 2023 14:11:49 +0200 Subject: [PATCH 4/4] arm64: dts: qcom: sm8250-edo: Rectify gpio-keys MIME-Version: 1.0 Message-Id: <20230614-topic-edo_pinsgpiopmic-v1-4-cf88a0bac26c@linaro.org> References: <20230614-topic-edo_pinsgpiopmic-v1-0-cf88a0bac26c@linaro.org> In-Reply-To: <20230614-topic-edo_pinsgpiopmic-v1-0-cf88a0bac26c@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=1686744712; l=3205; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=1zgJzi0lueLgpAeV9ifSlI/3hHdlL1ZQj1ZG7GOA1qs=; b=0fsvZEDoDfIjQTVta1gCstx2qgONUqi9iWUR47T413TXK47hK/Bvw7jvn84UhlZd/HL5Pc4Ji BgNf6SW979vBeMKxJCjg71GIdtDwdsymEb9e7dYrDqRudLkga/Kxd/D X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768680819557696510?= X-GMAIL-MSGID: =?utf-8?q?1768680819557696510?= Set up the corresponding GPIOs properly and add the leftover hardware buttons to mark this piece of the puzzle complete. Fixes: 69cdb97ef652 ("arm64: dts: qcom: sm8250: Add support for SONY Xperia 1 II / 5 II (Edo platform)") Signed-off-by: Konrad Dybcio Reviewed-by: Marijn Suijten --- .../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/arch/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 { }; &gpio_keys { + pinctrl-0 = <&focus_n &snapshot_n &vol_down_n &g_assist_n>; + g-assist-key { label = "Google Assistant Key"; linux,code = ; @@ -48,6 +50,14 @@ &pm8150_gpios { "SP_ARI_PWR_ALARM", "NC", "NC"; /* GPIO_10 */ + + g_assist_n: g-assist-n-state { + pins = "gpio6"; + function = "normal"; + power-source = <1>; + bias-pull-up; + input-enable; + }; }; &pm8150b_gpios { diff --git a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi index 9f9e7e9784fe..e55a94e5ff08 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi @@ -50,12 +50,26 @@ framebuffer: framebuffer@9c000000 { gpio_keys: gpio-keys { compatible = "gpio-keys"; - /* - * 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 snapshot(1). - */ + pinctrl-0 = <&focus_n &snapshot_n &vol_down_n>; + pinctrl-names = "default"; + + key-camera-focus { + label = "Camera Focus"; + linux,code = ; + gpios = <&pm8150b_gpios 2 GPIO_ACTIVE_LOW>; + debounce-interval = <15>; + linux,can-disable; + gpio-key,wakeup; + }; + + key-camera-snapshot { + label = "Camera Snapshot"; + linux,code = ; + gpios = <&pm8150b_gpios 1 GPIO_ACTIVE_LOW>; + debounce-interval = <15>; + linux,can-disable; + gpio-key,wakeup; + }; key-vol-down { label = "Volume Down"; @@ -543,6 +557,34 @@ &pcie2_phy { vdda-pll-supply = <&vreg_l9a_1p2>; }; +&pm8150_gpios { + vol_down_n: vol-down-n-state { + pins = "gpio1"; + function = "normal"; + power-source = <0>; + bias-pull-up; + input-enable; + }; +}; + +&pm8150b_gpios { + snapshot_n: snapshot-n-state { + pins = "gpio1"; + function = "normal"; + power-source = <0>; + bias-pull-up; + input-enable; + }; + + focus_n: focus-n-state { + pins = "gpio2"; + function = "normal"; + power-source = <0>; + bias-pull-up; + input-enable; + }; +}; + &pon_pwrkey { status = "okay"; };