[PATCH 1/5] video: simple-panel: depend on GPIOLIB

[PATCH 1/5] video: simple-panel: depend on GPIOLIB

[Lucas Stach]

Fixes:
In file included from include/gpio.h:4:0,
                 from drivers/video/simple-panel.c:26:
fatal error: mach/gpio.h: No such file or directory

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/video/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 812c540d71a2..2f5069fb2640 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -127,6 +127,7 @@ config DRIVER_VIDEO_MTL017
 config DRIVER_VIDEO_SIMPLE_PANEL
 	bool "Simple panel support"
 	select VIDEO_VPL
+	depends on GPIOLIB
 	help
 	  This enabled support for simple panels, i.e. panels which consist of
 	  a mode definition and enable gpios in the devicetree. Unlike the
-- 
2.4.6


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/5] video: mtl017: depend on GPIOLIB

[Lucas Stach]

Fixes:
In file included from include/gpio.h:4:0,
                 from drivers/video/simple-panel.c:26:
fatal error: mach/gpio.h: No such file or directory

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/video/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 2f5069fb2640..9a520c586971 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -120,6 +120,7 @@ config DRIVER_VIDEO_MTL017
 	bool "MTL017 LVDS encoder"
 	select VIDEO_VPL
 	depends on I2C
+	depends on GPIOLIB
 	help
 	  The MTL017 is a parallel to lvds video encoder chip found on the
 	  Efika MX Smartbook.
-- 
2.4.6


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/5] video: ipu-fb: mark internally used functions as static

[Lucas Stach]

Fixes symbol clashes with the IPUv3 driver:
In function `ipu_ch_param_write_field':
drivers/video/imx-ipu-v3/ipu-common.c:103: multiple definition of `ipu_ch_param_write_field'
drivers/video/imx-ipu-fb.c:359: first defined here

In function `ipu_cpmem_set_format_rgb':
drivers/video/imx-ipu-v3/ipu-common.c:155: multiple definition of `ipu_cpmem_set_format_rgb'
drivers/video/imx-ipu-fb.c:504: first defined here

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/video/imx-ipu-fb.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c
index b56658202c5f..a87e720d9615 100644
--- a/drivers/video/imx-ipu-fb.c
+++ b/drivers/video/imx-ipu-fb.c
@@ -355,7 +355,8 @@ struct ipu_ch_param {
 	struct ipu_cpmem_word word[2];
 };
 
-void ipu_ch_param_write_field(struct ipu_ch_param __iomem *base, u32 wbs, u32 v)
+static void ipu_ch_param_write_field(struct ipu_ch_param __iomem *base,
+				     u32 wbs, u32 v)
 {
 	u32 bit = (wbs >> 8) % 160;
 	u32 size = wbs & 0xff;
@@ -500,7 +501,8 @@ static int sdc_init_panel(struct fb_info *info, enum disp_data_mapping fmt)
 	return 0;
 }
 
-int ipu_cpmem_set_format_rgb(struct ipu_ch_param *p, struct imx_ipu_fb_rgb *rgb)
+static int ipu_cpmem_set_format_rgb(struct ipu_ch_param *p,
+				    struct imx_ipu_fb_rgb *rgb)
 {
 	int bpp = 0, npb = 0, ro, go, bo, to;
 
-- 
2.4.6


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 4/5] video: fbcon: needs console support

[Lucas Stach]

Fixes:
In function `register_fbconsole':
drivers/video/fbconsole.c:425: undefined reference to `console_register

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/video/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 9a520c586971..bb8bbb539481 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -7,6 +7,7 @@ if VIDEO
 
 config FRAMEBUFFER_CONSOLE
 	bool
+	depends on !CONSOLE_NONE
 	select IMAGE_RENDERER
 	select FONTS
 	prompt "framebuffer console support"
-- 
2.4.6


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 5/5] ARM: imx6: select OFTREE

[Lucas Stach]

i.MX6 is fully DT enabled and the already selected
COMMON_CLK_OF_PROVIDER needs OFTREE support to build properly.

Fixes:
arch/arm/mach-imx/clk-imx6.c: In function 'imx6_ccm_probe':
arch/arm/mach-imx/clk-imx6.c:500:2: error:
    invalid use of undefined type 'struct clk_onecell_data'
arch/arm/mach-imx/clk-imx6.c:502:2: error:
    implicit declaration of function 'of_clk_add_provider'

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/mach-imx/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index a4298416fcdf..1693870b7ee8 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -178,12 +178,14 @@ config ARCH_IMX6
 	select ARCH_HAS_FEC_IMX
 	select CPU_V7
 	select PINCTRL_IMX_IOMUX_V3
+	select OFTREE
 	select COMMON_CLK_OF_PROVIDER
 	select HW_HAS_PCI
 
 config ARCH_IMX6SX
 	bool
 	select ARCH_IMX6
+	select OFTREE
 	select COMMON_CLK_OF_PROVIDER
 
 config IMX_MULTI_BOARDS
-- 
2.4.6


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/5] video: simple-panel: depend on GPIOLIB

[Sascha Hauer]

On Fri, Aug 14, 2015 at 12:16:41PM +0200, Lucas Stach wrote:
> Fixes:
> In file included from include/gpio.h:4:0,
>                  from drivers/video/simple-panel.c:26:
> fatal error: mach/gpio.h: No such file or directory
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

This should be fixed in current next. We now have static inline no-op
wrappers for architectures which do not have gpio support.

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 3/5] video: ipu-fb: mark internally used functions as static

[Sascha Hauer]

On Fri, Aug 14, 2015 at 12:16:43PM +0200, Lucas Stach wrote:
> Fixes symbol clashes with the IPUv3 driver:
> In function `ipu_ch_param_write_field':
> drivers/video/imx-ipu-v3/ipu-common.c:103: multiple definition of `ipu_ch_param_write_field'
> drivers/video/imx-ipu-fb.c:359: first defined here
> 
> In function `ipu_cpmem_set_format_rgb':
> drivers/video/imx-ipu-v3/ipu-common.c:155: multiple definition of `ipu_cpmem_set_format_rgb'
> drivers/video/imx-ipu-fb.c:504: first defined here
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 4/5] video: fbcon: needs console support

[Sascha Hauer]

On Fri, Aug 14, 2015 at 12:16:44PM +0200, Lucas Stach wrote:
> Fixes:
> In function `register_fbconsole':
> drivers/video/fbconsole.c:425: undefined reference to `console_register
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  drivers/video/Kconfig | 1 +
>  1 file changed, 1 insertion(+)

Applied, thanks

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 5/5] ARM: imx6: select OFTREE

[Sascha Hauer]

On Fri, Aug 14, 2015 at 12:16:45PM +0200, Lucas Stach wrote:
> i.MX6 is fully DT enabled and the already selected
> COMMON_CLK_OF_PROVIDER needs OFTREE support to build properly.
> 
> Fixes:
> arch/arm/mach-imx/clk-imx6.c: In function 'imx6_ccm_probe':
> arch/arm/mach-imx/clk-imx6.c:500:2: error:
>     invalid use of undefined type 'struct clk_onecell_data'
> arch/arm/mach-imx/clk-imx6.c:502:2: error:
>     implicit declaration of function 'of_clk_add_provider'
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  arch/arm/mach-imx/Kconfig | 2 ++
>  1 file changed, 2 insertions(+)

Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox