diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2015-03-07 12:00:02 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2015-03-10 15:20:25 +0100 |
| commit | 1fc42018a0fe833a4332f8f32d6aeb675f3dcd1d (patch) | |
| tree | 758c392ee25a27c2bbf0e4ed8cba504f38ddb5b4 | |
| parent | b4db74cfd0f1a7716e1e127ff0f515495abeecc1 (diff) | |
| download | talos-obmc-uboot-1fc42018a0fe833a4332f8f32d6aeb675f3dcd1d.tar.gz talos-obmc-uboot-1fc42018a0fe833a4332f8f32d6aeb675f3dcd1d.zip | |
sunxi: video: Fix VIDEO_LCD_PANEL_I2C being enabled by default
Fix a typo in board/sunxi/Kconfig which caused VIDEO_LCD_PANEL_I2C to be
enabled on all sunxi boards. Also fix a compile error which shows up once
VIDEO_LCD_PANEL_I2C is actually disabled on most boards as it should be.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
| -rw-r--r-- | board/sunxi/Kconfig | 2 | ||||
| -rw-r--r-- | include/configs/sunxi-common.h | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 9cf54e51ac..9d0eb91977 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -355,7 +355,7 @@ config VIDEO_LCD_BL_PWM_ACTIVE_LOW config VIDEO_LCD_PANEL_I2C bool "LCD panel needs to be configured via i2c" depends on VIDEO - default m + default n ---help--- Say y here if the LCD panel needs to be configured via i2c. This will add a bitbang i2c controller using gpios to talk to the LCD. diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index bd7d049277..1f7a1cb1f4 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -204,8 +204,6 @@ #define CONFIG_SYS_I2C_SOFT #define CONFIG_SYS_I2C_SOFT_SPEED 50000 #define CONFIG_SYS_I2C_SOFT_SLAVE 0x00 -#define CONFIG_VIDEO_LCD_I2C_BUS 0 /* The lcd panel soft i2c is bus 0 */ -#define CONFIG_SYS_SPD_BUS_NUM 1 /* And the axp209 i2c bus is bus 1 */ /* We use pin names in Kconfig and sunxi_name_to_gpio() */ #define CONFIG_SOFT_I2C_GPIO_SDA soft_i2c_gpio_sda #define CONFIG_SOFT_I2C_GPIO_SCL soft_i2c_gpio_scl @@ -213,6 +211,11 @@ extern int soft_i2c_gpio_sda; extern int soft_i2c_gpio_scl; #endif +#define CONFIG_VIDEO_LCD_I2C_BUS 0 /* The lcd panel soft i2c is bus 0 */ +#define CONFIG_SYS_SPD_BUS_NUM 1 /* And the axp209 i2c bus is bus 1 */ +#else +#define CONFIG_SYS_SPD_BUS_NUM 0 /* The axp209 i2c bus is bus 0 */ +#define CONFIG_VIDEO_LCD_I2C_BUS -1 /* NA, but necessary to compile */ #endif #define CONFIG_CMD_I2C |
