platform: msm8916: Add support for blsp_i2c5

Similar to a258e7b, but without adding more annoying if statements to acpuclock.c (instead a more flexible snprintf).
Mine556 · Jan 8, 2022 · f5ebd9a · f5ebd9a
1 parent 8ac9743
commit f5ebd9a
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 19 deletions.
diff --git a/platform/msm8916/acpuclock.c b/platform/msm8916/acpuclock.c
@@ -440,32 +440,17 @@ void clock_config_blsp_i2c(uint8_t blsp_id, uint8_t qup_id)
 
 	struct clk *qup_clk;
 
-	if((blsp_id != BLSP_ID_1) || ((qup_id != QUP_ID_1) && (qup_id != QUP_ID_3))) {
-		dprintf(CRITICAL, "Incorrect BLSP-%d or QUP-%d configuration\n", blsp_id, qup_id);
-		ASSERT(0);
-	}
-
-	if (qup_id == QUP_ID_1) {
-		snprintf(clk_name, sizeof(clk_name), "blsp1_qup2_ahb_iface_clk");
-	}
-	else if (qup_id == QUP_ID_3) {
-		snprintf(clk_name, sizeof(clk_name), "blsp1_qup4_ahb_iface_clk");
-	}
-
+	snprintf(clk_name, sizeof(clk_name), "blsp%d_qup%d_ahb_iface_clk",
+		 blsp_id, qup_id + 1); // QUP ID starts at 0 for some reason
 	ret = clk_get_set_enable(clk_name, 0 , 1);
 
 	if (ret) {
 		dprintf(CRITICAL, "Failed to enable %s clock\n", clk_name);
 		return;
 	}
 
-	if (qup_id == QUP_ID_1) {
-		snprintf(clk_name, sizeof(clk_name), "gcc_blsp1_qup2_i2c_apps_clk");
-	}
-	else if (qup_id == QUP_ID_3) {
-		snprintf(clk_name, sizeof(clk_name), "gcc_blsp1_qup4_i2c_apps_clk");
-	}
-
+	snprintf(clk_name, sizeof(clk_name), "gcc_blsp%d_qup%d_i2c_apps_clk",
+		 blsp_id, qup_id + 1); // QUP ID starts at 0 for some reason
 	qup_clk = clk_get(clk_name);
 
 	if (!qup_clk) {

diff --git a/platform/msm8916/gpio.c b/platform/msm8916/gpio.c
@@ -116,6 +116,15 @@ void gpio_config_blsp_i2c(uint8_t blsp_id, uint8_t qup_id)
 				gpio_tlmm_config(15, 2, GPIO_OUTPUT, GPIO_NO_PULL,
 					GPIO_8MA, GPIO_DISABLE);
 			break;
+			case QUP_ID_4:
+				/* configure I2C SDA gpio */
+				gpio_tlmm_config(18, 2, GPIO_OUTPUT, GPIO_NO_PULL,
+						GPIO_8MA, GPIO_DISABLE);
+
+				/* configure I2C SCL gpio */
+				gpio_tlmm_config(19, 2, GPIO_OUTPUT, GPIO_NO_PULL,
+					GPIO_8MA, GPIO_DISABLE);
+			break;
 			default:
 				dprintf(CRITICAL, "Incorrect QUP id %d\n",qup_id);
 				ASSERT(0);

diff --git a/platform/msm8916/include/platform/iomap.h b/platform/msm8916/include/platform/iomap.h
@@ -115,6 +115,10 @@
 #define GCC_BLSP1_QUP4_CFG_RCGR     (CLK_CTL_BASE + 0x5004)
 #define GCC_BLSP1_QUP4_CMD_RCGR     (CLK_CTL_BASE + 0x5000)
 
+#define GCC_BLSP1_QUP5_APPS_CBCR    (CLK_CTL_BASE + 0x6020)
+#define GCC_BLSP1_QUP5_CFG_RCGR     (CLK_CTL_BASE + 0x6004)
+#define GCC_BLSP1_QUP5_CMD_RCGR     (CLK_CTL_BASE + 0x6000)
+
 /* GPLL */
 #define GPLL0_STATUS                (CLK_CTL_BASE + 0x2101C)
 #define GPLL1_STATUS                (CLK_CTL_BASE + 0x2001C)

diff --git a/platform/msm8916/msm8916-clock.c b/platform/msm8916/msm8916-clock.c
@@ -616,6 +616,30 @@ static struct branch_clk gcc_blsp1_qup4_i2c_apps_clk = {
 	},
 };
 
+static struct rcg_clk gcc_blsp1_qup5_i2c_apps_clk_src =
+{
+	.cmd_reg      = (uint32_t *) GCC_BLSP1_QUP5_CMD_RCGR,
+	.cfg_reg      = (uint32_t *) GCC_BLSP1_QUP5_CFG_RCGR,
+	.set_rate     = clock_lib2_rcg_set_rate_hid,
+	.freq_tbl     = ftbl_gcc_blsp1_qup2_i2c_apps_clk_src,
+	.current_freq = &rcg_dummy_freq,
+
+	.c = {
+		.dbg_name = "gcc_blsp1_qup5_i2c_apps_clk_src",
+		.ops      = &clk_ops_rcg,
+	},
+};
+
+static struct branch_clk gcc_blsp1_qup5_i2c_apps_clk = {
+	.cbcr_reg = (uint32_t *) GCC_BLSP1_QUP5_APPS_CBCR,
+	.parent   = &gcc_blsp1_qup5_i2c_apps_clk_src.c,
+
+	.c = {
+		.dbg_name = "gcc_blsp1_qup5_i2c_apps_clk",
+		.ops      = &clk_ops_branch,
+	},
+};
+
 /* Clock lookup table */
 static struct clk_lookup msm_clocks_8916[] =
 {
@@ -654,6 +678,10 @@ static struct clk_lookup msm_clocks_8916[] =
 	CLK_LOOKUP("blsp1_qup4_ahb_iface_clk", gcc_blsp1_ahb_clk.c),
 	CLK_LOOKUP("gcc_blsp1_qup4_i2c_apps_clk_src", gcc_blsp1_qup4_i2c_apps_clk_src.c),
 	CLK_LOOKUP("gcc_blsp1_qup4_i2c_apps_clk", gcc_blsp1_qup4_i2c_apps_clk.c),
+
+	CLK_LOOKUP("blsp1_qup5_ahb_iface_clk", gcc_blsp1_ahb_clk.c),
+	CLK_LOOKUP("gcc_blsp1_qup5_i2c_apps_clk_src", gcc_blsp1_qup5_i2c_apps_clk_src.c),
+	CLK_LOOKUP("gcc_blsp1_qup5_i2c_apps_clk", gcc_blsp1_qup5_i2c_apps_clk.c),
 };
 
 void msm8939_clock_override()