Move lane selection into the PLL setup and drop overlay changes

Author: peyton-howe

arch/arm/boot/dts/overlays/Makefile

@@ -130,7 +130,6 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
 	i2s-master-dac.dtbo \
 	ilitek251x.dtbo \
 	imx219.dtbo \
-	imx219_4lane.dtbo \
 	imx258.dtbo \
 	imx290.dtbo \
 	imx296.dtbo \

arch/arm/boot/dts/overlays/imx219_4lane-overlay.dts

@@ -248,7 +248,7 @@ static const struct cci_reg_sequence imx219_common_regs[] = {
 	{ IMX219_REG_EXCK_FREQ, IMX219_EXCK_FREQ(IMX219_XCLK_FREQ / 1000000) },
 };
 
-static const struct cci_reg_sequence imx219_pll[] = {
+static const struct cci_reg_sequence imx219_2lane_regs[] = {
 	/* PLL Clock Table */
 	{ IMX219_REG_VTPXCK_DIV, 5 },
 	{ IMX219_REG_VTSYCK_DIV, 1 },
@@ -257,9 +257,12 @@ static const struct cci_reg_sequence imx219_pll[] = {
 	{ IMX219_REG_PLL_VT_MPY, 57 },
 	{ IMX219_REG_OPSYCK_DIV, 1 },
 	{ IMX219_REG_PLL_OP_MPY, 114 },
+
+	/* 2-Lane CSI Mode */
+	{ IMX219_REG_CSI_LANE_MODE, IMX219_CSI_2_LANE_MODE },
 };
 
-static const struct cci_reg_sequence imx219_pll_4lane[] = {
+static const struct cci_reg_sequence imx219_4lane_regs[] = {
 	/* PLL Clock Table */
 	{ IMX219_REG_VTPXCK_DIV, 5 },
 	{ IMX219_REG_VTSYCK_DIV, 1 },
@@ -268,6 +271,9 @@ static const struct cci_reg_sequence imx219_pll_4lane[] = {
 	{ IMX219_REG_PLL_VT_MPY, 88 },
 	{ IMX219_REG_OPSYCK_DIV, 1 },
 	{ IMX219_REG_PLL_OP_MPY, 91 },
+
+	/* 4-Lane CSI Mode */
+	{ IMX219_REG_CSI_LANE_MODE, IMX219_CSI_4_LANE_MODE },
 };
 
 /*
@@ -954,16 +960,11 @@ static int imx219_get_selection(struct v4l2_subdev *sd,
 
 static int imx219_configure_lanes(struct imx219 *imx219)
 {
-	int ret;
 	/* Write the appropriate PLL settings for the number of MIPI lanes */
-	ret = cci_multi_reg_write(imx219->regmap,
-				  imx219->lanes == 2 ? imx219_pll : imx219_pll_4lane,
-				  imx219->lanes == 2 ? ARRAY_SIZE(imx219_pll) : ARRAY_SIZE(imx219_pll_4lane),
+	return cci_multi_reg_write(imx219->regmap,
+				  imx219->lanes == 2 ? imx219_2lane_regs : imx219_4lane_regs,
+				  imx219->lanes == 2 ? ARRAY_SIZE(imx219_2lane_regs) : ARRAY_SIZE(imx219_4lane_regs),
 				  NULL);
-
-	return cci_write(imx219->regmap, IMX219_REG_CSI_LANE_MODE,
-			 imx219->lanes == 2 ? IMX219_CSI_2_LANE_MODE :
-			 IMX219_CSI_4_LANE_MODE, NULL);
 };
 
 static int imx219_start_streaming(struct imx219 *imx219,