From a6e50da0d5a42f84f39edad57cb24a85e8524e6d Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 17 Feb 2018 02:15:08 +0100 Subject: [PATCH] ARM: rmobile: Replace SH I2C with IIC on Porter Get rid of the SH I2C driver on Porter and enable the IIC driver instead . The old SH I2C is completely broken on Porter anyway and the DM/DT capable IIC driver allows access to the PMIC too. Use the DM/DT capable driver instead. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- configs/porter_defconfig | 2 ++ include/configs/porter.h | 14 -------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/configs/porter_defconfig b/configs/porter_defconfig index 53d197c2fa..736576c78e 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -50,6 +50,8 @@ CONFIG_SPL_CLK=y CONFIG_CLK_RENESAS=y CONFIG_DM_GPIO=y CONFIG_RCAR_GPIO=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_RCAR_IIC=y CONFIG_DM_MMC=y CONFIG_MMC_UNIPHIER=y CONFIG_SPI_FLASH=y diff --git a/include/configs/porter.h b/include/configs/porter.h index 1816f2fd76..eb28d1afcc 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -49,20 +49,6 @@ #define CONFIG_SYS_TMU_CLK_DIV 4 -/* i2c */ -#define CONFIG_SYS_I2C -#define CONFIG_SYS_I2C_SH -#define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_SH_NUM_CONTROLLERS 3 -#define CONFIG_SYS_I2C_SH_SPEED0 400000 -#define CONFIG_SYS_I2C_SH_SPEED1 400000 -#define CONFIG_SYS_I2C_SH_SPEED2 400000 -#define CONFIG_SH_I2C_DATA_HIGH 4 -#define CONFIG_SH_I2C_DATA_LOW 5 -#define CONFIG_SH_I2C_CLOCK 10000000 - -#define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0"