diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-24 23:30:48 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-24 23:30:48 +0300 |
| commit | d01806a8fcbdaedcc67cead56ece572021d97ab7 (patch) | |
| tree | 8c893de10b80db16e01c2253a7cbb0a955123b76 /board | |
| parent | 68489ed037530ec29fc0bc452ad6e4b0c5db02ec (diff) | |
| parent | 543049ab590620a91b37fa0296edd3bcddd0eba2 (diff) | |
| download | u-boot-d01806a8fcbdaedcc67cead56ece572021d97ab7.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'board')
| -rw-r--r-- | board/sunxi/MAINTAINERS | 5 | ||||
| -rw-r--r-- | board/sunxi/board.c | 12 |
2 files changed, 17 insertions, 0 deletions
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index 9b6e0c4c21..608a86be49 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -182,6 +182,11 @@ M: Chen-Yu Tsai <wens@csie.org> S: Maintained F: configs/Cubietruck_plus_defconfig +EMLID NEUTIS N5 DEV BOARD +M: Aleksandr Aleksandrov <aleksandr.aleksandrov@emlid.com> +S: Maintained +F: configs/emlid_neutis_n5_devboard_defconfig + GEMEI-G9 TABLET M: Priit Laes <plaes@plaes.org> S: Maintained diff --git a/board/sunxi/board.c b/board/sunxi/board.c index f022f365e9..ad14837291 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -98,6 +98,10 @@ void i2c_init_board(void) sunxi_gpio_set_cfgpin(SUNXI_GPH(2), SUN8I_GPH_TWI0); sunxi_gpio_set_cfgpin(SUNXI_GPH(3), SUN8I_GPH_TWI0); clock_twi_onoff(0, 1); +#elif defined(CONFIG_MACH_SUN50I) + sunxi_gpio_set_cfgpin(SUNXI_GPH(0), SUN50I_GPH_TWI0); + sunxi_gpio_set_cfgpin(SUNXI_GPH(1), SUN50I_GPH_TWI0); + clock_twi_onoff(0, 1); #endif #endif @@ -120,6 +124,10 @@ void i2c_init_board(void) sunxi_gpio_set_cfgpin(SUNXI_GPH(4), SUN8I_GPH_TWI1); sunxi_gpio_set_cfgpin(SUNXI_GPH(5), SUN8I_GPH_TWI1); clock_twi_onoff(1, 1); +#elif defined(CONFIG_MACH_SUN50I) + sunxi_gpio_set_cfgpin(SUNXI_GPH(2), SUN50I_GPH_TWI1); + sunxi_gpio_set_cfgpin(SUNXI_GPH(3), SUN50I_GPH_TWI1); + clock_twi_onoff(1, 1); #endif #endif @@ -142,6 +150,10 @@ void i2c_init_board(void) sunxi_gpio_set_cfgpin(SUNXI_GPE(12), SUN8I_GPE_TWI2); sunxi_gpio_set_cfgpin(SUNXI_GPE(13), SUN8I_GPE_TWI2); clock_twi_onoff(2, 1); +#elif defined(CONFIG_MACH_SUN50I) + sunxi_gpio_set_cfgpin(SUNXI_GPE(14), SUN50I_GPE_TWI2); + sunxi_gpio_set_cfgpin(SUNXI_GPE(15), SUN50I_GPE_TWI2); + clock_twi_onoff(2, 1); #endif #endif |