[U-Boot,2/4] mvebu: turris_omnia: remove redundant code

The i2c slave disabling is done by mvtwsi driver and is not needed here.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Cc: Baruch Siach <baruch@tkos.co.il>
---
 board/CZ.NIC/turris_omnia/turris_omnia.c | 11 -----------
 1 file changed, 11 deletions(-)

Hi Marek,

On Thu, Apr 25 2019, Marek Behún wrote:
> The i2c slave disabling is done by mvtwsi driver and is not needed here.
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
> Cc: Baruch Siach <baruch@tkos.co.il>
> ---
>  board/CZ.NIC/turris_omnia/turris_omnia.c | 11 -----------
>  1 file changed, 11 deletions(-)
>
> diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
> index c21d2f3ffa..c446f471a6 100644
> --- a/board/CZ.NIC/turris_omnia/turris_omnia.c
> +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
> @@ -297,8 +297,6 @@ static int set_regdomain(void)
>  
>  int board_early_init_f(void)
>  {
> -	u32 i2c_debug_reg;
> -
>  	/* Configure MPP */
>  	writel(0x11111111, MVEBU_MPP_BASE + 0x00);
>  	writel(0x11111111, MVEBU_MPP_BASE + 0x04);
> @@ -321,15 +319,6 @@ int board_early_init_f(void)
>  	writel(OMNIA_GPP_OUT_ENA_LOW, MVEBU_GPIO0_BASE + 0x04);
>  	writel(OMNIA_GPP_OUT_ENA_MID, MVEBU_GPIO1_BASE + 0x04);
>  
> -	/*
> -	 * Disable I2C debug mode blocking 0x64 I2C address.
> -	 * Note: that would be redundant once Turris Omnia migrates to DM_I2C,
> -	 * because the mvtwsi driver includes equivalent code.
> -	 */

As this comment notes, Turris Omnia needs to migrate to DM_I2C before
removing this code. The non DM code path in the mvtwsi driver does not
disable the debug I2C client.

Is there a pending patch that enables DM_I2C for Turris Omnia?

> -	i2c_debug_reg = readl(MVEBU_TWSI_BASE + MVTWSI_ARMADA_DEBUG_REG);
> -	i2c_debug_reg &= ~(1<<18);
> -	writel(i2c_debug_reg, MVEBU_TWSI_BASE + MVTWSI_ARMADA_DEBUG_REG);
> -
>  	return 0;
>  }

baruch

The next version of this patchseries will include patch with name
"arm: mvebu: turris_omnia: move I2C dependencies to Kconfig",
which adds
        select DM_I2C
to
config TARGET_TURRIS_OMNIA

Marek


On Sun, 28 Apr 2019 14:59:10 +0300
Baruch Siach <baruch@tkos.co.il> wrote:

> Hi Marek,
> 
> On Thu, Apr 25 2019, Marek Behún wrote:
> > The i2c slave disabling is done by mvtwsi driver and is not needed here.
> >
> > Signed-off-by: Marek Behún <marek.behun@nic.cz>
> > Cc: Baruch Siach <baruch@tkos.co.il>
> > ---
> >  board/CZ.NIC/turris_omnia/turris_omnia.c | 11 -----------
> >  1 file changed, 11 deletions(-)
> >
> > diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
> > index c21d2f3ffa..c446f471a6 100644
> > --- a/board/CZ.NIC/turris_omnia/turris_omnia.c
> > +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
> > @@ -297,8 +297,6 @@ static int set_regdomain(void)
> >  
> >  int board_early_init_f(void)
> >  {
> > -	u32 i2c_debug_reg;
> > -
> >  	/* Configure MPP */
> >  	writel(0x11111111, MVEBU_MPP_BASE + 0x00);
> >  	writel(0x11111111, MVEBU_MPP_BASE + 0x04);
> > @@ -321,15 +319,6 @@ int board_early_init_f(void)
> >  	writel(OMNIA_GPP_OUT_ENA_LOW, MVEBU_GPIO0_BASE + 0x04);
> >  	writel(OMNIA_GPP_OUT_ENA_MID, MVEBU_GPIO1_BASE + 0x04);
> >  
> > -	/*
> > -	 * Disable I2C debug mode blocking 0x64 I2C address.
> > -	 * Note: that would be redundant once Turris Omnia migrates to DM_I2C,
> > -	 * because the mvtwsi driver includes equivalent code.
> > -	 */  
> 
> As this comment notes, Turris Omnia needs to migrate to DM_I2C before
> removing this code. The non DM code path in the mvtwsi driver does not
> disable the debug I2C client.
> 
> Is there a pending patch that enables DM_I2C for Turris Omnia?
> 
> > -	i2c_debug_reg = readl(MVEBU_TWSI_BASE + MVTWSI_ARMADA_DEBUG_REG);
> > -	i2c_debug_reg &= ~(1<<18);
> > -	writel(i2c_debug_reg, MVEBU_TWSI_BASE + MVTWSI_ARMADA_DEBUG_REG);
> > -
> >  	return 0;
> >  }  
> 
> baruch
>