diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-10-07 08:23:45 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-10-07 08:23:45 +0200 |
| commit | c8fa7eed6695fb261cdeba49136ac8611e409952 (patch) | |
| tree | 43aa2bc1ee12777cb4937ed3a70cad4e12ce3d92 /drivers/video | |
| parent | 7bf2e891a4909f1cd4c765761b05984b5ff962bb (diff) | |
| parent | 1c9e671462ad4f4e294e962417e122da2a762e65 (diff) | |
| download | barebox-c8fa7eed6695fb261cdeba49136ac8611e409952.tar.gz barebox-c8fa7eed6695fb261cdeba49136ac8611e409952.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/imx-hdmi.c | 1 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/imx-ldb.c | 8 |
4 files changed, 8 insertions, 5 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 501e9fa7d3..d31bdfe8f0 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -13,6 +13,7 @@ config FRAMEBUFFER_CONSOLE prompt "framebuffer console support" config VIDEO_VPL + depends on OFTREE bool config DRIVER_VIDEO_ATMEL @@ -121,6 +122,7 @@ config DRIVER_VIDEO_MTL017 bool "MTL017 LVDS encoder" select VIDEO_VPL depends on I2C + depends on OFTREE help The MTL017 is a parallel to lvds video encoder chip found on the Efika MX Smartbook. @@ -128,6 +130,7 @@ config DRIVER_VIDEO_MTL017 config DRIVER_VIDEO_SIMPLE_PANEL bool "Simple panel support" select VIDEO_VPL + depends on OFTREE help This enabled support for simple panels, i.e. panels which consist of a mode definition and enable gpios in the devicetree. Unlike the diff --git a/drivers/video/imx-ipu-v3/Kconfig b/drivers/video/imx-ipu-v3/Kconfig index 386ff5bc2e..b5ee4efb15 100644 --- a/drivers/video/imx-ipu-v3/Kconfig +++ b/drivers/video/imx-ipu-v3/Kconfig @@ -13,6 +13,7 @@ config DRIVER_VIDEO_IMX_IPUV3_LVDS config DRIVER_VIDEO_IMX_IPUV3_HDMI bool "IPUv3 HDMI support" + depends on DRIVER_VIDEO_EDID select OFDEVICE endif diff --git a/drivers/video/imx-ipu-v3/imx-hdmi.c b/drivers/video/imx-ipu-v3/imx-hdmi.c index fa55b19c94..25fcb0c739 100644 --- a/drivers/video/imx-ipu-v3/imx-hdmi.c +++ b/drivers/video/imx-ipu-v3/imx-hdmi.c @@ -132,7 +132,6 @@ struct dw_hdmi { bool phy_enabled; - struct regmap *regmap; struct device_node *ddc_node;; void __iomem *regs; diff --git a/drivers/video/imx-ipu-v3/imx-ldb.c b/drivers/video/imx-ipu-v3/imx-ldb.c index 1e9231f3f1..a41eb1a3fc 100644 --- a/drivers/video/imx-ipu-v3/imx-ldb.c +++ b/drivers/video/imx-ipu-v3/imx-ldb.c @@ -163,7 +163,7 @@ static int imx6q_ldb_prepare(struct imx_ldb_channel *imx_ldb_ch, int di) diclk = clk_lookup(clkname); free(clkname); if (IS_ERR(diclk)) { - dev_err(ldb->dev, "failed to get di clk: %s\n", strerror(PTR_ERR(diclk))); + dev_err(ldb->dev, "failed to get di clk: %s\n", strerrorp(diclk)); return PTR_ERR(diclk); } @@ -171,7 +171,7 @@ static int imx6q_ldb_prepare(struct imx_ldb_channel *imx_ldb_ch, int di) ldbclk = clk_lookup(clkname); free(clkname); if (IS_ERR(ldbclk)) { - dev_err(ldb->dev, "failed to get ldb clk: %s\n", strerror(PTR_ERR(ldbclk))); + dev_err(ldb->dev, "failed to get ldb clk: %s\n", strerrorp(ldbclk)); return PTR_ERR(ldbclk); } @@ -203,7 +203,7 @@ static int imx53_ldb_prepare(struct imx_ldb_channel *imx_ldb_ch, int di) diclk = clk_lookup(clkname); free(clkname); if (IS_ERR(diclk)) { - dev_err(ldb->dev, "failed to get di clk: %s\n", strerror(PTR_ERR(diclk))); + dev_err(ldb->dev, "failed to get di clk: %s\n", strerrorp(diclk)); return PTR_ERR(diclk); } @@ -211,7 +211,7 @@ static int imx53_ldb_prepare(struct imx_ldb_channel *imx_ldb_ch, int di) ldbclk = clk_lookup(clkname); free(clkname); if (IS_ERR(ldbclk)) { - dev_err(ldb->dev, "failed to get ldb clk: %s\n", strerror(PTR_ERR(ldbclk))); + dev_err(ldb->dev, "failed to get ldb clk: %s\n", strerrorp(ldbclk)); return PTR_ERR(ldbclk); } |