media: qcom: camss: vfe: Add MSM8939 VBIF settings

Add MSM8939 specific VFE VBIF settings.
This fixes black stripes in camera sensor output and garbage
in CSID test pattern generator.

Signed-off-by: Vincent Knecht <[email protected]>

Author: vknecht

drivers/media/platform/qcom/camss/camss-vfe-4-1.c

@@ -15,6 +15,7 @@
 #include "camss.h"
 #include "camss-vfe.h"
 #include "camss-vfe-gen1.h"
+#include "camss-vfe-vbif.h"
 
 #define VFE_0_HW_VERSION		0x000
 
@@ -207,6 +208,9 @@
 #define CAMIF_TIMEOUT_SLEEP_US 1000
 #define CAMIF_TIMEOUT_ALL_US 1000000
 
+#define VBIF_FIXED_SORT_EN	0x30
+#define VBIF_FIXED_SORT_SEL0	0x34
+
 #define MSM_VFE_VFE0_UB_SIZE 1023
 #define MSM_VFE_VFE0_UB_SIZE_RDI (MSM_VFE_VFE0_UB_SIZE / 3)
 
@@ -742,6 +746,16 @@ static void vfe_set_qos(struct vfe_device *vfe)
 	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_QOS_CFG_5);
 	writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_QOS_CFG_6);
 	writel_relaxed(val7, vfe->base + VFE_0_BUS_BDG_QOS_CFG_7);
+
+	/* SoC-specific VBIF settings */
+	switch (vfe->camss->res->version) {
+	case CAMSS_8x39:
+		vfe_vbif_reg_write(vfe, VBIF_FIXED_SORT_EN, 0x00000fff);
+		vfe_vbif_reg_write(vfe, VBIF_FIXED_SORT_SEL0, 0x00555000);
+		break;
+	default:
+		break;
+	}
 }
 
 static void vfe_set_ds(struct vfe_device *vfe)

drivers/media/platform/qcom/camss/camss.c

@@ -288,6 +288,8 @@ static const struct camss_subdev_resources vfe_res_8x39[] = {
 		.interrupt = { "vfe0" },
 		.vfe = {
 			.line_num = 3,
+			.has_vbif = true,
+			.vbif_name = "vfe0_vbif",
 			.hw_ops = &vfe_ops_4_1,
 			.formats_rdi = &vfe_formats_rdi_8x16,
 			.formats_pix = &vfe_formats_pix_8x16