diff options
| author | Adrian Alonso <aalonso@freescale.com> | 2013-02-19 10:49:19 -0600 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2013-04-03 16:51:26 +0800 |
| commit | 32d8da99e148e46f236c0d5a988507372b5c80da (patch) | |
| tree | 53c1f90d776bc8550a3b8e867fe74fbc43cbc10e | |
| parent | f16a7b215b9f92b6784ac15a8e1fb9765fc2863b (diff) | |
ENGR00237365: board-mx6q_sabreauto fix mipi-csi2 settings
* Correct mipi-csi2 settings only one data line is used
* Add mx6q_mipi_csi1_io_init ipu-csi setting callback
use virtual channel 1 and attach it to CSI1 -> IPU0
* Set i2c slave address to 0x52
* Set ipu-csi clko_clk
Signed-off-by: Adrian Alonso <aalonso@freescale.com>
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabreauto.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabreauto.c b/arch/arm/mach-mx6/board-mx6q_sabreauto.c index f175c8b2f431..fb590f576a0d 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabreauto.c +++ b/arch/arm/mach-mx6/board-mx6q_sabreauto.c @@ -725,6 +725,12 @@ static struct fsl_mxc_tvin_platform_data adv7180_data = { .io_init = mx6q_csi0_io_init, }; +static void mx6q_mipi_csi1_io_init(void) +{ + if (cpu_is_mx6dl()) + mxc_iomux_set_gpr_register(13, 3, 3, 1); +} + static struct fsl_mxc_tvin_platform_data adv7280_data = { .dvddio_reg = NULL, .dvdd_reg = NULL, @@ -732,8 +738,9 @@ static struct fsl_mxc_tvin_platform_data adv7280_data = { .pvdd_reg = NULL, .pwdn = NULL, .cvbs = true, + .io_init = mx6q_mipi_csi1_io_init, /* csi slave reg address */ - .csi_tx_addr = 0x51, + .csi_tx_addr = 0x52, }; static struct imxi2c_platform_data mx6q_sabreauto_i2c2_data = { @@ -1084,10 +1091,10 @@ static struct fsl_mxc_ldb_platform_data ldb_data = { static struct imx_ipuv3_platform_data ipu_data[] = { { .rev = 4, - .csi_clk[0] = "ccm_clk0", + .csi_clk[0] = "clko_clk", }, { .rev = 4, - .csi_clk[0] = "ccm_clk0", + .csi_clk[0] = "clko_clk", }, }; @@ -1160,9 +1167,9 @@ static const struct flexcan_platform_data static struct mipi_csi2_platform_data mipi_csi2_pdata = { .ipu_id = 0, - .csi_id = 0, - .v_channel = 0, - .lanes = 2, + .csi_id = 1, + .v_channel = 1, + .lanes = 1, .dphy_clk = "mipi_pllref_clk", .pixel_clk = "emi_clk", }; |