Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c5fdef7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "pinctrl: qcom: Update Direct connect mapping for GPIO31/49/89"

parents dbcd8b59 d416b172

drivers/irqchip/qcom/pdc-sdm845.c

+4 −4
Original line number Diff line number Diff line
@@ -123,10 +123,10 @@ static struct pdc_pin sdm845_data[] = { 
	{119, 666}, /* core_bi_px_to_mpm[2] */

	{120, 667}, /* core_bi_px_to_mpm[3] */

	{121, 668}, /* core_bi_px_to_mpm[4] */

	{122, 669}, /* core_bi_px_gpio_41 */

	{123, 670}, /* core_bi_px_gpio_89 */

	{124, 671}, /* core_bi_px_gpio_31 */

	{125, 672}, /* core_bi_px_gpio_49 */

	{122, 662}, /* core_bi_px_gpio_41 */

	{123, 663}, /* core_bi_px_gpio_89 */

	{124, 664}, /* core_bi_px_gpio_31 */

	{125, 665}, /* core_bi_px_gpio_49 */

	{-1}

};

drivers/pinctrl/qcom/pinctrl-sdm845-v2.c

+3 −3
Original line number Diff line number Diff line
@@ -1692,7 +1692,7 @@ static const struct msm_dir_conn sdm845_dir_conn[] = { 
	{24, 517},

	{26, 518},

	{30, 519},

	{31, 639},

	{31, 632},

	{32, 521},

	{34, 522},

	{36, 523},
@@ -1705,7 +1705,7 @@ static const struct msm_dir_conn sdm845_dir_conn[] = { 
	{44, 530},

	{46, 531},

	{48, 532},

	{49, 640},

	{49, 633 },

	{52, 534},

	{53, 535},

	{54, 536},
@@ -1730,7 +1730,7 @@ static const struct msm_dir_conn sdm845_dir_conn[] = { 
	{85, 555},

	{86, 556},

	{88, 557},

	{89, 638},

	{89, 631},

	{91, 559},

	{92, 560},

	{95, 561},

drivers/pinctrl/qcom/pinctrl-sdm845.c

+3 −3
Original line number Diff line number Diff line
@@ -1663,7 +1663,7 @@ static struct msm_dir_conn sdm845_dir_conn[] = { 
	{24, 517},

	{26, 518},

	{30, 519},

	{31, 639},

	{31, 632},

	{32, 521},

	{34, 522},

	{36, 523},
@@ -1676,7 +1676,7 @@ static struct msm_dir_conn sdm845_dir_conn[] = { 
	{44, 530},

	{46, 531},

	{48, 532},

	{49, 640},

	{49, 633},

	{52, 534},

	{53, 535},

	{54, 536},
@@ -1701,7 +1701,7 @@ static struct msm_dir_conn sdm845_dir_conn[] = { 
	{85, 555},

	{86, 556},

	{88, 557},

	{89, 638},

	{89, 631},

	{91, 559},

	{92, 560},

	{95, 561},