forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-01-04 1543e317f1da31b75942316931e8f491a8920811 
 kernel/drivers/pinctrl/qcom/pinctrl-msm8998.c
....@@ -581,16 +581,8 @@
581581 	msm_mux_tgu_ch1,
582582 	msm_mux_tsense_pwm1,
583583 	msm_mux_tsense_pwm2,
584
-	msm_mux_tsif1_clk,
585
-	msm_mux_tsif1_data,
586
-	msm_mux_tsif1_en,
587
-	msm_mux_tsif1_error,
588
-	msm_mux_tsif1_sync,
589
-	msm_mux_tsif2_clk,
590
-	msm_mux_tsif2_data,
591
-	msm_mux_tsif2_en,
592
-	msm_mux_tsif2_error,
593
-	msm_mux_tsif2_sync,
584
+	msm_mux_tsif0,
585
+	msm_mux_tsif1,
594586 	msm_mux_uim1_clk,
595587 	msm_mux_uim1_data,
596588 	msm_mux_uim1_present,
....@@ -691,9 +683,6 @@
691683 };
692684 static const char * const bimc_dte1_groups[] = {
693685 	"gpio8", "gpio10",
694
-};
695
-static const char * const tsif1_sync_groups[] = {
696
-	"gpio9",
697686 };
698687 static const char * const wlan1_adc0_groups[] = {
699688 	"gpio9",
....@@ -861,9 +850,6 @@
861850 	"gpio39", "gpio70", "gpio71", "gpio72",
862851 };
863852 static const char * const sd_write_groups[] = {
864
-	"gpio40",
865
-};
866
-static const char * const tsif1_error_groups[] = {
867853 	"gpio40",
868854 };
869855 static const char * const blsp_spi6_groups[] = {
....@@ -1048,11 +1034,8 @@
10481034 static const char * const blsp_i2c5_groups[] = {
10491035 	"gpio87", "gpio88",
10501036 };
1051
-static const char * const tsif1_clk_groups[] = {
1052
-	"gpio89",
1053
-};
1054
-static const char * const tsif1_en_groups[] = {
1055
-	"gpio90",
1037
+static const char * const tsif0_groups[] = {
1038
+	"gpio9", "gpio40", "gpio89", "gpio90", "gpio91",
10561039 };
10571040 static const char * const mdp_vsync0_groups[] = {
10581041 	"gpio90",
....@@ -1075,17 +1058,14 @@
10751058 static const char * const qdss_cti1_b_groups[] = {
10761059 	"gpio90", "gpio91",
10771060 };
1078
-static const char * const tsif1_data_groups[] = {
1079
-	"gpio91",
1080
-};
10811061 static const char * const sdc4_cmd_groups[] = {
10821062 	"gpio91",
10831063 };
10841064 static const char * const tgu_ch1_groups[] = {
10851065 	"gpio91",
10861066 };
1087
-static const char * const tsif2_error_groups[] = {
1088
-	"gpio92",
1067
+static const char * const tsif1_groups[] = {
1068
+	"gpio92", "gpio93", "gpio94", "gpio95", "gpio96",
10891069 };
10901070 static const char * const sdc43_groups[] = {
10911071 	"gpio92",
....@@ -1093,14 +1073,8 @@
10931073 static const char * const vfr_1_groups[] = {
10941074 	"gpio92",
10951075 };
1096
-static const char * const tsif2_clk_groups[] = {
1097
-	"gpio93",
1098
-};
10991076 static const char * const sdc4_clk_groups[] = {
11001077 	"gpio93",
1101
-};
1102
-static const char * const tsif2_en_groups[] = {
1103
-	"gpio94",
11041078 };
11051079 static const char * const sdc42_groups[] = {
11061080 	"gpio94",
....@@ -1108,14 +1082,8 @@
11081082 static const char * const sd_card_groups[] = {
11091083 	"gpio95",
11101084 };
1111
-static const char * const tsif2_data_groups[] = {
1112
-	"gpio95",
1113
-};
11141085 static const char * const sdc41_groups[] = {
11151086 	"gpio95",
1116
-};
1117
-static const char * const tsif2_sync_groups[] = {
1118
-	"gpio96",
11191087 };
11201088 static const char * const sdc40_groups[] = {
11211089 	"gpio96",
....@@ -1355,16 +1323,8 @@
13551323 	FUNCTION(tgu_ch1),
13561324 	FUNCTION(tsense_pwm1),
13571325 	FUNCTION(tsense_pwm2),
1358
-	FUNCTION(tsif1_clk),
1359
-	FUNCTION(tsif1_data),
1360
-	FUNCTION(tsif1_en),
1361
-	FUNCTION(tsif1_error),
1362
-	FUNCTION(tsif1_sync),
1363
-	FUNCTION(tsif2_clk),
1364
-	FUNCTION(tsif2_data),
1365
-	FUNCTION(tsif2_en),
1366
-	FUNCTION(tsif2_error),
1367
-	FUNCTION(tsif2_sync),
1326
+	FUNCTION(tsif0),
1327
+	FUNCTION(tsif1),
13681328 	FUNCTION(uim1_clk),
13691329 	FUNCTION(uim1_data),
13701330 	FUNCTION(uim1_present),
....@@ -1396,7 +1356,7 @@
13961356 	PINGROUP(6, WEST, blsp_spi8, blsp_uart8_a, blsp_i2c8, _, _, _, _, _, _),
13971357 	PINGROUP(7, WEST, blsp_spi8, blsp_uart8_a, blsp_i2c8, ddr_bist, _, atest_tsens2, atest_usb1, _, _),
13981358 	PINGROUP(8, EAST, blsp_spi4, blsp_uart1_b, blsp_uim1_b, _, ddr_bist, _, wlan1_adc1, atest_usb13, bimc_dte1),
1399
-	PINGROUP(9, EAST, blsp_spi4, blsp_uart1_b, blsp_uim1_b, tsif1_sync, ddr_bist, _, wlan1_adc0, atest_usb12, bimc_dte0),
1359
+	PINGROUP(9, EAST, blsp_spi4, blsp_uart1_b, blsp_uim1_b, tsif0, ddr_bist, _, wlan1_adc0, atest_usb12, bimc_dte0),
14001360 	PINGROUP(10, EAST, mdp_vsync_a, blsp_spi4, blsp_uart1_b, blsp_i2c4, ddr_bist, atest_gpsadc1, wlan2_adc1, atest_usb11, bimc_dte1),
14011361 	PINGROUP(11, EAST, mdp_vsync_a, edp_lcd, blsp_spi4, blsp_uart1_b, blsp_i2c4, dbg_out, atest_gpsadc0, wlan2_adc0, atest_usb10),
14021362 	PINGROUP(12, EAST, mdp_vsync, m_voc, _, _, _, _, _, _, _),
....@@ -1427,7 +1387,7 @@
14271387 	PINGROUP(37, NORTH, agera_pll, _, _, _, _, _, _, _, _),
14281388 	PINGROUP(38, WEST, usb_phy, _, _, _, _, _, _, _, _),
14291389 	PINGROUP(39, WEST, lpass_slimbus, _, _, _, _, _, _, _, _),
1430
-	PINGROUP(40, EAST, sd_write, tsif1_error, _, _, _, _, _, _, _),
1390
+	PINGROUP(40, EAST, sd_write, tsif0, _, _, _, _, _, _, _),
14311391 	PINGROUP(41, EAST, blsp_spi6, blsp_uart3_b, blsp_uim3_b, _, qdss, _, _, _, _),
14321392 	PINGROUP(42, EAST, blsp_spi6, blsp_uart3_b, blsp_uim3_b, _, qdss, _, _, _, _),
14331393 	PINGROUP(43, EAST, blsp_spi6, blsp_uart3_b, blsp_i2c6, _, qdss, _, _, _, _),
....@@ -1476,14 +1436,14 @@
14761436 	PINGROUP(86, EAST, blsp_spi5, blsp_uart2_b, blsp_uim2_b, _, _, _, _, _, _),
14771437 	PINGROUP(87, EAST, blsp_spi5, blsp_uart2_b, blsp_i2c5, _, _, _, _, _, _),
14781438 	PINGROUP(88, EAST, blsp_spi5, blsp_uart2_b, blsp_i2c5, _, _, _, _, _, _),
1479
-	PINGROUP(89, EAST, tsif1_clk, phase_flag, _, _, _, _, _, _, _),
1480
-	PINGROUP(90, EAST, tsif1_en, mdp_vsync0, mdp_vsync1, mdp_vsync2, mdp_vsync3, blsp1_spi, tgu_ch0, qdss_cti1_b, _),
1481
-	PINGROUP(91, EAST, tsif1_data, sdc4_cmd, tgu_ch1, phase_flag, qdss_cti1_b, _, _, _, _),
1482
-	PINGROUP(92, EAST, tsif2_error, sdc43, vfr_1, phase_flag, _, _, _, _, _),
1483
-	PINGROUP(93, EAST, tsif2_clk, sdc4_clk, _, qdss, _, _, _, _, _),
1484
-	PINGROUP(94, EAST, tsif2_en, sdc42, _, _, _, _, _, _, _),
1485
-	PINGROUP(95, EAST, tsif2_data, sdc41, _, _, _, _, _, _, _),
1486
-	PINGROUP(96, EAST, tsif2_sync, sdc40, phase_flag, _, _, _, _, _, _),
1439
+	PINGROUP(89, EAST, tsif0, phase_flag, _, _, _, _, _, _, _),
1440
+	PINGROUP(90, EAST, tsif0, mdp_vsync0, mdp_vsync1, mdp_vsync2, mdp_vsync3, blsp1_spi, tgu_ch0, qdss_cti1_b, _),
1441
+	PINGROUP(91, EAST, tsif0, sdc4_cmd, tgu_ch1, phase_flag, qdss_cti1_b, _, _, _, _),
1442
+	PINGROUP(92, EAST, tsif1, sdc43, vfr_1, phase_flag, _, _, _, _, _),
1443
+	PINGROUP(93, EAST, tsif1, sdc4_clk, _, qdss, _, _, _, _, _),
1444
+	PINGROUP(94, EAST, tsif1, sdc42, _, _, _, _, _, _, _),
1445
+	PINGROUP(95, EAST, tsif1, sdc41, _, _, _, _, _, _, _),
1446
+	PINGROUP(96, EAST, tsif1, sdc40, phase_flag, _, _, _, _, _, _),
14871447 	PINGROUP(97, WEST, _, mdp_vsync_b, ldo_en, _, _, _, _, _, _),
14881448 	PINGROUP(98, WEST, _, mdp_vsync_b, ldo_update, _, _, _, _, _, _),
14891449 	PINGROUP(99, WEST, _, _, _, _, _, _, _, _, _),