projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d20ad16)
arm64: dts: qcom: msm8998-yoshino: Use SONY GPIO names
authorKonrad Dybcio <konrad.dybcio@linaro.org>
Tue, 14 Mar 2023 13:28:34 +0000 (14:28 +0100)
committerBjorn Andersson <andersson@kernel.org>
Tue, 4 Apr 2023 19:29:31 +0000 (12:29 -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 Yoshino devices DTs to better document the hardware.

Lilac and Poplar have identical pin assignments.
Diff between these two and maple:

TLMM:
-  "NC",
+  "TS_VDDIO_EN",

PMI8998:
-  "NC"
+  "USB_SWITCH_SEL"

-  "NC"
+  "4K_DISP_DCDC_EN"

PM8005:
-  "NC"
+  "EAR_EN"

Which is probably due to Maple being designed and released quite a bit
earlier than the other two and it having a super high tech true-4K
display.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230314-topic-yoshino_gpio-v2-1-4cb80e187e38@linaro.org
arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts patch | blob | history
arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi patch | blob | history

diff --git a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts
index 1868ad6..8b6a718 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts
+++ b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts
@@ -37,7 +37,29 @@
        qcom,soft-start-us = <200>;
 };
 
+&pm8005_gpios {
+       gpio-line-names = "EAR_EN", /* GPIO_1 */
+                         "NC",
+                         "SLB",
+                         "OPTION_1_PM8005";
+};
+
 &pmi8998_gpios {
+       gpio-line-names = "MAIN_CAM_PWR_IO_EN", /* GPIO_1 */
+                         "NC",
+                         "NC",
+                         "TYPEC_UUSB_SEL",
+                         "VIB_LDO_EN",
+                         "NC",
+                         "DISPLAY_TYPE_SEL",
+                         "USB_SWITCH_SEL",
+                         "NC",
+                         "4K_DISP_DCDC_EN", /* GPIO_10 */
+                         "NC",
+                         "DIV_CLK3",
+                         "SPMI_I2C_SEL",
+                         "NC";
+
        disp_dvdd_en: disp-dvdd-en-active-state {
                pins = "gpio10";
                function = "normal";
@@ -49,6 +71,159 @@
        };
 };
 
+&tlmm {
+       gpio-line-names = "", /* GPIO_0 */
+                         "",
+                         "",
+                         "",
+                         "DEBUG_UART_TX",
+                         "DEBUG_UART_RX",
+                         "CAMSENSOR_I2C_SDA",
+                         "CAMSENSOR_I2C_SCL",
+                         "NC",
+                         "NC",
+                         "MDP_VSYNC_P", /* GPIO_10 */
+                         "RGBC_IR_INT",
+                         "NFC_VEN",
+                         "CAM_MCLK0",
+                         "CAM_MCLK1",
+                         "NC",
+                         "NC",
+                         "CCI_I2C_SDA0",
+                         "CCI_I2C_SCL0",
+                         "CCI_I2C_SDA1",
+                         "CCI_I2C_SCL1", /* GPIO_20 */
+                         "MAIN_CAM_PWR_EN",
+                         "TOF_INT_N",
+                         "NC",
+                         "NC",
+                         "CHAT_CAM_PWR_EN",
+                         "NC",
+                         "TOF_RESET_N",
+                         "CAM2_RSTN",
+                         "NC",
+                         "CAM1_RSTN", /* GPIO_30 */
+                         "NC",
+                         "NC",
+                         "NC",
+                         "NC",
+                         "NC",
+                         "NC",
+                         "NC",
+                         "CC_DIR",
+                         "UIM2_DETECT_EN",
+                         "FP_RESET_N", /* GPIO_40 */
+                         "NC",
+                         "NC",
+                         "NC",
+                         "NC",
+                         "BT_HCI_UART_TXD",
+                         "BT_HCI_UART_RXD",
+                         "BT_HCI_UART_CTS_N",
+                         "BT_HCI_UART_RFR_N",
+                         "NC",
+                         "NC", /* GPIO_50 */
+                         "NC",
+                         "NC",
+                         "CODEC_INT2_N",
+                         "CODEC_INT1_N",
+                         "APPS_I2C_SDA",
+                         "APPS_I2C_SCL",
+                         "FORCED_USB_BOOT",
+                         "NC",
+                         "NC",
+                         "NC", /* GPIO_60 */
+                         "NC",
+                         "NC",
+                         "TRAY2_DET_DS",
+                         "CODEC_RST_N",
+                         "WSA_L_EN",
+                         "WSA_R_EN",
+                         "NC",
+                         "NC",
+                         "NC",
+                         "LPASS_SLIMBUS_CLK", /* GPIO_70 */
+                         "LPASS_SLIMBUS_DATA0",
+                         "LPASS_SLIMBUS_DATA1",
+                         "BT_FM_SLIMBUS_DATA",
+                         "BT_FM_SLIMBUS_CLK",
+                         "NC",
+                         "RF_LCD_ID_EN",
+                         "NC",
+                         "NC",
+                         "NC",
+                         "NC", /* GPIO_80 */
+                         "SW_SERVICE",
+                         "TX_GTR_THRES_IN",
+                         "HW_ID0",
+                         "HW_ID1",
+                         "NC",
+                         "NC",
+                         "TS_I2C_SDA",
+                         "TS_I2C_SCL",
+                         "TS_RESET_N",
+                         "NC", /* GPIO_90 */
+                         "NC",
+                         "NFC_IRQ",
+                         "NFC_DWLD_EN",
+                         "DISP_RESET_N",
+                         "TRAY2_DET",
+                         "CAM_SOF",
+                         "RFFE6_CLK",
+                         "RFFE6_DATA",
+                         "DEBUG_GPIO0",
+                         "DEBUG_GPIO1", /* GPIO_100 */
+                         "GRFC4",
+                         "NC",
+                         "NC",
+                         "RSVD",
+                         "UIM2_DATA",
+                         "UIM2_CLK",
+                         "UIM2_RESET",
+                         "UIM2_PRESENT",
+                         "UIM1_DATA",
+                         "UIM1_CLK", /* GPIO_110 */
+                         "UIM1_RST",
+                         "UIM1_PRESENT",
+                         "UIM_BATT_ALARM",
+                         "RSVD",
+                         "NC",
+                         "NC",
+                         "ACCEL_INT",
+                         "GYRO_INT",
+                         "COMPASS_INT",
+                         "ALS_PROX_INT_N", /* GPIO_120 */
+                         "FP_INT_N",
+                         "NC",
+                         "BAROMETER_INT",
+                         "ACC_COVER_OPEN",
+                         "TS_INT_N",
+                         "NC",
+                         "NC",
+                         "USB_DETECT_EN",
+                         "NC",
+                         "QLINK_REQUEST", /* GPIO_130 */
+                         "QLINK_ENABLE",
+                         "NC",
+                         "TS_VDDIO_EN",
+                         "WMSS_RESET_N",
+                         "PA_INDICATOR_OR",
+                         "NC",
+                         "RFFE3_DATA",
+                         "RFFE3_CLK",
+                         "RFFE4_DATA",
+                         "RFFE4_CLK", /* GPIO_140 */
+                         "RFFE5_DATA",
+                         "RFFE5_CLK",
+                         "GNSS_EN",
+                         "MSS_LTE_COXM_TXD",
+                         "MSS_LTE_COXM_RXD",
+                         "RFFE2_DATA",
+                         "RFFE2_CLK",
+                         "RFFE1_DATA",
+                         "RFFE1_CLK";
+};
+
 &vreg_l22a_2p85 {
        regulator-min-microvolt = <2704000>;
        regulator-max-microvolt = <2704000>;
diff --git a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
index fa02e45..bb1c1e8 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
@@ -292,6 +292,13 @@
        regulator-soft-start;
 };
 
+&pm8005_gpios {
+       gpio-line-names = "NC", /* GPIO_1 */
+                         "NC",
+                         "SLB",
+                         "OPTION_1_PM8005";
+};
+
 &pm8005_regulators {
        /* VDD_GFX supply */
        pm8005_s1: s1 {
@@ -304,6 +311,33 @@
 };
 
 &pm8998_gpios {
+       gpio-line-names = "UIM_BATT_ALARM", /* GPIO_1 */
+                         "NC",
+                         "WLAN_SW_CTRL (DISALLOWED)",
+                         "SSC_PWR_EN",
+                         "VOL_DOWN_N",
+                         "VOL_UP_N",
+                         "SNAPSHOT_N",
+                         "FOCUS_N",
+                         "FLASH_THERM",
+                         "", /* GPIO_10 */
+                         "",
+                         "",
+                         "DIV_CLK1",
+                         "NC",
+                         "NC (DISALLOWED)",
+                         "DIV_CLK3",
+                         "NC",
+                         "NC",
+                         "NC",
+                         "NC (DISALLOWED)", /* GPIO_20 */
+                         "NFC_CLK_REQ",
+                         "NC (DISALLOWED)",
+                         "WCSS_PWR_REQ",
+                         "OPTION_1 (DISALLOWED)",
+                         "OPTION_2 (DISALLOWED)",
+                         "PM_SLB (DISALLOWED)";
+
        vol_down_pin_a: vol-down-active-state {
                pins = "gpio5";
                function = PMIC_GPIO_FUNC_NORMAL;
@@ -336,6 +370,21 @@
 };
 
 &pmi8998_gpios {
+       gpio-line-names = "MAIN_CAM_PWR_IO_EN", /* GPIO_1 */
+                         "NC",
+                         "NC",
+                         "TYPEC_UUSB_SEL",
+                         "VIB_LDO_EN",
+                         "NC",
+                         "DISPLAY_TYPE_SEL",
+                         "NC",
+                         "NC",
+                         "NC", /* GPIO_10 */
+                         "NC",
+                         "DIV_CLK3",
+                         "SPMI_I2C_SEL",
+                         "NC";
+
        cam_vio_default: cam-vio-active-state {
                pins = "gpio1";
                function = PMIC_GPIO_FUNC_NORMAL;
@@ -590,6 +639,156 @@
 
 &tlmm {
        gpio-reserved-ranges = <0 4>, <81 4>;
+       gpio-line-names = "", /* GPIO_0 */
+                         "",
+                         "",
+                         "",
+                         "DEBUG_UART_TX",
+                         "DEBUG_UART_RX",
+                         "CAMSENSOR_I2C_SDA",
+                         "CAMSENSOR_I2C_SCL",
+                         "NC",
+                         "NC",
+                         "MDP_VSYNC_P", /* GPIO_10 */
+                         "RGBC_IR_INT",
+                         "NFC_VEN",
+                         "CAM_MCLK0",
+                         "CAM_MCLK1",
+                         "NC",
+                         "NC",
+                         "CCI_I2C_SDA0",
+                         "CCI_I2C_SCL0",
+                         "CCI_I2C_SDA1",
+                         "CCI_I2C_SCL1", /* GPIO_20 */
+                         "MAIN_CAM_PWR_EN",
+                         "TOF_INT_N",
+                         "NC",
+                         "NC",
+                         "CHAT_CAM_PWR_EN",
+                         "NC",
+                         "TOF_RESET_N",
+                         "CAM2_RSTN",
+                         "NC",
+                         "CAM1_RSTN", /* GPIO_30 */
+                         "NC",
+                         "NC",
+                         "NC",
+                         "NC",
+                         "NC",
+                         "NC",
+                         "NC",
+                         "CC_DIR",
+                         "UIM2_DETECT_EN",
+                         "FP_RESET_N", /* GPIO_40 */
+                         "NC",
+                         "NC",
+                         "NC",
+                         "NC",
+                         "BT_HCI_UART_TXD",
+                         "BT_HCI_UART_RXD",
+                         "BT_HCI_UART_CTS_N",
+                         "BT_HCI_UART_RFR_N",
+                         "NC",
+                         "NC", /* GPIO_50 */
+                         "NC",
+                         "NC",
+                         "CODEC_INT2_N",
+                         "CODEC_INT1_N",
+                         "APPS_I2C_SDA",
+                         "APPS_I2C_SCL",
+                         "FORCED_USB_BOOT",
+                         "NC",
+                         "NC",
+                         "NC", /* GPIO_60 */
+                         "NC",
+                         "NC",
+                         "TRAY2_DET_DS",
+                         "CODEC_RST_N",
+                         "WSA_L_EN",
+                         "WSA_R_EN",
+                         "NC",
+                         "NC",
+                         "NC",
+                         "LPASS_SLIMBUS_CLK", /* GPIO_70 */
+                         "LPASS_SLIMBUS_DATA0",
+                         "LPASS_SLIMBUS_DATA1",
+                         "BT_FM_SLIMBUS_DATA",
+                         "BT_FM_SLIMBUS_CLK",
+                         "NC",
+                         "RF_LCD_ID_EN",
+                         "NC",
+                         "NC",
+                         "NC",
+                         "NC", /* GPIO_80 */
+                         "SW_SERVICE",
+                         "TX_GTR_THRES_IN",
+                         "HW_ID0",
+                         "HW_ID1",
+                         "NC",
+                         "NC",
+                         "TS_I2C_SDA",
+                         "TS_I2C_SCL",
+                         "TS_RESET_N",
+                         "NC", /* GPIO_90 */
+                         "NC",
+                         "NFC_IRQ",
+                         "NFC_DWLD_EN",
+                         "DISP_RESET_N",
+                         "TRAY2_DET",
+                         "CAM_SOF",
+                         "RFFE6_CLK",
+                         "RFFE6_DATA",
+                         "DEBUG_GPIO0",
+                         "DEBUG_GPIO1", /* GPIO_100 */
+                         "GRFC4",
+                         "NC",
+                         "NC",
+                         "RSVD",
+                         "UIM2_DATA",
+                         "UIM2_CLK",
+                         "UIM2_RESET",
+                         "UIM2_PRESENT",
+                         "UIM1_DATA",
+                         "UIM1_CLK", /* GPIO_110 */
+                         "UIM1_RST",
+                         "UIM1_PRESENT",
+                         "UIM_BATT_ALARM",
+                         "RSVD",
+                         "NC",
+                         "NC",
+                         "ACCEL_INT",
+                         "GYRO_INT",
+                         "COMPASS_INT",
+                         "ALS_PROX_INT_N", /* GPIO_120 */
+                         "FP_INT_N",
+                         "NC",
+                         "BAROMETER_INT",
+                         "ACC_COVER_OPEN",
+                         "TS_INT_N",
+                         "NC",
+                         "NC",
+                         "USB_DETECT_EN",
+                         "NC",
+                         "QLINK_REQUEST", /* GPIO_130 */
+                         "QLINK_ENABLE",
+                         "NC",
+                         "NC",
+                         "WMSS_RESET_N",
+                         "PA_INDICATOR_OR",
+                         "NC",
+                         "RFFE3_DATA",
+                         "RFFE3_CLK",
+                         "RFFE4_DATA",
+                         "RFFE4_CLK", /* GPIO_140 */
+                         "RFFE5_DATA",
+                         "RFFE5_CLK",
+                         "GNSS_EN",
+                         "MSS_LTE_COXM_TXD",
+                         "MSS_LTE_COXM_RXD",
+                         "RFFE2_DATA",
+                         "RFFE2_CLK",
+                         "RFFE1_DATA",
+                         "RFFE1_CLK";
 
        mdp_vsync_n: mdp-vsync-n-state {
                pins = "gpio10";
Domain: System / Kernel;