[U-Boot] [PATCH v6 66/76] spi: Drop mode_rx

[Bin Meng]

Hi Jagan,

On Mon, Feb 15, 2016 at 9:07 PM, Jagan Teki <jteki at openedev.com> wrote:
> Hi Bin,
>
> On 15 February 2016 at 16:46, Bin Meng <bmeng.cn at gmail.com> wrote:
>> Hi Jagan,
>>
>> On Mon, Feb 15, 2016 at 4:49 AM, Jagan Teki <jteki at openedev.com> wrote:
>>> mp2580 will take care of tx and rx mode's so there is
>>> no need to differentiate these into spi layer level
>>> hence replaced all mode_rx macros with mode.
>>>
>>> Cc: Simon Glass <sjg at chromium.org>
>>> Cc: Bin Meng <bmeng.cn at gmail.com>
>>> Cc: Mugunthan V N <mugunthanvnm at ti.com>
>>> Cc: Michal Simek <michal.simek at xilinx.com>
>>> Cc: Siva Durga Prasad Paladugu <sivadur at xilinx.com>
>>> Signed-off-by: Jagan Teki <jteki at openedev.com>
>>> ---
>>>  drivers/mtd/spi-nor/m25p80.c |  2 +-
>>>  drivers/spi/ich.c            |  6 ++----
>>>  drivers/spi/spi-uclass.c     | 11 ++++-------
>>>  drivers/spi/ti_qspi.c        |  6 +++---
>>>  include/spi.h                | 14 ++++----------
>>>  5 files changed, 14 insertions(+), 25 deletions(-)
>>>
>>> diff --git a/drivers/mtd/spi-nor/m25p80.c b/drivers/mtd/spi-nor/m25p80.c
>>> index 7e2702d..58e879c 100644
>>> --- a/drivers/mtd/spi-nor/m25p80.c
>>> +++ b/drivers/mtd/spi-nor/m25p80.c
>>> @@ -178,7 +178,7 @@ static int m25p80_spi_nor(struct spi_nor *nor)
>>>                 return ret;
>>>         }
>>>
>>> -       switch (spi->mode_rx) {
>>> +       switch (spi->mode) {
>>>         case SPI_RX_SLOW:
>>>                 nor->read_mode = SNOR_READ;
>>>                 break;
>>> diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
>>> index e543b8f..5f03508 100644
>>> --- a/drivers/spi/ich.c
>>> +++ b/drivers/spi/ich.c
>>> @@ -678,10 +678,8 @@ static int ich_spi_child_pre_probe(struct udevice *dev)
>>>          * ICH 7 SPI controller only supports array read command
>>>          * and byte program command for SST flash
>>>          */
>>> -       if (plat->ich_version == PCHV_7) {
>>> -               slave->mode_rx = SPI_RX_SLOW;
>>> -               slave->mode = SPI_TX_BYTE;
>>> -       }
>>> +       if (plat->ich_version == PCHV_7)
>>> +               slave->mode = SPI_TX_BYTE | SPI_RX_SLOW;
>>
>> This won't apply. Please rebase this series on top of origin/master. I
>> plan to give a test against this series soon.
>
> Did that on u-boot-spi/spi-nor please find it.
>

Thanks. I see that. Will schedule some test soon.

[snip]

Regards,
Bin