projects / linux-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 404d7f6)
arm64: dts: qcom: sm8250-edo: Add gpio line names for TLMM
authorKonrad Dybcio <konrad.dybcio@linaro.org>
Tue, 20 Jun 2023 11:05:34 +0000 (13:05 +0200)
committerBjorn Andersson <andersson@kernel.org>
Mon, 10 Jul 2023 04:26:42 +0000 (21:26 -0700)
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 <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230614-topic-edo_pinsgpiopmic-v2-1-6f90bba54c53@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx203.dts patch | blob | blame | history
arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo-pdx206.dts patch | blob | blame | history

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 356a81698731aafb1d0716f5407b0e3af0d3020e..84104d2b2010101f3d7d688fc2da256391319b96 100644 (file)
--- 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 01fe3974ee7203ddd6fd5bafb1a0a648c6c5fad4..fae6568cb79e4c4255580dbaec15dbccdfd116ce 100644 (file)
--- 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 @@
        };
 };
 
+&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>;
Linux 6.x block layer and io_uring tree(s)