Commit d2e86540 authored by Robert Foss's avatar Robert Foss Committed by Mauro Carvalho Chehab
Browse files

media: camss: vfe: Rework vfe_hw_version_read() function definition 



Expose the VFE version by returning the value read from the HW_VERSION
register.

Secondly, change the name of this function to conform with the CSID
equivalent.

Signed-off-by: default avatarRobert Foss <robert.foss@linaro.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 5ad58667

drivers/media/platform/qcom/camss/camss-vfe-170.c

+4 −2
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ 
#define VFE_BUS_WM_FRAME_INC(n)			(0x2258 + (n) * 0x100)

#define VFE_BUS_WM_BURST_LIMIT(n)		(0x225c + (n) * 0x100)



static void vfe_hw_version_read(struct vfe_device *vfe)

static u32 vfe_hw_version(struct vfe_device *vfe)

{

	u32 hw_version = readl_relaxed(vfe->base + VFE_HW_VERSION);
@@ -187,6 +187,8 @@ static void vfe_hw_version_read(struct vfe_device *vfe) 


	dev_dbg(vfe->camss->dev, "VFE HW Version = %u.%u.%u\n",

		gen, rev, step);



	return hw_version;

}



static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits)
@@ -772,7 +774,7 @@ static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe) 


const struct vfe_hw_ops vfe_ops_170 = {

	.global_reset = vfe_global_reset,

	.hw_version_read = vfe_hw_version_read,

	.hw_version = vfe_hw_version,

	.isr_read = vfe_isr_read,

	.isr = vfe_isr,

	.pm_domain_off = vfe_pm_domain_off,

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

+4 −2
Original line number Diff line number Diff line
@@ -210,11 +210,13 @@ 
#define MSM_VFE_VFE0_UB_SIZE 1023

#define MSM_VFE_VFE0_UB_SIZE_RDI (MSM_VFE_VFE0_UB_SIZE / 3)



static void vfe_hw_version_read(struct vfe_device *vfe)

static u32 vfe_hw_version(struct vfe_device *vfe)

{

	u32 hw_version = readl_relaxed(vfe->base + VFE_0_HW_VERSION);



	dev_dbg(vfe->camss->dev, "VFE HW Version = 0x%08x\n", hw_version);



	return hw_version;

}



static u16 vfe_get_ub_size(u8 vfe_id)
@@ -1004,7 +1006,7 @@ static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe) 


const struct vfe_hw_ops vfe_ops_4_1 = {

	.global_reset = vfe_global_reset,

	.hw_version_read = vfe_hw_version_read,

	.hw_version = vfe_hw_version,

	.isr_read = vfe_isr_read,

	.isr = vfe_isr,

	.pm_domain_off = vfe_pm_domain_off,

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

+4 −2
Original line number Diff line number Diff line
@@ -254,11 +254,13 @@ 
#define MSM_VFE_VFE1_UB_SIZE 1535

#define MSM_VFE_VFE1_UB_SIZE_RDI (MSM_VFE_VFE1_UB_SIZE / 3)



static void vfe_hw_version_read(struct vfe_device *vfe)

static u32 vfe_hw_version(struct vfe_device *vfe)

{

	u32 hw_version = readl_relaxed(vfe->base + VFE_0_HW_VERSION);



	dev_dbg(vfe->camss->dev, "VFE HW Version = 0x%08x\n", hw_version);



	return hw_version;

}



static u16 vfe_get_ub_size(u8 vfe_id)
@@ -1196,7 +1198,7 @@ static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe) 


const struct vfe_hw_ops vfe_ops_4_7 = {

	.global_reset = vfe_global_reset,

	.hw_version_read = vfe_hw_version_read,

	.hw_version = vfe_hw_version,

	.isr_read = vfe_isr_read,

	.isr = vfe_isr,

	.pm_domain_off = vfe_pm_domain_off,

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

+4 −2
Original line number Diff line number Diff line
@@ -247,11 +247,13 @@ 
#define MSM_VFE_VFE1_UB_SIZE 1535

#define MSM_VFE_VFE1_UB_SIZE_RDI (MSM_VFE_VFE1_UB_SIZE / 3)



static void vfe_hw_version_read(struct vfe_device *vfe)

static u32 vfe_hw_version(struct vfe_device *vfe)

{

	u32 hw_version = readl_relaxed(vfe->base + VFE_0_HW_VERSION);



	dev_dbg(vfe->camss->dev, "VFE HW Version = 0x%08x\n", hw_version);



	return hw_version;

}



static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits)
@@ -1180,7 +1182,7 @@ static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe) 


const struct vfe_hw_ops vfe_ops_4_8 = {

	.global_reset = vfe_global_reset,

	.hw_version_read = vfe_hw_version_read,

	.hw_version = vfe_hw_version,

	.isr_read = vfe_isr_read,

	.isr = vfe_isr,

	.pm_domain_off = vfe_pm_domain_off,

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

+1 −1
Original line number Diff line number Diff line
@@ -1299,7 +1299,7 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe, 
		return -EINVAL;

	}

	vfe->ops->subdev_init(dev, vfe);

	vfe->ops->hw_version_read(vfe);

	vfe->ops->hw_version(vfe);



	/* Memory */