diff options
| author | Tom Rini <[email protected]> | 2018-01-26 13:22:40 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2018-01-26 13:22:40 -0500 |
| commit | 748277c415ff5bd74d6913928cab2a3da6a0b69f (patch) | |
| tree | 696d1e5f0a37c3d80752a30fafb37ea2763bbe2e /drivers | |
| parent | ab12aa24e619b5e81cbde7de88c6d9a19f04313b (diff) | |
| parent | a6968ecb0ad6b06552c97005eba265a4c5761626 (diff) | |
Merge git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dfu/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/gpio/sunxi_gpio.c | 1 | ||||
| -rw-r--r-- | drivers/video/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/video/sunxi/sunxi_display.c | 2 |
4 files changed, 6 insertions, 0 deletions
diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig index 56a98f5273c..fa27efbb405 100644 --- a/drivers/dfu/Kconfig +++ b/drivers/dfu/Kconfig @@ -2,6 +2,7 @@ menu "DFU support" config USB_FUNCTION_DFU bool + select HASH if CMD_DFU config DFU_TFTP diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c index b47cc66c583..3cf01b6e369 100644 --- a/drivers/gpio/sunxi_gpio.c +++ b/drivers/gpio/sunxi_gpio.c @@ -345,6 +345,7 @@ static const struct udevice_id sunxi_gpio_ids[] = { ID("allwinner,sun4i-a10-pinctrl", a_all), ID("allwinner,sun5i-a10s-pinctrl", a_all), ID("allwinner,sun5i-a13-pinctrl", a_all), + ID("allwinner,sun50i-h5-pinctrl", a_all), ID("allwinner,sun6i-a31-pinctrl", a_all), ID("allwinner,sun6i-a31s-pinctrl", a_all), ID("allwinner,sun7i-a20-pinctrl", a_all), diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 45a105db06a..2fc0defcd0d 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -38,6 +38,7 @@ config BACKLIGHT_GPIO config VIDEO_BPP8 bool "Support 8-bit-per-pixel displays" depends on DM_VIDEO + default n if ARCH_SUNXI default y if DM_VIDEO help Support drawing text and bitmaps onto a 8-bit-per-pixel display. @@ -48,6 +49,7 @@ config VIDEO_BPP8 config VIDEO_BPP16 bool "Support 16-bit-per-pixel displays" depends on DM_VIDEO + default n if ARCH_SUNXI default y if DM_VIDEO help Support drawing text and bitmaps onto a 16-bit-per-pixel display. diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c index 0630289c0a1..f191ef16c63 100644 --- a/drivers/video/sunxi/sunxi_display.c +++ b/drivers/video/sunxi/sunxi_display.c @@ -625,6 +625,8 @@ static void sunxi_ctfb_mode_to_display_timing(const struct ctfb_res_modes *mode, timing->vback_porch.typ = mode->upper_margin; timing->vsync_len.typ = mode->vsync_len; + timing->flags = 0; + if (mode->sync & FB_SYNC_HOR_HIGH_ACT) timing->flags |= DISPLAY_FLAGS_HSYNC_HIGH; else |