mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-21 14:41:31 +00:00
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>
This commit is contained in:
parent
b4db74cfd0
commit
1fc42018a0
2 changed files with 6 additions and 3 deletions
|
@ -355,7 +355,7 @@ config VIDEO_LCD_BL_PWM_ACTIVE_LOW
|
||||||
config VIDEO_LCD_PANEL_I2C
|
config VIDEO_LCD_PANEL_I2C
|
||||||
bool "LCD panel needs to be configured via i2c"
|
bool "LCD panel needs to be configured via i2c"
|
||||||
depends on VIDEO
|
depends on VIDEO
|
||||||
default m
|
default n
|
||||||
---help---
|
---help---
|
||||||
Say y here if the LCD panel needs to be configured via i2c. This
|
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.
|
will add a bitbang i2c controller using gpios to talk to the LCD.
|
||||||
|
|
|
@ -204,8 +204,6 @@
|
||||||
#define CONFIG_SYS_I2C_SOFT
|
#define CONFIG_SYS_I2C_SOFT
|
||||||
#define CONFIG_SYS_I2C_SOFT_SPEED 50000
|
#define CONFIG_SYS_I2C_SOFT_SPEED 50000
|
||||||
#define CONFIG_SYS_I2C_SOFT_SLAVE 0x00
|
#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() */
|
/* 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_SDA soft_i2c_gpio_sda
|
||||||
#define CONFIG_SOFT_I2C_GPIO_SCL soft_i2c_gpio_scl
|
#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_sda;
|
||||||
extern int soft_i2c_gpio_scl;
|
extern int soft_i2c_gpio_scl;
|
||||||
#endif
|
#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
|
#endif
|
||||||
|
|
||||||
#define CONFIG_CMD_I2C
|
#define CONFIG_CMD_I2C
|
||||||
|
|
Loading…
Add table
Reference in a new issue