diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-08-17 18:24:13 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-08-17 18:24:13 +0200 |
| commit | 9ed887caecb9ecb0c68773a1870d143b9f28d3da (patch) | |
| tree | 08c0259674f532de0d272740e4b7dcd778132fe0 /drivers | |
| parent | 425faf74cd8189c87919f7e72a0101c684ee3b9f (diff) | |
| parent | 326ea986ac150acdc7656d57fca647db80b50158 (diff) | |
| download | talos-obmc-uboot-9ed887caecb9ecb0c68773a1870d143b9f28d3da.tar.gz talos-obmc-uboot-9ed887caecb9ecb0c68773a1870d143b9f28d3da.zip | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/mxc_gpio.c | 4 | ||||
| -rw-r--r-- | drivers/video/mxc_ipuv3_fb.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index 46c0255adc..6a572d5454 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -127,10 +127,10 @@ int gpio_direction_input(unsigned gpio) int gpio_direction_output(unsigned gpio, int value) { - int ret = mxc_gpio_direction(gpio, MXC_GPIO_DIRECTION_OUT); + int ret = gpio_set_value(gpio, value); if (ret < 0) return ret; - return gpio_set_value(gpio, value); + return mxc_gpio_direction(gpio, MXC_GPIO_DIRECTION_OUT); } diff --git a/drivers/video/mxc_ipuv3_fb.c b/drivers/video/mxc_ipuv3_fb.c index fd74370ed4..3e21fb2306 100644 --- a/drivers/video/mxc_ipuv3_fb.c +++ b/drivers/video/mxc_ipuv3_fb.c @@ -399,8 +399,9 @@ static int mxcfb_map_video_memory(struct fb_info *fbi) fbi->fix.smem_len = fbi->var.yres_virtual * fbi->fix.line_length; } - - fbi->screen_base = (char *)malloc(fbi->fix.smem_len); + fbi->fix.smem_len = roundup(fbi->fix.smem_len, ARCH_DMA_MINALIGN); + fbi->screen_base = (char *)memalign(ARCH_DMA_MINALIGN, + fbi->fix.smem_len); fbi->fix.smem_start = (unsigned long)fbi->screen_base; if (fbi->screen_base == 0) { puts("Unable to allocate framebuffer memory\n"); |
