Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35f531ef authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: fd: Move vbif register configuration to dtsi"

parents 3ccb9bd7 ded48a9d

Documentation/devicetree/bindings/media/video/msm-fd.txt

+9 −4
Original line number Diff line number Diff line
@@ -34,13 +34,15 @@ Optional properties: 
  property defined.

  If we want to have different operating clock frequencies we can define

  rate levels. They should be defined in incremental order.

- bus-bandwidth-vectors: Specifies instant and average bus bandwidth

- qcom,bus-bandwidth-vectors: Specifies instant and average bus bandwidth

  vectors per clock rate.

  Each of entries contains:

  - ab. Average bus bandwidth (Bps).

  - ib. Instantaneous bus bandwidth (Bps).

- mmagic-vdd-supply: phandle to GDSC regulator controlling mmagic.

- camss-vdd-supply: phandle to GDSC regulator controlling camss.

- qcom,vbif-reg-settings: relative address offsets and value pairs for

  VBIF registers.



Example:
@@ -77,7 +79,10 @@ Example: 
                        "camss_cpp_axi_clk", "cpp_vbif_ahb_clk",

                         "smmu_cpp_ahb_clk";

        clock-rates = <0 0 0 0 400000000 400000000 400000000 80000000 0 0 0 0 0>;

		bus-bandwidth-vectors = <13000000 26000000>,

				<45000000 90000000>,

				<90000000 180000000>;

	qcom,bus-bandwidth-vectors = <13000000 13000000>,

		<45000000 45000000>,

		<90000000 90000000>;

	qcom,vbif-reg-settings = <0x10 0x40004000>,

		<0x18 0x10000000>,

		<0x1c 0x10000000>;

    };

drivers/media/platform/msm/camera_v2/fd/msm_fd_dev.h

+0 −2
Original line number Diff line number Diff line
@@ -211,7 +211,6 @@ enum msm_fd_mem_resources { 
 * @work_queue: Pointer to FD device IRQ bottom half workqueue.

 * @work: IRQ bottom half work struct.

 * @hw_halt_completion: Completes when face detection hw halt completes.

 * @vbif_enabled: Flag to check if VBIF is enabled by FD core.

 */

struct msm_fd_device {

	u32 hw_revision;
@@ -249,7 +248,6 @@ struct msm_fd_device { 
	struct workqueue_struct *work_queue;

	struct work_struct work;

	struct completion hw_halt_completion;

	uint32_t vbif_enabled;

};



#endif /* __MSM_FD_DEV_H__ */

drivers/media/platform/msm/camera_v2/fd/msm_fd_hw.c

+67 −63
Original line number Diff line number Diff line
@@ -593,71 +593,65 @@ void msm_fd_hw_release_irq(struct msm_fd_device *fd) 
}



/*

 * msm_fd_hw_vbif_register - Configure and enable vbif interface.

 * msm_fd_hw_set_dt_parms() - read device tree params and write to registers.

 * @fd: Pointer to fd device.

 * @dt_prop_name: Name of the device tree property to read.

 * @base_idx: Fd memory resource index.

 *

 * This function reads register offset and value pairs from dtsi based on

 * device tree property name and writes to FD registers.

 *

 * Return: 0 on success and negative error on failure.

 */

void msm_fd_hw_vbif_register(struct msm_fd_device *fd)

int32_t msm_fd_hw_set_dt_parms(struct msm_fd_device *fd,

			const char *dt_prop_name,

			enum msm_fd_mem_resources base_idx)

{

	uint32_t vbif_enabled = msm_fd_hw_read_reg(fd,

		MSM_FD_IOMEM_VBIF, MSM_FD_VBIF_CLKON);



	if (vbif_enabled) {

		pr_debug("%s: VBIF already enabled", __func__);

		fd->vbif_enabled = 0;

		return;

	}

	msm_fd_hw_reg_set(fd, MSM_FD_IOMEM_VBIF,

		MSM_FD_VBIF_CLKON, 0x1);



	msm_fd_hw_write_reg(fd, MSM_FD_IOMEM_VBIF,

		MSM_FD_VBIF_QOS_OVERRIDE_EN, 0x10001);



	msm_fd_hw_write_reg(fd, MSM_FD_IOMEM_VBIF,

		MSM_FD_VBIF_QOS_OVERRIDE_REQPRI, 0x1);

	struct device_node *of_node;

	int32_t i = 0 , rc = 0;

	uint32_t *dt_reg_settings = NULL;

	uint32_t dt_count = 0;



	msm_fd_hw_write_reg(fd, MSM_FD_IOMEM_VBIF,

		MSM_FD_VBIF_QOS_OVERRIDE_PRILVL, 0x1);

	of_node = fd->dev->of_node;

	pr_debug("%s:%d E\n", __func__, __LINE__);



	msm_fd_hw_write_reg(fd, MSM_FD_IOMEM_VBIF,

		MSM_FD_VBIF_IN_RD_LIM_CONF0, 0x10);



	msm_fd_hw_write_reg(fd, MSM_FD_IOMEM_VBIF,

		MSM_FD_VBIF_IN_WR_LIM_CONF0, 0x10);



	msm_fd_hw_write_reg(fd, MSM_FD_IOMEM_VBIF,

		MSM_FD_VBIF_OUT_RD_LIM_CONF0, 0x10);



	msm_fd_hw_write_reg(fd, MSM_FD_IOMEM_VBIF,

		MSM_FD_VBIF_OUT_WR_LIM_CONF0, 0x10);



	msm_fd_hw_write_reg(fd, MSM_FD_IOMEM_VBIF,

		MSM_FD_VBIF_DDR_OUT_MAX_BURST, 0xF0F);



	msm_fd_hw_write_reg(fd, MSM_FD_IOMEM_VBIF,

		MSM_FD_VBIF_ARB_CTL, 0x30);



	msm_fd_hw_write_reg(fd, MSM_FD_IOMEM_VBIF,

		MSM_FD_VBIF_OUT_AXI_AMEMTYPE_CONF0, 0x02);

	if (!of_get_property(of_node, dt_prop_name, &dt_count)) {

		pr_err("%s: Error property does not exist\n", __func__);

		return -ENOENT;

	}

	if (dt_count % 8) {

		pr_err("%s: Error invalid entries\n", __func__);

		return -EINVAL;

	}

	dt_count /= 4;

	if (dt_count != 0) {

		dt_reg_settings = kcalloc(dt_count,

			sizeof(uint32_t),

			GFP_KERNEL);



	msm_fd_hw_write_reg(fd, MSM_FD_IOMEM_VBIF,

		MSM_FD_VBIF_OUT_AXI_AOOO_EN, 0x10001);

		if (!dt_reg_settings)

			return -ENOMEM;



	msm_fd_hw_write_reg(fd, MSM_FD_IOMEM_VBIF,

		MSM_FD_VBIF_ROUND_ROBIN_QOS_ARB, 0x03);

	fd->vbif_enabled = 1;

		rc = of_property_read_u32_array(of_node,

				dt_prop_name,

				dt_reg_settings,

				dt_count);

		if (rc < 0) {

			pr_err("%s: No reg info\n", __func__);

			kfree(dt_reg_settings);

			return -EINVAL;

		}



/*

 * msm_fd_hw_vbif_unregister - Disable vbif interface.

 * @fd: Pointer to fd device.

 */

void msm_fd_hw_vbif_unregister(struct msm_fd_device *fd)

{

	if (fd->vbif_enabled) {

		pr_debug("%s: Disable VBIF clock", __func__);

		msm_fd_hw_write_reg(fd, MSM_FD_IOMEM_VBIF,

			MSM_FD_VBIF_CLKON, 0x0);

		for (i = 0; i < dt_count; i = i + 2) {

			pr_debug("%s:%d] %p %08x\n", __func__, __LINE__,

				fd->iomem_base[base_idx] + dt_reg_settings[i],

				dt_reg_settings[i + 1]);

			msm_fd_hw_reg_set(fd, base_idx, dt_reg_settings[i],

				dt_reg_settings[i + 1]);

		}

		kfree(dt_reg_settings);

	}

	return 0;

}



/*
@@ -1063,12 +1057,12 @@ int msm_fd_hw_get_bus(struct msm_fd_device *fd) 
	cnt = 0;

	for (usecase = 0; usecase < idx; usecase++) {

		ret = of_property_read_u32_index(fd->dev->of_node,

			"bus-bandwidth-vectors", cnt++, &ab);

			"qcom,bus-bandwidth-vectors", cnt++, &ab);

		if (ret < 0)

			break;



		ret = of_property_read_u32_index(fd->dev->of_node,

			"bus-bandwidth-vectors", cnt++, &ib);

			"qcom,bus-bandwidth-vectors", cnt++, &ib);

		if (ret < 0)

			break;
@@ -1183,15 +1177,26 @@ int msm_fd_hw_get(struct msm_fd_device *fd, unsigned int clock_rate_idx) 
		if (msm_fd_hw_misc_irq_supported(fd))

			msm_fd_hw_misc_irq_enable(fd);



		msm_fd_hw_vbif_register(fd);

		ret = msm_fd_hw_set_dt_parms(fd, "qcom,vbif-reg-settings",

			MSM_FD_IOMEM_VBIF);

		if (ret == -ENOENT) {

			pr_debug("%s: No qcom,vbif-reg-settings property\n",

				__func__);

		} else if (ret < 0) {

			pr_err("%s: vbif params set fail\n", __func__);

			goto error_vbif;

		}

	}





	fd->ref_count++;

	mutex_unlock(&fd->lock);



	return 0;



error_vbif:

	if (msm_fd_hw_misc_irq_supported(fd))

		msm_fd_hw_misc_irq_disable(fd);

	msm_fd_hw_disable_clocks(fd);

error_clocks:

	msm_fd_hw_bus_release(fd);

error_bus_request:
@@ -1219,7 +1224,6 @@ void msm_fd_hw_put(struct msm_fd_device *fd) 
		if (msm_fd_hw_misc_irq_supported(fd))

			msm_fd_hw_misc_irq_disable(fd);



		msm_fd_hw_vbif_unregister(fd);

		msm_fd_hw_bus_release(fd);

		msm_fd_hw_disable_clocks(fd);

		msm_fd_hw_disable_regulators(fd);