Merge "pinctrl: qcom: Update sdm845 direct connect interrupts" (5705de80) · Commits · e / devices / android_kernel_fairphone_FP3

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,8 @@
		.intr_cfg_reg = base + 0x8 + REG_SIZE * id, \
		.intr_status_reg = base + 0xc + REG_SIZE * id, \
		.intr_target_reg = base + 0x8 + REG_SIZE * id, \
		.dir_conn_reg = (base == NORTH) ? base + 0xa4000 : \
		((base == SOUTH) ? base + 0xa8000 : base + 0x9e000), \
		.mux_bit = 2, \
		.pull_bit = 0, \
		.drv_bit = 6, \
		@@ -67,6 +69,7 @@
		.intr_polarity_bit = 1, \
		.intr_detection_bit = 2, \
		.intr_detection_width = 2, \
		.dir_conn_en_bit = 8, \
		}

		#define SDC_QDSD_PINGROUP(pg_name, ctl, pull, drv) \
		@@ -1747,6 +1750,7 @@ static const struct msm_dir_conn sdm845_dir_conn[] = {
		{123, 613},
		{124, 614},
		{125, 615},
		{126, 616},
		{127, 617},
		{128, 618},
		{129, 619},
		@@ -1754,6 +1758,14 @@ static const struct msm_dir_conn sdm845_dir_conn[] = {
		{132, 621},
		{133, 622},
		{145, 623},
		{0, 216},
		{0, 215},
		{0, 214},
		{0, 213},
		{0, 212},
		{0, 211},
		{0, 210},
		{0, 209},
		};

		static const struct msm_pinctrl_soc_data sdm845_pinctrl = {
		@@ -1766,6 +1778,7 @@ static const struct msm_pinctrl_soc_data sdm845_pinctrl = {
		.ngpios = 150,
		.dir_conn = sdm845_dir_conn,
		.n_dir_conns = ARRAY_SIZE(sdm845_dir_conn),
		.dir_conn_irq_base = 216,
		};

		static int sdm845_pinctrl_probe(struct platform_device *pdev)

drivers/pinctrl/qcom/pinctrl-sdm845.c

+15 −1

Original line number	Diff line number	Diff line
		@@ -52,6 +52,8 @@
		.intr_cfg_reg = base + 0x8 + REG_SIZE * id, \
		.intr_status_reg = base + 0xc + REG_SIZE * id, \
		.intr_target_reg = base + 0x8 + REG_SIZE * id, \
		.dir_conn_reg = (base == NORTH) ? base + 0xa5000 :\
		base + 0xa8000, \
		.mux_bit = 2, \
		.pull_bit = 0, \
		.drv_bit = 6, \
		@@ -66,6 +68,7 @@
		.intr_polarity_bit = 1, \
		.intr_detection_bit = 2, \
		.intr_detection_width = 2, \
		.dir_conn_en_bit = 8, \
		}

		#define SDC_QDSD_PINGROUP(pg_name, ctl, pull, drv) \
		@@ -117,6 +120,7 @@
		.intr_detection_bit = -1, \
		.intr_detection_width = -1, \
		}

		static const struct pinctrl_pin_desc sdm845_pins[] = {
		PINCTRL_PIN(0, "GPIO_0"),
		PINCTRL_PIN(1, "GPIO_1"),
		@@ -1648,7 +1652,7 @@ static const struct msm_pingroup sdm845_groups[] = {
		[153] = UFS_RESET(ufs_reset, 0x99f000),
		};

		static const struct msm_dir_conn sdm845_dir_conn[] = {
		static struct msm_dir_conn sdm845_dir_conn[] = {
		{1, 510},
		{3, 511},
		{5, 512},
		@@ -1717,6 +1721,7 @@ static const struct msm_dir_conn sdm845_dir_conn[] = {
		{123, 613},
		{124, 614},
		{125, 615},
		{126, 616},
		{127, 617},
		{128, 618},
		{129, 619},
		@@ -1724,6 +1729,14 @@ static const struct msm_dir_conn sdm845_dir_conn[] = {
		{132, 621},
		{133, 622},
		{145, 623},
		{0, 216},
		{0, 215},
		{0, 214},
		{0, 213},
		{0, 212},
		{0, 211},
		{0, 210},
		{0, 209},
		};

		static const struct msm_pinctrl_soc_data sdm845_pinctrl = {
		@@ -1736,6 +1749,7 @@ static const struct msm_pinctrl_soc_data sdm845_pinctrl = {
		.ngpios = 150,
		.dir_conn = sdm845_dir_conn,
		.n_dir_conns = ARRAY_SIZE(sdm845_dir_conn),
		.dir_conn_irq_base = 216,
		};

		static int sdm845_pinctrl_probe(struct platform_device *pdev)