Hi Sakari,
Thanks for the patch.
On Thursday 27 September 2012 00:50:36 Sakari Ailus wrote:
> Configure CSI-2 phy based on platform data in the ISP driver. For that, the
> new V4L2_CID_IMAGE_SOURCE_PIXEL_RATE control is used. Previously the same
> was configured from the board code.
>
> This patch is dependent on "omap3: Provide means for changing CSI2 PHY
> configuration".
>
> Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxx>
> Acked-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/platform/omap3isp/isp.h | 3 -
> drivers/media/platform/omap3isp/ispcsiphy.c | 161 +++++++++++++-----------
> drivers/media/platform/omap3isp/ispcsiphy.h | 10 --
> 3 files changed, 90 insertions(+), 84 deletions(-)
>
> diff --git a/drivers/media/platform/omap3isp/isp.h
> b/drivers/media/platform/omap3isp/isp.h index 8be7487..a2f992c 100644
> --- a/drivers/media/platform/omap3isp/isp.h
> +++ b/drivers/media/platform/omap3isp/isp.h
> @@ -127,9 +127,6 @@ struct isp_reg {
>
> struct isp_platform_callback {
> u32 (*set_xclk)(struct isp_device *isp, u32 xclk, u8 xclksel);
> - int (*csiphy_config)(struct isp_csiphy *phy,
> - struct isp_csiphy_dphy_cfg *dphy,
> - struct isp_csiphy_lanes_cfg *lanes);
> };
>
> /*
> diff --git a/drivers/media/platform/omap3isp/ispcsiphy.c
> b/drivers/media/platform/omap3isp/ispcsiphy.c index 348f67e..1d16e66 100644
> --- a/drivers/media/platform/omap3isp/ispcsiphy.c
> +++ b/drivers/media/platform/omap3isp/ispcsiphy.c
> @@ -28,41 +28,13 @@
> #include <linux/device.h>
> #include <linux/regulator/consumer.h>
>
> +#include <mach/control.h>
> +
> #include "isp.h"
> #include "ispreg.h"
> #include "ispcsiphy.h"
>
> /*
> - * csiphy_lanes_config - Configuration of CSIPHY lanes.
> - *
> - * Updates HW configuration.
> - * Called with phy->mutex taken.
> - */
> -static void csiphy_lanes_config(struct isp_csiphy *phy)
> -{
> - unsigned int i;
> - u32 reg;
> -
> - reg = isp_reg_readl(phy->isp, phy->cfg_regs, ISPCSI2_PHY_CFG);
> -
> - for (i = 0; i < phy->num_data_lanes; i++) {
> - reg &= ~(ISPCSI2_PHY_CFG_DATA_POL_MASK(i + 1) |
> - ISPCSI2_PHY_CFG_DATA_POSITION_MASK(i + 1));
> - reg |= (phy->lanes.data[i].pol <<
> - ISPCSI2_PHY_CFG_DATA_POL_SHIFT(i + 1));
> - reg |= (phy->lanes.data[i].pos <<
> - ISPCSI2_PHY_CFG_DATA_POSITION_SHIFT(i + 1));
> - }
> -
> - reg &= ~(ISPCSI2_PHY_CFG_CLOCK_POL_MASK |
> - ISPCSI2_PHY_CFG_CLOCK_POSITION_MASK);
> - reg |= phy->lanes.clk.pol << ISPCSI2_PHY_CFG_CLOCK_POL_SHIFT;
> - reg |= phy->lanes.clk.pos << ISPCSI2_PHY_CFG_CLOCK_POSITION_SHIFT;
> -
> - isp_reg_writel(phy->isp, reg, phy->cfg_regs, ISPCSI2_PHY_CFG);
> -}
> -
> -/*
> * csiphy_power_autoswitch_enable
> * @enable: Sets or clears the autoswitch function enable flag.
> */
> @@ -107,46 +79,32 @@ static int csiphy_set_power(struct isp_csiphy *phy, u32
> power) }
>
> /*
> - * csiphy_dphy_config - Configure CSI2 D-PHY parameters.
> - *
> - * Called with phy->mutex taken.
> + * TCLK values are OK at their reset values
> */
> -static void csiphy_dphy_config(struct isp_csiphy *phy)
> -{
> - u32 reg;
> -
> - /* Set up ISPCSIPHY_REG0 */
> - reg = isp_reg_readl(phy->isp, phy->phy_regs, ISPCSIPHY_REG0);
> -
> - reg &= ~(ISPCSIPHY_REG0_THS_TERM_MASK |
> - ISPCSIPHY_REG0_THS_SETTLE_MASK);
> - reg |= phy->dphy.ths_term << ISPCSIPHY_REG0_THS_TERM_SHIFT;
> - reg |= phy->dphy.ths_settle << ISPCSIPHY_REG0_THS_SETTLE_SHIFT;
> -
> - isp_reg_writel(phy->isp, reg, phy->phy_regs, ISPCSIPHY_REG0);
> -
> - /* Set up ISPCSIPHY_REG1 */
> - reg = isp_reg_readl(phy->isp, phy->phy_regs, ISPCSIPHY_REG1);
> -
> - reg &= ~(ISPCSIPHY_REG1_TCLK_TERM_MASK |
> - ISPCSIPHY_REG1_TCLK_MISS_MASK |
> - ISPCSIPHY_REG1_TCLK_SETTLE_MASK);
> - reg |= phy->dphy.tclk_term << ISPCSIPHY_REG1_TCLK_TERM_SHIFT;
> - reg |= phy->dphy.tclk_miss << ISPCSIPHY_REG1_TCLK_MISS_SHIFT;
> - reg |= phy->dphy.tclk_settle << ISPCSIPHY_REG1_TCLK_SETTLE_SHIFT;
> -
> - isp_reg_writel(phy->isp, reg, phy->phy_regs, ISPCSIPHY_REG1);
> -}
> +#define TCLK_TERM 0
> +#define TCLK_MISS 1
> +#define TCLK_SETTLE 14
>
> -static int csiphy_config(struct isp_csiphy *phy,
> - struct isp_csiphy_dphy_cfg *dphy,
> - struct isp_csiphy_lanes_cfg *lanes)
> +static int omap3isp_csiphy_config(struct isp_csiphy *phy)
> {
> + struct isp_csi2_device *csi2 = phy->csi2;
> + struct isp_pipeline *pipe = to_isp_pipeline(&csi2->subdev.entity);
> + struct isp_v4l2_subdevs_group *subdevs = pipe->external->host_priv;
> + struct isp_csiphy_lanes_cfg *lanes;
> + int csi2_ddrclk_khz;
> unsigned int used_lanes = 0;
> unsigned int i;
> + unsigned int phy_num;
> + u32 reg;
> +
> + if (subdevs->interface == ISP_INTERFACE_CCP2B_PHY1
> + || subdevs->interface == ISP_INTERFACE_CCP2B_PHY2)
> + lanes = &subdevs->bus.ccp2.lanecfg;
> + else
> + lanes = &subdevs->bus.csi2.lanecfg;
>
> /* Clock and data lanes verification */
> - for (i = 0; i < phy->num_data_lanes; i++) {
> + for (i = 0; i < csi2->phy->num_data_lanes; i++) {
> if (lanes->data[i].pol > 1 || lanes->data[i].pos > 3)
> return -EINVAL;
>
> @@ -162,10 +120,72 @@ static int csiphy_config(struct isp_csiphy *phy,
> if (lanes->clk.pos == 0 || used_lanes & (1 << lanes->clk.pos))
> return -EINVAL;
>
> - mutex_lock(&phy->mutex);
> - phy->dphy = *dphy;
> - phy->lanes = *lanes;
> - mutex_unlock(&phy->mutex);
> + switch (subdevs->interface) {
> + case ISP_INTERFACE_CSI2A_PHY2:
> + phy_num = OMAP3_CTRL_CSI2_PHY2_CSI2A;
> + break;
> + case ISP_INTERFACE_CSI2C_PHY1:
> + phy_num = OMAP3_CTRL_CSI2_PHY1_CSI2C;
> + break;
> + case ISP_INTERFACE_CCP2B_PHY1:
> + phy_num = OMAP3_CTRL_CSI2_PHY1_CCP2B;
> + break;
> + case ISP_INTERFACE_CCP2B_PHY2:
> + phy_num = OMAP3_CTRL_CSI2_PHY2_CCP2B;
> + break;
> + default:
> + return -EINVAL;
> + }
> +
> + omap3_ctrl_csi2_phy_cfg(phy_num, true, 0);
> +
> + /* DPHY timing configuration */
> + /* CSI-2 is DDR and we only count used lanes. */
> + csi2_ddrclk_khz = pipe->external_rate / 1000
> + / (2 * hweight32(used_lanes)) * pipe->external_width;
Board code previously used op_sys_clk_freq_hz / 1000 / (2 *
hweight32(used_lanes)). Looking at the SMIA++ PLL code, pipe->external_rate is
equal to op_sys_clk_freq_hz / bits_per_pixel * lane_op_clock_ratio. Both
values are identical if lane_op_clock_ratio is set to 1, which is the case if
the SMIAPP_QUIRK_FLAG_OP_PIX_CLOCK_PER_LANE quirk is not set. Have you
verified that the new CSI2 DDR clock frequency calculation is correct when the
quirk is set ?
> + reg = isp_reg_readl(csi2->isp, csi2->phy->phy_regs, ISPCSIPHY_REG0);
Isn't csi2->phy == phy ? You could then just write
reg = isp_reg_readl(phy->isp, phy->phy_regs, ISPCSIPHY_REG0);
and similarly below.
> + reg &= ~(ISPCSIPHY_REG0_THS_TERM_MASK |
> + ISPCSIPHY_REG0_THS_SETTLE_MASK);
> + /* THS_TERM: Programmed value = ceil(12.5 ns/DDRClk period) - 1. */
> + reg |= (DIV_ROUND_UP(25 * csi2_ddrclk_khz, 2000000) - 1)
> + << ISPCSIPHY_REG0_THS_TERM_SHIFT;
> + /* THS_SETTLE: Programmed value = ceil(90 ns/DDRClk period) + 3. */
> + reg |= (DIV_ROUND_UP(90 * csi2_ddrclk_khz, 1000000) + 3)
> + << ISPCSIPHY_REG0_THS_SETTLE_SHIFT;
> +
> + isp_reg_writel(csi2->isp, reg, csi2->phy->phy_regs, ISPCSIPHY_REG0);
> +
> + reg = isp_reg_readl(csi2->isp, csi2->phy->phy_regs, ISPCSIPHY_REG1);
> +
> + reg &= ~(ISPCSIPHY_REG1_TCLK_TERM_MASK |
> + ISPCSIPHY_REG1_TCLK_MISS_MASK |
> + ISPCSIPHY_REG1_TCLK_SETTLE_MASK);
> + reg |= TCLK_TERM << ISPCSIPHY_REG1_TCLK_TERM_SHIFT;
> + reg |= TCLK_MISS << ISPCSIPHY_REG1_TCLK_MISS_SHIFT;
> + reg |= TCLK_SETTLE << ISPCSIPHY_REG1_TCLK_SETTLE_SHIFT;
> +
> + isp_reg_writel(csi2->isp, reg, csi2->phy->phy_regs, ISPCSIPHY_REG1);
> +
> + /* DPHY lane configuration */
> + reg = isp_reg_readl(csi2->isp, csi2->phy->cfg_regs, ISPCSI2_PHY_CFG);
> +
> + for (i = 0; i < csi2->phy->num_data_lanes; i++) {
> + reg &= ~(ISPCSI2_PHY_CFG_DATA_POL_MASK(i + 1) |
> + ISPCSI2_PHY_CFG_DATA_POSITION_MASK(i + 1));
> + reg |= (lanes->data[i].pol <<
> + ISPCSI2_PHY_CFG_DATA_POL_SHIFT(i + 1));
> + reg |= (lanes->data[i].pos <<
> + ISPCSI2_PHY_CFG_DATA_POSITION_SHIFT(i + 1));
> + }
> +
> + reg &= ~(ISPCSI2_PHY_CFG_CLOCK_POL_MASK |
> + ISPCSI2_PHY_CFG_CLOCK_POSITION_MASK);
> + reg |= lanes->clk.pol << ISPCSI2_PHY_CFG_CLOCK_POL_SHIFT;
> + reg |= lanes->clk.pos << ISPCSI2_PHY_CFG_CLOCK_POSITION_SHIFT;
> +
> + isp_reg_writel(csi2->isp, reg, csi2->phy->cfg_regs, ISPCSI2_PHY_CFG);
>
> return 0;
> }
> @@ -190,8 +210,9 @@ int omap3isp_csiphy_acquire(struct isp_csiphy *phy)
> if (rval < 0)
> goto done;
>
> - csiphy_dphy_config(phy);
> - csiphy_lanes_config(phy);
> + rval = omap3isp_csiphy_config(phy);
> + if (rval < 0)
> + goto done;
>
> rval = csiphy_set_power(phy, ISPCSI2_PHY_CFG_PWR_CMD_ON);
> if (rval) {
> @@ -227,8 +248,6 @@ int omap3isp_csiphy_init(struct isp_device *isp)
> struct isp_csiphy *phy1 = &isp->isp_csiphy1;
> struct isp_csiphy *phy2 = &isp->isp_csiphy2;
>
> - isp->platform_cb.csiphy_config = csiphy_config;
> -
> phy2->isp = isp;
> phy2->csi2 = &isp->isp_csi2a;
> phy2->num_data_lanes = ISP_CSIPHY2_NUM_DATA_LANES;
> diff --git a/drivers/media/platform/omap3isp/ispcsiphy.h
> b/drivers/media/platform/omap3isp/ispcsiphy.h index e93a661..14551fd 100644
> --- a/drivers/media/platform/omap3isp/ispcsiphy.h
> +++ b/drivers/media/platform/omap3isp/ispcsiphy.h
> @@ -32,14 +32,6 @@
> struct isp_csi2_device;
> struct regulator;
>
> -struct isp_csiphy_dphy_cfg {
> - u8 ths_term;
> - u8 ths_settle;
> - u8 tclk_term;
> - unsigned tclk_miss:1;
> - u8 tclk_settle;
> -};
> -
> struct isp_csiphy {
> struct isp_device *isp;
> struct mutex mutex; /* serialize csiphy configuration */
> @@ -52,8 +44,6 @@ struct isp_csiphy {
> unsigned int phy_regs;
>
> u8 num_data_lanes; /* number of CSI2 Data Lanes supported */
> - struct isp_csiphy_lanes_cfg lanes;
> - struct isp_csiphy_dphy_cfg dphy;
> };
>
> int omap3isp_csiphy_acquire(struct isp_csiphy *phy);
--
Regards,
Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
