LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: samsung: Convert s5p_goni and smdkc100 to DM_I2C 

These are the last two samsung boards that don't use DM_I2C. Move them
over, leaving #ifdefs to allow the maintainer to complete this work.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
Simon Glass 2016-11-23 06:34:41 -07:00 committed by Heiko Schocher
parent fc47cf9d05
commit 08848e9c31
3 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@ -419,6 +419,7 @@ config ARCH_S5PC1XX
select DM select DM
select DM_SERIAL select DM_SERIAL
select DM_GPIO select DM_GPIO
select DM_I2C
config ARCH_HIGHBANK config ARCH_HIGHBANK
bool "Calxeda Highbank" bool "Calxeda Highbank"

7
board/samsung/goni/goni.c
View File

@ -45,11 +45,15 @@ void i2c_init_board(void)
int power_init_board(void) int power_init_board(void)
{ {
#ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */
/* /*
* For PMIC the I2C bus is named as I2C5, but it is connected * For PMIC the I2C bus is named as I2C5, but it is connected
* to logical I2C adapter 0 * to logical I2C adapter 0
*/ */
return pmic_init(I2C_0); return pmic_init(I2C_0);
#else
return 0;
#endif
} }
int dram_init(void) int dram_init(void)
@ -142,6 +146,7 @@ int board_mmc_init(bd_t *bis)
#ifdef CONFIG_USB_GADGET #ifdef CONFIG_USB_GADGET
static int s5pc1xx_phy_control(int on) static int s5pc1xx_phy_control(int on)
{ {
#ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */
int ret; int ret;
static int status; static int status;
struct pmic *p = pmic_get("MAX8998_PMIC"); struct pmic *p = pmic_get("MAX8998_PMIC");
@ -173,7 +178,7 @@ static int s5pc1xx_phy_control(int on)
status = 0; status = 0;
} }
udelay(10000); udelay(10000);
#endif
return 0; return 0;
} }

19
include/configs/s5p_goni.h
View File

@ -229,25 +229,6 @@
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000)
#define CONFIG_POWER
#define CONFIG_POWER_I2C
#define CONFIG_POWER_MAX8998
#include <asm/arch/gpio.h>
/*
* I2C Settings
*/
#define CONFIG_SOFT_I2C_GPIO_SCL S5PC110_GPIO_J43
#define CONFIG_SOFT_I2C_GPIO_SDA S5PC110_GPIO_J40
#define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_SOFT /* I2C bit-banged */
#define CONFIG_SYS_I2C_SOFT_SPEED 50000
#define CONFIG_SYS_I2C_SOFT_SLAVE 0x7F
#define CONFIG_I2C_MULTI_BUS
#define CONFIG_SYS_I2C_INIT_BOARD
#define CONFIG_SYS_MAX_I2C_BUS 7
#define CONFIG_USB_GADGET_DWC2_OTG_PHY #define CONFIG_USB_GADGET_DWC2_OTG_PHY
#define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE