tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
arm64: dts: qcom: msm8998-yoshino: Use SONY GPIO names
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
authored by
Konrad Dybcio
and committed by
Bjorn Andersson
900007f2
d20ad168
+374
+175
arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts
+175
arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts
···
37
37
qcom,soft-start-us = <200>;
38
38
};
39
39
40
+
&pm8005_gpios {
41
+
gpio-line-names = "EAR_EN", /* GPIO_1 */
42
+
"NC",
43
+
"SLB",
44
+
"OPTION_1_PM8005";
45
+
};
46
+
40
47
&pmi8998_gpios {
48
+
gpio-line-names = "MAIN_CAM_PWR_IO_EN", /* GPIO_1 */
49
+
"NC",
50
+
"NC",
51
+
"TYPEC_UUSB_SEL",
52
+
"VIB_LDO_EN",
53
+
"NC",
54
+
"DISPLAY_TYPE_SEL",
55
+
"USB_SWITCH_SEL",
56
+
"NC",
57
+
"4K_DISP_DCDC_EN", /* GPIO_10 */
58
+
"NC",
59
+
"DIV_CLK3",
60
+
"SPMI_I2C_SEL",
61
+
"NC";
62
+
41
63
disp_dvdd_en: disp-dvdd-en-active-state {
42
64
pins = "gpio10";
43
65
function = "normal";
···
69
47
power-source = <0>;
70
48
qcom,drive-strength = <1>;
71
49
};
50
+
};
51
+
52
+
&tlmm {
53
+
gpio-line-names = "", /* GPIO_0 */
54
+
"",
55
+
"",
56
+
"",
57
+
"DEBUG_UART_TX",
58
+
"DEBUG_UART_RX",
59
+
"CAMSENSOR_I2C_SDA",
60
+
"CAMSENSOR_I2C_SCL",
61
+
"NC",
62
+
"NC",
63
+
"MDP_VSYNC_P", /* GPIO_10 */
64
+
"RGBC_IR_INT",
65
+
"NFC_VEN",
66
+
"CAM_MCLK0",
67
+
"CAM_MCLK1",
68
+
"NC",
69
+
"NC",
70
+
"CCI_I2C_SDA0",
71
+
"CCI_I2C_SCL0",
72
+
"CCI_I2C_SDA1",
73
+
"CCI_I2C_SCL1", /* GPIO_20 */
74
+
"MAIN_CAM_PWR_EN",
75
+
"TOF_INT_N",
76
+
"NC",
77
+
"NC",
78
+
"CHAT_CAM_PWR_EN",
79
+
"NC",
80
+
"TOF_RESET_N",
81
+
"CAM2_RSTN",
82
+
"NC",
83
+
"CAM1_RSTN", /* GPIO_30 */
84
+
"NC",
85
+
"NC",
86
+
"NC",
87
+
"NC",
88
+
"NC",
89
+
"NC",
90
+
"NC",
91
+
"CC_DIR",
92
+
"UIM2_DETECT_EN",
93
+
"FP_RESET_N", /* GPIO_40 */
94
+
"NC",
95
+
"NC",
96
+
"NC",
97
+
"NC",
98
+
"BT_HCI_UART_TXD",
99
+
"BT_HCI_UART_RXD",
100
+
"BT_HCI_UART_CTS_N",
101
+
"BT_HCI_UART_RFR_N",
102
+
"NC",
103
+
"NC", /* GPIO_50 */
104
+
"NC",
105
+
"NC",
106
+
"CODEC_INT2_N",
107
+
"CODEC_INT1_N",
108
+
"APPS_I2C_SDA",
109
+
"APPS_I2C_SCL",
110
+
"FORCED_USB_BOOT",
111
+
"NC",
112
+
"NC",
113
+
"NC", /* GPIO_60 */
114
+
"NC",
115
+
"NC",
116
+
"TRAY2_DET_DS",
117
+
"CODEC_RST_N",
118
+
"WSA_L_EN",
119
+
"WSA_R_EN",
120
+
"NC",
121
+
"NC",
122
+
"NC",
123
+
"LPASS_SLIMBUS_CLK", /* GPIO_70 */
124
+
"LPASS_SLIMBUS_DATA0",
125
+
"LPASS_SLIMBUS_DATA1",
126
+
"BT_FM_SLIMBUS_DATA",
127
+
"BT_FM_SLIMBUS_CLK",
128
+
"NC",
129
+
"RF_LCD_ID_EN",
130
+
"NC",
131
+
"NC",
132
+
"NC",
133
+
"NC", /* GPIO_80 */
134
+
"SW_SERVICE",
135
+
"TX_GTR_THRES_IN",
136
+
"HW_ID0",
137
+
"HW_ID1",
138
+
"NC",
139
+
"NC",
140
+
"TS_I2C_SDA",
141
+
"TS_I2C_SCL",
142
+
"TS_RESET_N",
143
+
"NC", /* GPIO_90 */
144
+
"NC",
145
+
"NFC_IRQ",
146
+
"NFC_DWLD_EN",
147
+
"DISP_RESET_N",
148
+
"TRAY2_DET",
149
+
"CAM_SOF",
150
+
"RFFE6_CLK",
151
+
"RFFE6_DATA",
152
+
"DEBUG_GPIO0",
153
+
"DEBUG_GPIO1", /* GPIO_100 */
154
+
"GRFC4",
155
+
"NC",
156
+
"NC",
157
+
"RSVD",
158
+
"UIM2_DATA",
159
+
"UIM2_CLK",
160
+
"UIM2_RESET",
161
+
"UIM2_PRESENT",
162
+
"UIM1_DATA",
163
+
"UIM1_CLK", /* GPIO_110 */
164
+
"UIM1_RST",
165
+
"UIM1_PRESENT",
166
+
"UIM_BATT_ALARM",
167
+
"RSVD",
168
+
"NC",
169
+
"NC",
170
+
"ACCEL_INT",
171
+
"GYRO_INT",
172
+
"COMPASS_INT",
173
+
"ALS_PROX_INT_N", /* GPIO_120 */
174
+
"FP_INT_N",
175
+
"NC",
176
+
"BAROMETER_INT",
177
+
"ACC_COVER_OPEN",
178
+
"TS_INT_N",
179
+
"NC",
180
+
"NC",
181
+
"USB_DETECT_EN",
182
+
"NC",
183
+
"QLINK_REQUEST", /* GPIO_130 */
184
+
"QLINK_ENABLE",
185
+
"NC",
186
+
"TS_VDDIO_EN",
187
+
"WMSS_RESET_N",
188
+
"PA_INDICATOR_OR",
189
+
"NC",
190
+
"RFFE3_DATA",
191
+
"RFFE3_CLK",
192
+
"RFFE4_DATA",
193
+
"RFFE4_CLK", /* GPIO_140 */
194
+
"RFFE5_DATA",
195
+
"RFFE5_CLK",
196
+
"GNSS_EN",
197
+
"MSS_LTE_COXM_TXD",
198
+
"MSS_LTE_COXM_RXD",
199
+
"RFFE2_DATA",
200
+
"RFFE2_CLK",
201
+
"RFFE1_DATA",
202
+
"RFFE1_CLK";
72
203
};
73
204
74
205
&vreg_l22a_2p85 {
+199
arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
+199
arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
···
292
292
regulator-soft-start;
293
293
};
294
294
295
+
&pm8005_gpios {
296
+
gpio-line-names = "NC", /* GPIO_1 */
297
+
"NC",
298
+
"SLB",
299
+
"OPTION_1_PM8005";
300
+
};
301
+
295
302
&pm8005_regulators {
296
303
/* VDD_GFX supply */
297
304
pm8005_s1: s1 {
···
311
304
};
312
305
313
306
&pm8998_gpios {
307
+
gpio-line-names = "UIM_BATT_ALARM", /* GPIO_1 */
308
+
"NC",
309
+
"WLAN_SW_CTRL (DISALLOWED)",
310
+
"SSC_PWR_EN",
311
+
"VOL_DOWN_N",
312
+
"VOL_UP_N",
313
+
"SNAPSHOT_N",
314
+
"FOCUS_N",
315
+
"FLASH_THERM",
316
+
"", /* GPIO_10 */
317
+
"",
318
+
"",
319
+
"DIV_CLK1",
320
+
"NC",
321
+
"NC (DISALLOWED)",
322
+
"DIV_CLK3",
323
+
"NC",
324
+
"NC",
325
+
"NC",
326
+
"NC (DISALLOWED)", /* GPIO_20 */
327
+
"NFC_CLK_REQ",
328
+
"NC (DISALLOWED)",
329
+
"WCSS_PWR_REQ",
330
+
"OPTION_1 (DISALLOWED)",
331
+
"OPTION_2 (DISALLOWED)",
332
+
"PM_SLB (DISALLOWED)";
333
+
314
334
vol_down_pin_a: vol-down-active-state {
315
335
pins = "gpio5";
316
336
function = PMIC_GPIO_FUNC_NORMAL;
···
370
336
};
371
337
372
338
&pmi8998_gpios {
339
+
gpio-line-names = "MAIN_CAM_PWR_IO_EN", /* GPIO_1 */
340
+
"NC",
341
+
"NC",
342
+
"TYPEC_UUSB_SEL",
343
+
"VIB_LDO_EN",
344
+
"NC",
345
+
"DISPLAY_TYPE_SEL",
346
+
"NC",
347
+
"NC",
348
+
"NC", /* GPIO_10 */
349
+
"NC",
350
+
"DIV_CLK3",
351
+
"SPMI_I2C_SEL",
352
+
"NC";
353
+
373
354
cam_vio_default: cam-vio-active-state {
374
355
pins = "gpio1";
375
356
function = PMIC_GPIO_FUNC_NORMAL;
···
639
590
640
591
&tlmm {
641
592
gpio-reserved-ranges = <0 4>, <81 4>;
593
+
gpio-line-names = "", /* GPIO_0 */
594
+
"",
595
+
"",
596
+
"",
597
+
"DEBUG_UART_TX",
598
+
"DEBUG_UART_RX",
599
+
"CAMSENSOR_I2C_SDA",
600
+
"CAMSENSOR_I2C_SCL",
601
+
"NC",
602
+
"NC",
603
+
"MDP_VSYNC_P", /* GPIO_10 */
604
+
"RGBC_IR_INT",
605
+
"NFC_VEN",
606
+
"CAM_MCLK0",
607
+
"CAM_MCLK1",
608
+
"NC",
609
+
"NC",
610
+
"CCI_I2C_SDA0",
611
+
"CCI_I2C_SCL0",
612
+
"CCI_I2C_SDA1",
613
+
"CCI_I2C_SCL1", /* GPIO_20 */
614
+
"MAIN_CAM_PWR_EN",
615
+
"TOF_INT_N",
616
+
"NC",
617
+
"NC",
618
+
"CHAT_CAM_PWR_EN",
619
+
"NC",
620
+
"TOF_RESET_N",
621
+
"CAM2_RSTN",
622
+
"NC",
623
+
"CAM1_RSTN", /* GPIO_30 */
624
+
"NC",
625
+
"NC",
626
+
"NC",
627
+
"NC",
628
+
"NC",
629
+
"NC",
630
+
"NC",
631
+
"CC_DIR",
632
+
"UIM2_DETECT_EN",
633
+
"FP_RESET_N", /* GPIO_40 */
634
+
"NC",
635
+
"NC",
636
+
"NC",
637
+
"NC",
638
+
"BT_HCI_UART_TXD",
639
+
"BT_HCI_UART_RXD",
640
+
"BT_HCI_UART_CTS_N",
641
+
"BT_HCI_UART_RFR_N",
642
+
"NC",
643
+
"NC", /* GPIO_50 */
644
+
"NC",
645
+
"NC",
646
+
"CODEC_INT2_N",
647
+
"CODEC_INT1_N",
648
+
"APPS_I2C_SDA",
649
+
"APPS_I2C_SCL",
650
+
"FORCED_USB_BOOT",
651
+
"NC",
652
+
"NC",
653
+
"NC", /* GPIO_60 */
654
+
"NC",
655
+
"NC",
656
+
"TRAY2_DET_DS",
657
+
"CODEC_RST_N",
658
+
"WSA_L_EN",
659
+
"WSA_R_EN",
660
+
"NC",
661
+
"NC",
662
+
"NC",
663
+
"LPASS_SLIMBUS_CLK", /* GPIO_70 */
664
+
"LPASS_SLIMBUS_DATA0",
665
+
"LPASS_SLIMBUS_DATA1",
666
+
"BT_FM_SLIMBUS_DATA",
667
+
"BT_FM_SLIMBUS_CLK",
668
+
"NC",
669
+
"RF_LCD_ID_EN",
670
+
"NC",
671
+
"NC",
672
+
"NC",
673
+
"NC", /* GPIO_80 */
674
+
"SW_SERVICE",
675
+
"TX_GTR_THRES_IN",
676
+
"HW_ID0",
677
+
"HW_ID1",
678
+
"NC",
679
+
"NC",
680
+
"TS_I2C_SDA",
681
+
"TS_I2C_SCL",
682
+
"TS_RESET_N",
683
+
"NC", /* GPIO_90 */
684
+
"NC",
685
+
"NFC_IRQ",
686
+
"NFC_DWLD_EN",
687
+
"DISP_RESET_N",
688
+
"TRAY2_DET",
689
+
"CAM_SOF",
690
+
"RFFE6_CLK",
691
+
"RFFE6_DATA",
692
+
"DEBUG_GPIO0",
693
+
"DEBUG_GPIO1", /* GPIO_100 */
694
+
"GRFC4",
695
+
"NC",
696
+
"NC",
697
+
"RSVD",
698
+
"UIM2_DATA",
699
+
"UIM2_CLK",
700
+
"UIM2_RESET",
701
+
"UIM2_PRESENT",
702
+
"UIM1_DATA",
703
+
"UIM1_CLK", /* GPIO_110 */
704
+
"UIM1_RST",
705
+
"UIM1_PRESENT",
706
+
"UIM_BATT_ALARM",
707
+
"RSVD",
708
+
"NC",
709
+
"NC",
710
+
"ACCEL_INT",
711
+
"GYRO_INT",
712
+
"COMPASS_INT",
713
+
"ALS_PROX_INT_N", /* GPIO_120 */
714
+
"FP_INT_N",
715
+
"NC",
716
+
"BAROMETER_INT",
717
+
"ACC_COVER_OPEN",
718
+
"TS_INT_N",
719
+
"NC",
720
+
"NC",
721
+
"USB_DETECT_EN",
722
+
"NC",
723
+
"QLINK_REQUEST", /* GPIO_130 */
724
+
"QLINK_ENABLE",
725
+
"NC",
726
+
"NC",
727
+
"WMSS_RESET_N",
728
+
"PA_INDICATOR_OR",
729
+
"NC",
730
+
"RFFE3_DATA",
731
+
"RFFE3_CLK",
732
+
"RFFE4_DATA",
733
+
"RFFE4_CLK", /* GPIO_140 */
734
+
"RFFE5_DATA",
735
+
"RFFE5_CLK",
736
+
"GNSS_EN",
737
+
"MSS_LTE_COXM_TXD",
738
+
"MSS_LTE_COXM_RXD",
739
+
"RFFE2_DATA",
740
+
"RFFE2_CLK",
741
+
"RFFE1_DATA",
742
+
"RFFE1_CLK";
642
743
643
744
mdp_vsync_n: mdp-vsync-n-state {
644
745
pins = "gpio10";