diff options
| author | Tom Rini <trini@konsulko.com> | 2018-11-15 02:25:34 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-11-15 02:25:34 +0300 |
| commit | 6f443330186676004148930b4dd77f1c2735bd36 (patch) | |
| tree | f1cc00c2b5210e7bd13f527b0698bfeaf783ac86 /board | |
| parent | 208ecbad2ea83333e8f3c9933213867addf16f4a (diff) | |
| parent | 7d121a8ea4e0dbf0d7e105b57c3dbd7d8bd2e729 (diff) | |
| download | u-boot-6f443330186676004148930b4dd77f1c2735bd36.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'board')
| -rw-r--r-- | board/sunxi/MAINTAINERS | 10 | ||||
| -rw-r--r-- | board/sunxi/board.c | 6 |
2 files changed, 16 insertions, 0 deletions
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index 2f95976445..478e37285f 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -149,6 +149,11 @@ S: Maintained F: configs/Bananapi_m2m_defconfig F: arch/arm/dts/sun8i-r16-bananapi-m2m.dts +BANANAPI M2 ZERO BOARD +M: Icenowy Zheng <icenowy@aosc.io> +S: Maintained +F: configs/bananapi_m2_zero_defconfig + BANANAPI M64 M: Jagan Teki <jagan@amarulasolutions.com> S: Maintained @@ -330,6 +335,11 @@ S: Maintained F: configs/A20-Olimex-SOM204-EVB_defconfig F: configs/A20-Olimex-SOM204-EVB-eMMC_defconfig +ORANGEPI LITE2 BOARD +M: Jagan Teki <jagan@openedev.com> +S: Maintained +F: configs/orangepi_lite2_defconfig + ORANGEPI ONE PLUS BOARD M: Jagan Teki <jagan@amarulasolutions.com> S: Maintained diff --git a/board/sunxi/board.c b/board/sunxi/board.c index b196d48674..64ccbc7245 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -168,10 +168,16 @@ void i2c_init_board(void) #endif #ifdef CONFIG_R_I2C_ENABLE +#ifdef CONFIG_MACH_SUN50I + clock_twi_onoff(5, 1); + sunxi_gpio_set_cfgpin(SUNXI_GPL(8), SUN50I_GPL_R_TWI); + sunxi_gpio_set_cfgpin(SUNXI_GPL(9), SUN50I_GPL_R_TWI); +#else clock_twi_onoff(5, 1); sunxi_gpio_set_cfgpin(SUNXI_GPL(0), SUN8I_H3_GPL_R_TWI); sunxi_gpio_set_cfgpin(SUNXI_GPL(1), SUN8I_H3_GPL_R_TWI); #endif +#endif } #if defined(CONFIG_ENV_IS_IN_MMC) && defined(CONFIG_ENV_IS_IN_FAT) |