[v2] pinctrl: msm8998: Squash TSIF pins together

Commit Message

Marc Gonzalez July 4, 2019, 8:57 a.m. UTC

TSIF is the Transport Stream Interface.
First, rename tsif1 to tsif0, and tsif2 to tsif1.
Then squash all 5 tsif0 pins into a single function.
Same for tsif1.

Signed-off-by: Marc Gonzalez <[e-mail]>
---
Changes from v1:
- Reword commit message for clarity (hopefully)
- Drop unrelated change in qcom,msm8998-pinctrl.txt
- CC DT
---
 .../bindings/pinctrl/qcom,msm8998-pinctrl.txt |  5 +-
 drivers/pinctrl/qcom/pinctrl-msm8998.c        | 76 +++++--------------
 2 files changed, 20 insertions(+), 61 deletions(-)

Comments

Bjorn Andersson July 4, 2019, 4:35 p.m. UTC | #1

On Thu 04 Jul 01:57 PDT 2019, Marc Gonzalez wrote:

> TSIF is the Transport Stream Interface.
> First, rename tsif1 to tsif0, and tsif2 to tsif1.
> Then squash all 5 tsif0 pins into a single function.
> Same for tsif1.
> 
> Signed-off-by: Marc Gonzalez <[e-mail]>

Thanks for the respin Marc.

Reviewed-by: Bjorn Andersson <[e-mail]>

Regards,
Bjorn

> ---
> Changes from v1:
> - Reword commit message for clarity (hopefully)
> - Drop unrelated change in qcom,msm8998-pinctrl.txt
> - CC DT
> ---
>  .../bindings/pinctrl/qcom,msm8998-pinctrl.txt |  5 +-
>  drivers/pinctrl/qcom/pinctrl-msm8998.c        | 76 +++++--------------
>  2 files changed, 20 insertions(+), 61 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.txt
> index 00174f08ba1d..18e3f3d3e3c5 100644
> --- a/Documentation/devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.txt
> +++ b/Documentation/devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.txt
> @@ -124,9 +124,8 @@ to specify in a pin configuration subnode:
>  		    qlink_request, qua_mi2s, sd_card, sd_write, sdc40, sdc41,
>  		    sdc42, sdc43, sdc4_clk, sdc4_cmd, sec_mi2s, sp_cmu,
>  		    spkr_i2s, ssbi1, ssc_irq, ter_mi2s, tgu_ch0, tgu_ch1,
> -		    tsense_pwm1, tsense_pwm2, tsif1_clk, tsif1_data, tsif1_en,
> -		    tsif1_error, tsif1_sync, tsif2_clk, tsif2_data, tsif2_en,
> -		    tsif2_error, tsif2_sync, uim1_clk, uim1_data, uim1_present,
> +		    tsense_pwm1, tsense_pwm2, tsif0, tsif1,
> +		    uim1_clk, uim1_data, uim1_present,
>  		    uim1_reset, uim2_clk, uim2_data, uim2_present, uim2_reset,
>  		    uim_batt, usb_phy, vfr_1, vsense_clkout, vsense_data0,
>  		    vsense_data1, vsense_mode, wlan1_adc0, wlan1_adc1,
> diff --git a/drivers/pinctrl/qcom/pinctrl-msm8998.c b/drivers/pinctrl/qcom/pinctrl-msm8998.c
> index 00d7b94bc3f1..a05f41fe2706 100644
> --- a/drivers/pinctrl/qcom/pinctrl-msm8998.c
> +++ b/drivers/pinctrl/qcom/pinctrl-msm8998.c
> @@ -581,16 +581,8 @@ enum msm8998_functions {
>  	msm_mux_tgu_ch1,
>  	msm_mux_tsense_pwm1,
>  	msm_mux_tsense_pwm2,
> -	msm_mux_tsif1_clk,
> -	msm_mux_tsif1_data,
> -	msm_mux_tsif1_en,
> -	msm_mux_tsif1_error,
> -	msm_mux_tsif1_sync,
> -	msm_mux_tsif2_clk,
> -	msm_mux_tsif2_data,
> -	msm_mux_tsif2_en,
> -	msm_mux_tsif2_error,
> -	msm_mux_tsif2_sync,
> +	msm_mux_tsif0,
> +	msm_mux_tsif1,
>  	msm_mux_uim1_clk,
>  	msm_mux_uim1_data,
>  	msm_mux_uim1_present,
> @@ -692,9 +684,6 @@ static const char * const atest_usb13_groups[] = {
>  static const char * const bimc_dte1_groups[] = {
>  	"gpio8", "gpio10",
>  };
> -static const char * const tsif1_sync_groups[] = {
> -	"gpio9",
> -};
>  static const char * const wlan1_adc0_groups[] = {
>  	"gpio9",
>  };
> @@ -863,9 +852,6 @@ static const char * const lpass_slimbus_groups[] = {
>  static const char * const sd_write_groups[] = {
>  	"gpio40",
>  };
> -static const char * const tsif1_error_groups[] = {
> -	"gpio40",
> -};
>  static const char * const blsp_spi6_groups[] = {
>  	"gpio41", "gpio42", "gpio43", "gpio44",
>  };
> @@ -1048,11 +1034,8 @@ static const char * const blsp_uim2_b_groups[] = {
>  static const char * const blsp_i2c5_groups[] = {
>  	"gpio87", "gpio88",
>  };
> -static const char * const tsif1_clk_groups[] = {
> -	"gpio89",
> -};
> -static const char * const tsif1_en_groups[] = {
> -	"gpio90",
> +static const char * const tsif0_groups[] = {
> +	"gpio9", "gpio40", "gpio89", "gpio90", "gpio91",
>  };
>  static const char * const mdp_vsync0_groups[] = {
>  	"gpio90",
> @@ -1075,17 +1058,14 @@ static const char * const tgu_ch0_groups[] = {
>  static const char * const qdss_cti1_b_groups[] = {
>  	"gpio90", "gpio91",
>  };
> -static const char * const tsif1_data_groups[] = {
> -	"gpio91",
> -};
>  static const char * const sdc4_cmd_groups[] = {
>  	"gpio91",
>  };
>  static const char * const tgu_ch1_groups[] = {
>  	"gpio91",
>  };
> -static const char * const tsif2_error_groups[] = {
> -	"gpio92",
> +static const char * const tsif1_groups[] = {
> +	"gpio92", "gpio93", "gpio94", "gpio95", "gpio96",
>  };
>  static const char * const sdc43_groups[] = {
>  	"gpio92",
> @@ -1093,30 +1073,18 @@ static const char * const sdc43_groups[] = {
>  static const char * const vfr_1_groups[] = {
>  	"gpio92",
>  };
> -static const char * const tsif2_clk_groups[] = {
> -	"gpio93",
> -};
>  static const char * const sdc4_clk_groups[] = {
>  	"gpio93",
>  };
> -static const char * const tsif2_en_groups[] = {
> -	"gpio94",
> -};
>  static const char * const sdc42_groups[] = {
>  	"gpio94",
>  };
>  static const char * const sd_card_groups[] = {
>  	"gpio95",
>  };
> -static const char * const tsif2_data_groups[] = {
> -	"gpio95",
> -};
>  static const char * const sdc41_groups[] = {
>  	"gpio95",
>  };
> -static const char * const tsif2_sync_groups[] = {
> -	"gpio96",
> -};
>  static const char * const sdc40_groups[] = {
>  	"gpio96",
>  };
> @@ -1355,16 +1323,8 @@ static const struct msm_function msm8998_functions[] = {
>  	FUNCTION(tgu_ch1),
>  	FUNCTION(tsense_pwm1),
>  	FUNCTION(tsense_pwm2),
> -	FUNCTION(tsif1_clk),
> -	FUNCTION(tsif1_data),
> -	FUNCTION(tsif1_en),
> -	FUNCTION(tsif1_error),
> -	FUNCTION(tsif1_sync),
> -	FUNCTION(tsif2_clk),
> -	FUNCTION(tsif2_data),
> -	FUNCTION(tsif2_en),
> -	FUNCTION(tsif2_error),
> -	FUNCTION(tsif2_sync),
> +	FUNCTION(tsif0),
> +	FUNCTION(tsif1),
>  	FUNCTION(uim1_clk),
>  	FUNCTION(uim1_data),
>  	FUNCTION(uim1_present),
> @@ -1396,7 +1356,7 @@ static const struct msm_pingroup msm8998_groups[] = {
>  	PINGROUP(6, WEST, blsp_spi8, blsp_uart8_a, blsp_i2c8, _, _, _, _, _, _),
>  	PINGROUP(7, WEST, blsp_spi8, blsp_uart8_a, blsp_i2c8, ddr_bist, _, atest_tsens2, atest_usb1, _, _),
>  	PINGROUP(8, EAST, blsp_spi4, blsp_uart1_b, blsp_uim1_b, _, ddr_bist, _, wlan1_adc1, atest_usb13, bimc_dte1),
> -	PINGROUP(9, EAST, blsp_spi4, blsp_uart1_b, blsp_uim1_b, tsif1_sync, ddr_bist, _, wlan1_adc0, atest_usb12, bimc_dte0),
> +	PINGROUP(9, EAST, blsp_spi4, blsp_uart1_b, blsp_uim1_b, tsif0, ddr_bist, _, wlan1_adc0, atest_usb12, bimc_dte0),
>  	PINGROUP(10, EAST, mdp_vsync_a, blsp_spi4, blsp_uart1_b, blsp_i2c4, ddr_bist, atest_gpsadc1, wlan2_adc1, atest_usb11, bimc_dte1),
>  	PINGROUP(11, EAST, mdp_vsync_a, edp_lcd, blsp_spi4, blsp_uart1_b, blsp_i2c4, dbg_out, atest_gpsadc0, wlan2_adc0, atest_usb10),
>  	PINGROUP(12, EAST, mdp_vsync, m_voc, _, _, _, _, _, _, _),
> @@ -1427,7 +1387,7 @@ static const struct msm_pingroup msm8998_groups[] = {
>  	PINGROUP(37, NORTH, agera_pll, _, _, _, _, _, _, _, _),
>  	PINGROUP(38, WEST, usb_phy, _, _, _, _, _, _, _, _),
>  	PINGROUP(39, WEST, lpass_slimbus, _, _, _, _, _, _, _, _),
> -	PINGROUP(40, EAST, sd_write, tsif1_error, _, _, _, _, _, _, _),
> +	PINGROUP(40, EAST, sd_write, tsif0, _, _, _, _, _, _, _),
>  	PINGROUP(41, EAST, blsp_spi6, blsp_uart3_b, blsp_uim3_b, _, qdss, _, _, _, _),
>  	PINGROUP(42, EAST, blsp_spi6, blsp_uart3_b, blsp_uim3_b, _, qdss, _, _, _, _),
>  	PINGROUP(43, EAST, blsp_spi6, blsp_uart3_b, blsp_i2c6, _, qdss, _, _, _, _),
> @@ -1476,14 +1436,14 @@ static const struct msm_pingroup msm8998_groups[] = {
>  	PINGROUP(86, EAST, blsp_spi5, blsp_uart2_b, blsp_uim2_b, _, _, _, _, _, _),
>  	PINGROUP(87, EAST, blsp_spi5, blsp_uart2_b, blsp_i2c5, _, _, _, _, _, _),
>  	PINGROUP(88, EAST, blsp_spi5, blsp_uart2_b, blsp_i2c5, _, _, _, _, _, _),
> -	PINGROUP(89, EAST, tsif1_clk, phase_flag, _, _, _, _, _, _, _),
> -	PINGROUP(90, EAST, tsif1_en, mdp_vsync0, mdp_vsync1, mdp_vsync2, mdp_vsync3, blsp1_spi, tgu_ch0, qdss_cti1_b, _),
> -	PINGROUP(91, EAST, tsif1_data, sdc4_cmd, tgu_ch1, phase_flag, qdss_cti1_b, _, _, _, _),
> -	PINGROUP(92, EAST, tsif2_error, sdc43, vfr_1, phase_flag, _, _, _, _, _),
> -	PINGROUP(93, EAST, tsif2_clk, sdc4_clk, _, qdss, _, _, _, _, _),
> -	PINGROUP(94, EAST, tsif2_en, sdc42, _, _, _, _, _, _, _),
> -	PINGROUP(95, EAST, tsif2_data, sdc41, _, _, _, _, _, _, _),
> -	PINGROUP(96, EAST, tsif2_sync, sdc40, phase_flag, _, _, _, _, _, _),
> +	PINGROUP(89, EAST, tsif0, phase_flag, _, _, _, _, _, _, _),
> +	PINGROUP(90, EAST, tsif0, mdp_vsync0, mdp_vsync1, mdp_vsync2, mdp_vsync3, blsp1_spi, tgu_ch0, qdss_cti1_b, _),
> +	PINGROUP(91, EAST, tsif0, sdc4_cmd, tgu_ch1, phase_flag, qdss_cti1_b, _, _, _, _),
> +	PINGROUP(92, EAST, tsif1, sdc43, vfr_1, phase_flag, _, _, _, _, _),
> +	PINGROUP(93, EAST, tsif1, sdc4_clk, _, qdss, _, _, _, _, _),
> +	PINGROUP(94, EAST, tsif1, sdc42, _, _, _, _, _, _, _),
> +	PINGROUP(95, EAST, tsif1, sdc41, _, _, _, _, _, _, _),
> +	PINGROUP(96, EAST, tsif1, sdc40, phase_flag, _, _, _, _, _, _),
>  	PINGROUP(97, WEST, _, mdp_vsync_b, ldo_en, _, _, _, _, _, _),
>  	PINGROUP(98, WEST, _, mdp_vsync_b, ldo_update, _, _, _, _, _, _),
>  	PINGROUP(99, WEST, _, _, _, _, _, _, _, _, _),
> -- 
> 2.17.1

Marc Gonzalez July 18, 2019, 9:30 a.m. UTC | #2

On 04/07/2019 18:35, Bjorn Andersson wrote:

> On Thu 04 Jul 01:57 PDT 2019, Marc Gonzalez wrote:
> 
>> TSIF is the Transport Stream Interface.
>> First, rename tsif1 to tsif0, and tsif2 to tsif1.
>> Then squash all 5 tsif0 pins into a single function.
>> Same for tsif1.
>>
>> Signed-off-by: Marc Gonzalez <[e-mail]>
> 
> Thanks for the respin Marc.
> 
> Reviewed-by: Bjorn Andersson <[e-mail]>

Can you or Andy pick it up for inclusion in linux-next?

Regards.

Bjorn Andersson July 18, 2019, 1:34 p.m. UTC | #3

On Thu 18 Jul 02:30 PDT 2019, Marc Gonzalez wrote:

> On 04/07/2019 18:35, Bjorn Andersson wrote:
> 
> > On Thu 04 Jul 01:57 PDT 2019, Marc Gonzalez wrote:
> > 
> >> TSIF is the Transport Stream Interface.
> >> First, rename tsif1 to tsif0, and tsif2 to tsif1.
> >> Then squash all 5 tsif0 pins into a single function.
> >> Same for tsif1.
> >>
> >> Signed-off-by: Marc Gonzalez <[e-mail]>
> > 
> > Thanks for the respin Marc.
> > 
> > Reviewed-by: Bjorn Andersson <[e-mail]>
> 
> Can you or Andy pick it up for inclusion in linux-next?
> 

This is Linus' subsystem, so I expect that he will pick it up after the
merge window closes.

Regards,
Bjorn

Rob Herring (Arm) July 22, 2019, 11:53 p.m. UTC | #4

On Thu, Jul 04, 2019 at 10:57:06AM +0200, Marc Gonzalez wrote:
> TSIF is the Transport Stream Interface.
> First, rename tsif1 to tsif0, and tsif2 to tsif1.
> Then squash all 5 tsif0 pins into a single function.
> Same for tsif1.

Doesn't this break backwards compatibility? If so, you should say so and 
say why that's okay for this platform. In any case, whether it's a 
problem or not is up to the platform maintainer(s). 

> 
> Signed-off-by: Marc Gonzalez <[e-mail]>
> ---
> Changes from v1:
> - Reword commit message for clarity (hopefully)
> - Drop unrelated change in qcom,msm8998-pinctrl.txt
> - CC DT
> ---
>  .../bindings/pinctrl/qcom,msm8998-pinctrl.txt |  5 +-

Acked-by: Rob Herring <[e-mail]>

>  drivers/pinctrl/qcom/pinctrl-msm8998.c        | 76 +++++--------------
>  2 files changed, 20 insertions(+), 61 deletions(-)

Linus Walleij July 29, 2019, 9:30 p.m. UTC | #5

On Thu, Jul 4, 2019 at 10:57 AM Marc Gonzalez <[e-mail]> wrote:

> TSIF is the Transport Stream Interface.
> First, rename tsif1 to tsif0, and tsif2 to tsif1.
> Then squash all 5 tsif0 pins into a single function.
> Same for tsif1.
>
> Signed-off-by: Marc Gonzalez <[e-mail]>
> ---
> Changes from v1:
> - Reword commit message for clarity (hopefully)
> - Drop unrelated change in qcom,msm8998-pinctrl.txt
> - CC DT

Patch applied with the ACKs.

Yours,
Linus Walleij

Patch

diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.txt
index 00174f08ba1d..18e3f3d3e3c5 100644
--- a/Documentation/devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.txt
@@ -124,9 +124,8 @@  to specify in a pin configuration subnode:
 		    qlink_request, qua_mi2s, sd_card, sd_write, sdc40, sdc41,
 		    sdc42, sdc43, sdc4_clk, sdc4_cmd, sec_mi2s, sp_cmu,
 		    spkr_i2s, ssbi1, ssc_irq, ter_mi2s, tgu_ch0, tgu_ch1,
-		    tsense_pwm1, tsense_pwm2, tsif1_clk, tsif1_data, tsif1_en,
-		    tsif1_error, tsif1_sync, tsif2_clk, tsif2_data, tsif2_en,
-		    tsif2_error, tsif2_sync, uim1_clk, uim1_data, uim1_present,
+		    tsense_pwm1, tsense_pwm2, tsif0, tsif1,
+		    uim1_clk, uim1_data, uim1_present,
 		    uim1_reset, uim2_clk, uim2_data, uim2_present, uim2_reset,
 		    uim_batt, usb_phy, vfr_1, vsense_clkout, vsense_data0,
 		    vsense_data1, vsense_mode, wlan1_adc0, wlan1_adc1,
diff --git a/drivers/pinctrl/qcom/pinctrl-msm8998.c b/drivers/pinctrl/qcom/pinctrl-msm8998.c
index 00d7b94bc3f1..a05f41fe2706 100644
--- a/drivers/pinctrl/qcom/pinctrl-msm8998.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm8998.c
@@ -581,16 +581,8 @@  enum msm8998_functions {
 	msm_mux_tgu_ch1,
 	msm_mux_tsense_pwm1,
 	msm_mux_tsense_pwm2,
-	msm_mux_tsif1_clk,
-	msm_mux_tsif1_data,
-	msm_mux_tsif1_en,
-	msm_mux_tsif1_error,
-	msm_mux_tsif1_sync,
-	msm_mux_tsif2_clk,
-	msm_mux_tsif2_data,
-	msm_mux_tsif2_en,
-	msm_mux_tsif2_error,
-	msm_mux_tsif2_sync,
+	msm_mux_tsif0,
+	msm_mux_tsif1,
 	msm_mux_uim1_clk,
 	msm_mux_uim1_data,
 	msm_mux_uim1_present,
@@ -692,9 +684,6 @@  static const char * const atest_usb13_groups[] = {
 static const char * const bimc_dte1_groups[] = {
 	"gpio8", "gpio10",
 };
-static const char * const tsif1_sync_groups[] = {
-	"gpio9",
-};
 static const char * const wlan1_adc0_groups[] = {
 	"gpio9",
 };
@@ -863,9 +852,6 @@  static const char * const lpass_slimbus_groups[] = {
 static const char * const sd_write_groups[] = {
 	"gpio40",
 };
-static const char * const tsif1_error_groups[] = {
-	"gpio40",
-};
 static const char * const blsp_spi6_groups[] = {
 	"gpio41", "gpio42", "gpio43", "gpio44",
 };
@@ -1048,11 +1034,8 @@  static const char * const blsp_uim2_b_groups[] = {
 static const char * const blsp_i2c5_groups[] = {
 	"gpio87", "gpio88",
 };
-static const char * const tsif1_clk_groups[] = {
-	"gpio89",
-};
-static const char * const tsif1_en_groups[] = {
-	"gpio90",
+static const char * const tsif0_groups[] = {
+	"gpio9", "gpio40", "gpio89", "gpio90", "gpio91",
 };
 static const char * const mdp_vsync0_groups[] = {
 	"gpio90",
@@ -1075,17 +1058,14 @@  static const char * const tgu_ch0_groups[] = {
 static const char * const qdss_cti1_b_groups[] = {
 	"gpio90", "gpio91",
 };
-static const char * const tsif1_data_groups[] = {
-	"gpio91",
-};
 static const char * const sdc4_cmd_groups[] = {
 	"gpio91",
 };
 static const char * const tgu_ch1_groups[] = {
 	"gpio91",
 };
-static const char * const tsif2_error_groups[] = {
-	"gpio92",
+static const char * const tsif1_groups[] = {
+	"gpio92", "gpio93", "gpio94", "gpio95", "gpio96",
 };
 static const char * const sdc43_groups[] = {
 	"gpio92",
@@ -1093,30 +1073,18 @@  static const char * const sdc43_groups[] = {
 static const char * const vfr_1_groups[] = {
 	"gpio92",
 };
-static const char * const tsif2_clk_groups[] = {
-	"gpio93",
-};
 static const char * const sdc4_clk_groups[] = {
 	"gpio93",
 };
-static const char * const tsif2_en_groups[] = {
-	"gpio94",
-};
 static const char * const sdc42_groups[] = {
 	"gpio94",
 };
 static const char * const sd_card_groups[] = {
 	"gpio95",
 };
-static const char * const tsif2_data_groups[] = {
-	"gpio95",
-};
 static const char * const sdc41_groups[] = {
 	"gpio95",
 };
-static const char * const tsif2_sync_groups[] = {
-	"gpio96",
-};
 static const char * const sdc40_groups[] = {
 	"gpio96",
 };
@@ -1355,16 +1323,8 @@  static const struct msm_function msm8998_functions[] = {
 	FUNCTION(tgu_ch1),
 	FUNCTION(tsense_pwm1),
 	FUNCTION(tsense_pwm2),
-	FUNCTION(tsif1_clk),
-	FUNCTION(tsif1_data),
-	FUNCTION(tsif1_en),
-	FUNCTION(tsif1_error),
-	FUNCTION(tsif1_sync),
-	FUNCTION(tsif2_clk),
-	FUNCTION(tsif2_data),
-	FUNCTION(tsif2_en),
-	FUNCTION(tsif2_error),
-	FUNCTION(tsif2_sync),
+	FUNCTION(tsif0),
+	FUNCTION(tsif1),
 	FUNCTION(uim1_clk),
 	FUNCTION(uim1_data),
 	FUNCTION(uim1_present),
@@ -1396,7 +1356,7 @@  static const struct msm_pingroup msm8998_groups[] = {
 	PINGROUP(6, WEST, blsp_spi8, blsp_uart8_a, blsp_i2c8, _, _, _, _, _, _),
 	PINGROUP(7, WEST, blsp_spi8, blsp_uart8_a, blsp_i2c8, ddr_bist, _, atest_tsens2, atest_usb1, _, _),
 	PINGROUP(8, EAST, blsp_spi4, blsp_uart1_b, blsp_uim1_b, _, ddr_bist, _, wlan1_adc1, atest_usb13, bimc_dte1),
-	PINGROUP(9, EAST, blsp_spi4, blsp_uart1_b, blsp_uim1_b, tsif1_sync, ddr_bist, _, wlan1_adc0, atest_usb12, bimc_dte0),
+	PINGROUP(9, EAST, blsp_spi4, blsp_uart1_b, blsp_uim1_b, tsif0, ddr_bist, _, wlan1_adc0, atest_usb12, bimc_dte0),
 	PINGROUP(10, EAST, mdp_vsync_a, blsp_spi4, blsp_uart1_b, blsp_i2c4, ddr_bist, atest_gpsadc1, wlan2_adc1, atest_usb11, bimc_dte1),
 	PINGROUP(11, EAST, mdp_vsync_a, edp_lcd, blsp_spi4, blsp_uart1_b, blsp_i2c4, dbg_out, atest_gpsadc0, wlan2_adc0, atest_usb10),
 	PINGROUP(12, EAST, mdp_vsync, m_voc, _, _, _, _, _, _, _),
@@ -1427,7 +1387,7 @@  static const struct msm_pingroup msm8998_groups[] = {
 	PINGROUP(37, NORTH, agera_pll, _, _, _, _, _, _, _, _),
 	PINGROUP(38, WEST, usb_phy, _, _, _, _, _, _, _, _),
 	PINGROUP(39, WEST, lpass_slimbus, _, _, _, _, _, _, _, _),
-	PINGROUP(40, EAST, sd_write, tsif1_error, _, _, _, _, _, _, _),
+	PINGROUP(40, EAST, sd_write, tsif0, _, _, _, _, _, _, _),
 	PINGROUP(41, EAST, blsp_spi6, blsp_uart3_b, blsp_uim3_b, _, qdss, _, _, _, _),
 	PINGROUP(42, EAST, blsp_spi6, blsp_uart3_b, blsp_uim3_b, _, qdss, _, _, _, _),
 	PINGROUP(43, EAST, blsp_spi6, blsp_uart3_b, blsp_i2c6, _, qdss, _, _, _, _),
@@ -1476,14 +1436,14 @@  static const struct msm_pingroup msm8998_groups[] = {
 	PINGROUP(86, EAST, blsp_spi5, blsp_uart2_b, blsp_uim2_b, _, _, _, _, _, _),
 	PINGROUP(87, EAST, blsp_spi5, blsp_uart2_b, blsp_i2c5, _, _, _, _, _, _),
 	PINGROUP(88, EAST, blsp_spi5, blsp_uart2_b, blsp_i2c5, _, _, _, _, _, _),
-	PINGROUP(89, EAST, tsif1_clk, phase_flag, _, _, _, _, _, _, _),
-	PINGROUP(90, EAST, tsif1_en, mdp_vsync0, mdp_vsync1, mdp_vsync2, mdp_vsync3, blsp1_spi, tgu_ch0, qdss_cti1_b, _),
-	PINGROUP(91, EAST, tsif1_data, sdc4_cmd, tgu_ch1, phase_flag, qdss_cti1_b, _, _, _, _),
-	PINGROUP(92, EAST, tsif2_error, sdc43, vfr_1, phase_flag, _, _, _, _, _),
-	PINGROUP(93, EAST, tsif2_clk, sdc4_clk, _, qdss, _, _, _, _, _),
-	PINGROUP(94, EAST, tsif2_en, sdc42, _, _, _, _, _, _, _),
-	PINGROUP(95, EAST, tsif2_data, sdc41, _, _, _, _, _, _, _),
-	PINGROUP(96, EAST, tsif2_sync, sdc40, phase_flag, _, _, _, _, _, _),
+	PINGROUP(89, EAST, tsif0, phase_flag, _, _, _, _, _, _, _),
+	PINGROUP(90, EAST, tsif0, mdp_vsync0, mdp_vsync1, mdp_vsync2, mdp_vsync3, blsp1_spi, tgu_ch0, qdss_cti1_b, _),
+	PINGROUP(91, EAST, tsif0, sdc4_cmd, tgu_ch1, phase_flag, qdss_cti1_b, _, _, _, _),
+	PINGROUP(92, EAST, tsif1, sdc43, vfr_1, phase_flag, _, _, _, _, _),
+	PINGROUP(93, EAST, tsif1, sdc4_clk, _, qdss, _, _, _, _, _),
+	PINGROUP(94, EAST, tsif1, sdc42, _, _, _, _, _, _, _),
+	PINGROUP(95, EAST, tsif1, sdc41, _, _, _, _, _, _, _),
+	PINGROUP(96, EAST, tsif1, sdc40, phase_flag, _, _, _, _, _, _),
 	PINGROUP(97, WEST, _, mdp_vsync_b, ldo_en, _, _, _, _, _, _),
 	PINGROUP(98, WEST, _, mdp_vsync_b, ldo_update, _, _, _, _, _, _),
 	PINGROUP(99, WEST, _, _, _, _, _, _, _, _, _),