[PATCH 1/4] video: backlight-pwm: depend on GPIOLIB

[PATCH 1/4] video: backlight-pwm: depend on GPIOLIB

[Lucas Stach]

The PWM backlight driver does not only control PWMs but also GPIOs.

Fixes:
In file included from include/gpio.h:4:0,
                 from drivers/video/backlight-pwm.c:27:
arch/arm/include/asm/gpio.h:5:23: fatal error: mach/gpio.h: No such file or directory

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

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 8e6ae99b9516..921b603a288d 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -100,7 +100,7 @@ config DRIVER_VIDEO_BACKLIGHT
 
 config DRIVER_VIDEO_BACKLIGHT_PWM
 	bool "PWM backlight support"
-	depends on PWM
+	depends on PWM && GPIOLIB
 	depends on DRIVER_VIDEO_BACKLIGHT
 	help
 	  Enable this to get support for backlight devices driven by a PWM.
-- 
2.1.4


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

[PATCH 2/4] net: enc28j60: fix set mac function signature

[Lucas Stach]

Fixes:
drivers/net/enc28j60.c: In function 'enc28j60_probe':
drivers/net/enc28j60.c:947:20: warning: assignment from incompatible pointer type
  edev->set_ethaddr = enc28j60_set_ethaddr;

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/net/enc28j60.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index 76b3df63f6ec..6550c59fc8d2 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -422,7 +422,7 @@ static int enc28j60_get_ethaddr(struct eth_device *edev, unsigned char *m)
  * Program the hardware MAC address from dev->dev_addr.
  */
 static int enc28j60_set_ethaddr(struct eth_device *edev,
-					unsigned char *mac_addr)
+				const unsigned char *mac_addr)
 {
 	int ret;
 	struct enc28j60_net *priv = edev->priv;
-- 
2.1.4


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

[PATCH 3/4] ARM: imx: guf-neso: only try to enable USB if USB_ULPI is configured

[Lucas Stach]

Avoids a build failure if the config does not include ULPI support.
This is similar to what has been done to the PCA100 board.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/boards/guf-neso/board.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boards/guf-neso/board.c b/arch/arm/boards/guf-neso/board.c
index 67fd50849d5f..f40f0d15914d 100644
--- a/arch/arm/boards/guf-neso/board.c
+++ b/arch/arm/boards/guf-neso/board.c
@@ -110,7 +110,7 @@ static struct imx_fb_platform_data neso_fb_data = {
 	.framebuffer_ovl = (void *)0xa7f00000,
 };
 
-#ifdef CONFIG_USB
+#if defined(CONFIG_USB) && defined(CONFIG_USB_ULPI)
 static void neso_usbh_init(void)
 {
 	uint32_t temp;
@@ -130,7 +130,11 @@ static void neso_usbh_init(void)
 	gpio_set_value(USBH2_PHY_CS_GPIO, 0);
 	mdelay(10);
 	ulpi_setup((void *)(MX27_USB_OTG_BASE_ADDR + 0x570), 1);
+	add_generic_usb_ehci_device(DEVICE_ID_DYNAMIC,
+				    MX27_USB_OTG_BASE_ADDR + 0x400, NULL);
 }
+#else
+static void neso_usbh_init(void) { }
 #endif
 
 static int neso_devices_init(void)
@@ -266,10 +270,7 @@ static int neso_devices_init(void)
 	imx27_add_nand(&nand_info);
 	imx27_add_fb(&neso_fb_data);
 
-#ifdef CONFIG_USB
 	neso_usbh_init();
-	add_generic_usb_ehci_device(DEVICE_ID_DYNAMIC, MX27_USB_OTG_BASE_ADDR + 0x400, NULL);
-#endif
 
 	imx27_add_fec(&fec_info);
 
-- 
2.1.4


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

[PATCH 4/4] pinctrl: imx-iomux-v2: correct names in EXPORT_SYMBOL macros

[Lucas Stach]

The functions have been renamed, but this has not been reflected in the
EXPORT_SYMBOL macros. Do that now.

Fixes several errors like this:
drivers/pinctrl/imx-iomux-v2.c:61:15: error:
	'mxc_iomux_mode' undeclared here (not in a function)
 EXPORT_SYMBOL(mxc_iomux_mode);

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/pinctrl/imx-iomux-v2.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/pinctrl/imx-iomux-v2.c b/drivers/pinctrl/imx-iomux-v2.c
index 2622d9a2d654..1e0e8e9fd672 100644
--- a/drivers/pinctrl/imx-iomux-v2.c
+++ b/drivers/pinctrl/imx-iomux-v2.c
@@ -58,7 +58,7 @@ int imx_iomux_mode(unsigned int pin_mode)
 
 	return ret;
 }
-EXPORT_SYMBOL(mxc_iomux_mode);
+EXPORT_SYMBOL(imx_iomux_mode);
 
 /*
  * This function configures the pad value for a IOMUX pin.
@@ -83,7 +83,7 @@ void imx_iomux_set_pad(enum iomux_pins pin, u32 config)
 	l |= config << (field * 10);
 	writel(l, reg);
 }
-EXPORT_SYMBOL(mxc_iomux_set_pad);
+EXPORT_SYMBOL(imx_iomux_set_pad);
 
 /*
  * This function enables/disables the general purpose function for a particular
@@ -104,7 +104,7 @@ void imx_iomux_set_gpr(enum iomux_gp_func gp, bool en)
 
 	writel(l, base + IOMUXGPR);
 }
-EXPORT_SYMBOL(mxc_iomux_set_gpr);
+EXPORT_SYMBOL(imx_iomux_set_gpr);
 
 int imx_iomux_setup_multiple_pins(const unsigned int *pin_list, unsigned count)
 {
-- 
2.1.4


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

Re: [PATCH 1/4] video: backlight-pwm: depend on GPIOLIB

[Sascha Hauer]

On Mon, Jul 27, 2015 at 05:48:30PM +0200, Lucas Stach wrote:
> The PWM backlight driver does not only control PWMs but also GPIOs.
> 
> Fixes:
> In file included from include/gpio.h:4:0,
>                  from drivers/video/backlight-pwm.c:27:
> arch/arm/include/asm/gpio.h:5:23: fatal error: mach/gpio.h: No such file or directory
> 
> 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