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

Commit 682bd207 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: pinctrl: qcom: Update GPIO mapping for sm6150"

parents b1a1a12b 263edead

drivers/irqchip/qcom/pdc-sm6150.c

+3 −3
Original line number Diff line number Diff line
@@ -109,8 +109,8 @@ static struct pdc_pin sm6150_data[] = { 
	{91, 603},/*core_bi_px_gpio_94*/

	{92, 604},/*core_bi_px_gpio_84*/

	{93, 605},/*core_bi_px_gpio_102*/

	{94, 641},/*core_bi_px_gpio_98*/

	{95, 642},/*core_bi_px_gpio_99*/

	{94, 641},/*core_bi_px_gpio_99*/

	{95, 642},/*core_bi_px_gpio_98*/

	{96, 643},/*core_bi_px_gpio_105*/

	{97, 644},/*core_bi_px_gpio_107*/

	{98, 645},/*gp_irq_hvm[68]*/
@@ -140,7 +140,7 @@ static struct pdc_pin sm6150_data[] = { 
	{122, 669},/*core_bi_px_gpio_89*/

	{123, 670},/*core_bi_px_gpio_51*/

	{124, 671},/*core_bi_px_gpio_88*/

	{125, 95},/*core_bi_px_gpio_39*/

	{125, 672},/*core_bi_px_gpio_39*/

	{-1},

};

drivers/pinctrl/qcom/pinctrl-sm6150.c

+7 −7
Original line number Diff line number Diff line
@@ -1570,14 +1570,14 @@ static struct msm_dir_conn sm6150_dir_conn[] = { 
	{19, 528},

	{21, 563},

	{22, 516},

	{35, 517},

	{39, 633},

	{26, 518},

	{35, 517},

	{39, 633}, /* GPIO 39 mapped to SPI 640 as well */

	{41, 527},

	{47, 529},

	{48, 531},

	{50, 532},

	{51, 631},

	{51, 631}, /* GPIO 51 mapped to SPI 638 as well */

	{55, 536},

	{56, 537},

	{57, 538},
@@ -1591,8 +1591,8 @@ static struct msm_dir_conn sm6150_dir_conn[] = { 
	{85, 614},

	{86, 547},

	{87, 564},

	{88, 632},

	{89, 630},

	{88, 632}, /* GPIO 88 mapped to SPI 639 as well */

	{89, 630}, /* GPIO 89 mapped to SPI 637 as well */

	{90, 549},

	{92, 568},

	{93, 555},
@@ -1600,8 +1600,8 @@ static struct msm_dir_conn sm6150_dir_conn[] = { 
	{95, 552},

	{96, 562},

	{97, 554},

	{98, 609},

	{99, 610},

	{98, 610},

	{99, 609},

	{100, 615},

	{101, 520},

	{102, 573},