| Message ID | 20170423153525.14882-6-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | 00fc38aec94a5ea41ec5cd5faa2bfe7b201b8e12 |
| Delegated to: | Heiko Schocher |
| Headers | show |
On 23/04/17 17:35, Simon Glass wrote: > Drop use of this long-deprecated option. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > board/keymile/km82xx/km82xx.c | 5 ----- > board/keymile/km_arm/km_arm.c | 4 ---- > 2 files changed, 9 deletions(-) > > diff --git a/board/keymile/km82xx/km82xx.c b/board/keymile/km82xx/km82xx.c > index 51b4571d40..f5a98b33e7 100644 > --- a/board/keymile/km82xx/km82xx.c > +++ b/board/keymile/km82xx/km82xx.c > @@ -153,13 +153,8 @@ const iop_conf_t iop_conf_tab[4][32] = { > { 0, 0, 0, 0, 0, 0 }, /* PD18 */ > { 0, 0, 0, 0, 0, 0 }, /* PD17 */ > { 0, 0, 0, 0, 0, 0 }, /* PD16 */ > -#if defined(CONFIG_HARD_I2C) > - { 1, 1, 1, 0, 1, 0 }, /* PD15 I2C SDA */ > - { 1, 1, 1, 0, 1, 0 }, /* PD14 I2C SCL */ > -#else > { 1, 0, 0, 0, 1, 1 }, /* PD15 */ > { 1, 0, 0, 1, 1, 1 }, /* PD14 */ > -#endif > { 0, 0, 0, 0, 0, 0 }, /* PD13 */ > { 0, 0, 0, 0, 0, 0 }, /* PD12 */ > { 0, 0, 0, 0, 0, 0 }, /* PD11 */ > diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c > index 079509c979..85785ffc02 100644 > --- a/board/keymile/km_arm/km_arm.c > +++ b/board/keymile/km_arm/km_arm.c > @@ -76,10 +76,6 @@ static const u32 kwmpp_config[] = { > MPP8_GPIO, /* SDA */ > MPP9_GPIO, /* SCL */ > #endif > -#if defined(CONFIG_HARD_I2C) > - MPP8_TW_SDA, > - MPP9_TW_SCK, > -#endif > MPP10_UART0_TXD, > MPP11_UART0_RXD, > MPP12_GPO, /* Reserved */ > Acked-by: Holger Brunck <holger.brunck@keymile.com>
Hello Simon, Am 23.04.2017 um 17:35 schrieb Simon Glass: > Drop use of this long-deprecated option. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > board/keymile/km82xx/km82xx.c | 5 ----- > board/keymile/km_arm/km_arm.c | 4 ---- > 2 files changed, 9 deletions(-) Reviewed-by: Heiko Schocher <hs@denx.de> Applied to u-boot-i2c/next bye, Heiko > > diff --git a/board/keymile/km82xx/km82xx.c b/board/keymile/km82xx/km82xx.c > index 51b4571d40..f5a98b33e7 100644 > --- a/board/keymile/km82xx/km82xx.c > +++ b/board/keymile/km82xx/km82xx.c > @@ -153,13 +153,8 @@ const iop_conf_t iop_conf_tab[4][32] = { > { 0, 0, 0, 0, 0, 0 }, /* PD18 */ > { 0, 0, 0, 0, 0, 0 }, /* PD17 */ > { 0, 0, 0, 0, 0, 0 }, /* PD16 */ > -#if defined(CONFIG_HARD_I2C) > - { 1, 1, 1, 0, 1, 0 }, /* PD15 I2C SDA */ > - { 1, 1, 1, 0, 1, 0 }, /* PD14 I2C SCL */ > -#else > { 1, 0, 0, 0, 1, 1 }, /* PD15 */ > { 1, 0, 0, 1, 1, 1 }, /* PD14 */ > -#endif > { 0, 0, 0, 0, 0, 0 }, /* PD13 */ > { 0, 0, 0, 0, 0, 0 }, /* PD12 */ > { 0, 0, 0, 0, 0, 0 }, /* PD11 */ > diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c > index 079509c979..85785ffc02 100644 > --- a/board/keymile/km_arm/km_arm.c > +++ b/board/keymile/km_arm/km_arm.c > @@ -76,10 +76,6 @@ static const u32 kwmpp_config[] = { > MPP8_GPIO, /* SDA */ > MPP9_GPIO, /* SCL */ > #endif > -#if defined(CONFIG_HARD_I2C) > - MPP8_TW_SDA, > - MPP9_TW_SCK, > -#endif > MPP10_UART0_TXD, > MPP11_UART0_RXD, > MPP12_GPO, /* Reserved */ >
diff --git a/board/keymile/km82xx/km82xx.c b/board/keymile/km82xx/km82xx.c index 51b4571d40..f5a98b33e7 100644 --- a/board/keymile/km82xx/km82xx.c +++ b/board/keymile/km82xx/km82xx.c @@ -153,13 +153,8 @@ const iop_conf_t iop_conf_tab[4][32] = { { 0, 0, 0, 0, 0, 0 }, /* PD18 */ { 0, 0, 0, 0, 0, 0 }, /* PD17 */ { 0, 0, 0, 0, 0, 0 }, /* PD16 */ -#if defined(CONFIG_HARD_I2C) - { 1, 1, 1, 0, 1, 0 }, /* PD15 I2C SDA */ - { 1, 1, 1, 0, 1, 0 }, /* PD14 I2C SCL */ -#else { 1, 0, 0, 0, 1, 1 }, /* PD15 */ { 1, 0, 0, 1, 1, 1 }, /* PD14 */ -#endif { 0, 0, 0, 0, 0, 0 }, /* PD13 */ { 0, 0, 0, 0, 0, 0 }, /* PD12 */ { 0, 0, 0, 0, 0, 0 }, /* PD11 */ diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index 079509c979..85785ffc02 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -76,10 +76,6 @@ static const u32 kwmpp_config[] = { MPP8_GPIO, /* SDA */ MPP9_GPIO, /* SCL */ #endif -#if defined(CONFIG_HARD_I2C) - MPP8_TW_SDA, - MPP9_TW_SCK, -#endif MPP10_UART0_TXD, MPP11_UART0_RXD, MPP12_GPO, /* Reserved */
Drop use of this long-deprecated option. Signed-off-by: Simon Glass <sjg@chromium.org> --- board/keymile/km82xx/km82xx.c | 5 ----- board/keymile/km_arm/km_arm.c | 4 ---- 2 files changed, 9 deletions(-)