mbox

[U-Boot] Pull request: u-boot-spi/next

Message ID 1451471464-12899-1-git-send-email-jteki@openedev.com
State Deferred
Delegated to: Tom Rini
Headers show

Pull-request

git://git.denx.de/u-boot-spi.git master

Message

Jagan Teki Dec. 30, 2015, 10:31 a.m. UTC
Hi Tom,

Please pull this PR.

thanks!
Jagan.

The following changes since commit 312db9f75f50b339310474d72c8524cef2bd7931:

  armv7: omap-common: Rework SPL board_mmc_init() (2015-12-14 13:42:54 -0500)

are available in the git repository at:

  git://git.denx.de/u-boot-spi.git master

for you to fetch changes up to 25aade812e40f2e869575199c64e35ebcdf5554b:

  defconfig: am437x_sk_evm: enable spi driver model (2015-12-29 13:27:46 +0530)

----------------------------------------------------------------
Jagan Teki (24):
      sf: Get spi locally from spi_flash
      spi: make mode visible to both dm and non-dm
      spi: Use mode instead of op_mode_tx
      spi: Rename SPI_TX_BP|QPP to SPI_TX_BYTE|QUAD
      sf: Move spi_read_cmds_array locally
      sf: Rename spi_flash_set_* functions
      sf: Rename bank_end to bar_end in read_bar
      sf: Remove spi_flash_remove
      sf: Minor cleanup
      sf: Use BIT macro
      sf: Fix quad bit set for micron devices
      sf: Read back and check once spansion quad bit set
      sf: Read back and check once macronix quad bit set
      sf: Write quad bit along with read status
      spi: Remove SPI_OPM_RX_EXTN
      spi: Remove SPI_OPM_RX_DIO|QIOF
      spi: Rename SPI_OPM_RX_* to SPI_RX_*
      spi: Rename op_mode_rx to mode_rx
      spi: Move flags macro's to spi_slave{} members
      spi: Fix bit assignment with flags
      spi: Use BIT macro
      spi: Minor cleanup
      sf: Make IO modes at last in read modes
      spi: Add SPI_TX_DUAL mode

Mugunthan V N (17):
      drivers: spi: ti_qspi: do not hard code chip select for memory map configuration
      drivers: spi:ti_qspi: change ti_qspi_slave to ti_qspi_priv for driver model conversion
      drivers: spi: ti_qspi: prepare driver for DM conversion
      dm: core: Add a new api to get indexed device address
      spi: Add support for dual and quad mode
      dra7xx_evm: qspi: do not define DM_SPI and DM_SPI_FLASH for spl
      dts: dra7: add spi alias for qspi
      drivers: spi: ti_qspi: convert driver to adopt device driver model
      arm: dts: dra7: add qspi register maps for memory map and control module
      arm: dts: am437x-gp-evm: add spi-flash comaptible for flash
      arm: dts: dra7-evm: add spi-flash comaptible for flash
      arm: dts: dra72-evm: add spi-flash comaptible for flash
      defconfig: dra72_evm: enable spi driver model
      defconfig: dra74_evm: enable spi driver model
      am43xx_evm: qspi: do not define DM_SPI and DM_SPI_FLASH for spl
      arm: dts: am4372: add qspi register maps for memory map
      defconfig: am437x_sk_evm: enable spi driver model

 arch/arm/dts/am4372.dtsi        |   5 +-
 arch/arm/dts/am437x-sk-evm.dts  |   2 +-
 arch/arm/dts/dra7-evm.dts       |   2 +-
 arch/arm/dts/dra7.dtsi          |   8 +-
 arch/arm/dts/dra72-evm.dts      |   2 +-
 configs/am437x_sk_evm_defconfig |   3 +
 configs/dra72_evm_defconfig     |   2 +
 configs/dra74_evm_defconfig     |   2 +
 drivers/core/device.c           |  31 ++-
 drivers/mtd/spi/sf-uclass.c     |   7 +-
 drivers/mtd/spi/sf_internal.h   |  55 +++--
 drivers/mtd/spi/sf_probe.c      |   2 +-
 drivers/mtd/spi/spi_flash.c     | 185 +++++++++-----
 drivers/spi/ich.c               |   4 +-
 drivers/spi/spi-uclass.c        |  38 ++-
 drivers/spi/ti_qspi.c           | 524 ++++++++++++++++++++++++++++------------
 include/configs/am43xx_evm.h    |   2 +
 include/configs/dra7xx_evm.h    |   5 +
 include/dm/device.h             |  11 +
 include/spi.h                   |  75 +++---
 include/spi_flash.h             |   2 -
 21 files changed, 667 insertions(+), 300 deletions(-)

Comments

Jagan Teki Dec. 30, 2015, 10:34 a.m. UTC | #1
Tom,

Please note that subject shows u-boot-spi/next but it actually
u-boot-spi/master and of course PR shows the repo as master (not
next).

On 30 December 2015 at 16:01, Jagan Teki <jteki@openedev.com> wrote:
> Hi Tom,
>
> Please pull this PR.
>
> thanks!
> Jagan.
>
> The following changes since commit 312db9f75f50b339310474d72c8524cef2bd7931:
>
>   armv7: omap-common: Rework SPL board_mmc_init() (2015-12-14 13:42:54 -0500)
>
> are available in the git repository at:
>
>   git://git.denx.de/u-boot-spi.git master
>
> for you to fetch changes up to 25aade812e40f2e869575199c64e35ebcdf5554b:
>
>   defconfig: am437x_sk_evm: enable spi driver model (2015-12-29 13:27:46 +0530)
>
> ----------------------------------------------------------------
> Jagan Teki (24):
>       sf: Get spi locally from spi_flash
>       spi: make mode visible to both dm and non-dm
>       spi: Use mode instead of op_mode_tx
>       spi: Rename SPI_TX_BP|QPP to SPI_TX_BYTE|QUAD
>       sf: Move spi_read_cmds_array locally
>       sf: Rename spi_flash_set_* functions
>       sf: Rename bank_end to bar_end in read_bar
>       sf: Remove spi_flash_remove
>       sf: Minor cleanup
>       sf: Use BIT macro
>       sf: Fix quad bit set for micron devices
>       sf: Read back and check once spansion quad bit set
>       sf: Read back and check once macronix quad bit set
>       sf: Write quad bit along with read status
>       spi: Remove SPI_OPM_RX_EXTN
>       spi: Remove SPI_OPM_RX_DIO|QIOF
>       spi: Rename SPI_OPM_RX_* to SPI_RX_*
>       spi: Rename op_mode_rx to mode_rx
>       spi: Move flags macro's to spi_slave{} members
>       spi: Fix bit assignment with flags
>       spi: Use BIT macro
>       spi: Minor cleanup
>       sf: Make IO modes at last in read modes
>       spi: Add SPI_TX_DUAL mode
>
> Mugunthan V N (17):
>       drivers: spi: ti_qspi: do not hard code chip select for memory map configuration
>       drivers: spi:ti_qspi: change ti_qspi_slave to ti_qspi_priv for driver model conversion
>       drivers: spi: ti_qspi: prepare driver for DM conversion
>       dm: core: Add a new api to get indexed device address
>       spi: Add support for dual and quad mode
>       dra7xx_evm: qspi: do not define DM_SPI and DM_SPI_FLASH for spl
>       dts: dra7: add spi alias for qspi
>       drivers: spi: ti_qspi: convert driver to adopt device driver model
>       arm: dts: dra7: add qspi register maps for memory map and control module
>       arm: dts: am437x-gp-evm: add spi-flash comaptible for flash
>       arm: dts: dra7-evm: add spi-flash comaptible for flash
>       arm: dts: dra72-evm: add spi-flash comaptible for flash
>       defconfig: dra72_evm: enable spi driver model
>       defconfig: dra74_evm: enable spi driver model
>       am43xx_evm: qspi: do not define DM_SPI and DM_SPI_FLASH for spl
>       arm: dts: am4372: add qspi register maps for memory map
>       defconfig: am437x_sk_evm: enable spi driver model
>
>  arch/arm/dts/am4372.dtsi        |   5 +-
>  arch/arm/dts/am437x-sk-evm.dts  |   2 +-
>  arch/arm/dts/dra7-evm.dts       |   2 +-
>  arch/arm/dts/dra7.dtsi          |   8 +-
>  arch/arm/dts/dra72-evm.dts      |   2 +-
>  configs/am437x_sk_evm_defconfig |   3 +
>  configs/dra72_evm_defconfig     |   2 +
>  configs/dra74_evm_defconfig     |   2 +
>  drivers/core/device.c           |  31 ++-
>  drivers/mtd/spi/sf-uclass.c     |   7 +-
>  drivers/mtd/spi/sf_internal.h   |  55 +++--
>  drivers/mtd/spi/sf_probe.c      |   2 +-
>  drivers/mtd/spi/spi_flash.c     | 185 +++++++++-----
>  drivers/spi/ich.c               |   4 +-
>  drivers/spi/spi-uclass.c        |  38 ++-
>  drivers/spi/ti_qspi.c           | 524 ++++++++++++++++++++++++++++------------
>  include/configs/am43xx_evm.h    |   2 +
>  include/configs/dra7xx_evm.h    |   5 +
>  include/dm/device.h             |  11 +
>  include/spi.h                   |  75 +++---
>  include/spi_flash.h             |   2 -
>  21 files changed, 667 insertions(+), 300 deletions(-)

thanks!
Jagan Teki Dec. 31, 2015, 5:54 p.m. UTC | #2
On 30 December 2015 at 16:04, Jagan Teki <jteki@openedev.com> wrote:
> Tom,

Please pull this asap, in case if you miss.

>
> Please note that subject shows u-boot-spi/next but it actually
> u-boot-spi/master and of course PR shows the repo as master (not
> next).
>
> On 30 December 2015 at 16:01, Jagan Teki <jteki@openedev.com> wrote:
>> Hi Tom,
>>
>> Please pull this PR.
>>
>> thanks!
>> Jagan.
>>
>> The following changes since commit 312db9f75f50b339310474d72c8524cef2bd7931:
>>
>>   armv7: omap-common: Rework SPL board_mmc_init() (2015-12-14 13:42:54 -0500)
>>
>> are available in the git repository at:
>>
>>   git://git.denx.de/u-boot-spi.git master
>>
>> for you to fetch changes up to 25aade812e40f2e869575199c64e35ebcdf5554b:
>>
>>   defconfig: am437x_sk_evm: enable spi driver model (2015-12-29 13:27:46 +0530)
>>
>> ----------------------------------------------------------------
>> Jagan Teki (24):
>>       sf: Get spi locally from spi_flash
>>       spi: make mode visible to both dm and non-dm
>>       spi: Use mode instead of op_mode_tx
>>       spi: Rename SPI_TX_BP|QPP to SPI_TX_BYTE|QUAD
>>       sf: Move spi_read_cmds_array locally
>>       sf: Rename spi_flash_set_* functions
>>       sf: Rename bank_end to bar_end in read_bar
>>       sf: Remove spi_flash_remove
>>       sf: Minor cleanup
>>       sf: Use BIT macro
>>       sf: Fix quad bit set for micron devices
>>       sf: Read back and check once spansion quad bit set
>>       sf: Read back and check once macronix quad bit set
>>       sf: Write quad bit along with read status
>>       spi: Remove SPI_OPM_RX_EXTN
>>       spi: Remove SPI_OPM_RX_DIO|QIOF
>>       spi: Rename SPI_OPM_RX_* to SPI_RX_*
>>       spi: Rename op_mode_rx to mode_rx
>>       spi: Move flags macro's to spi_slave{} members
>>       spi: Fix bit assignment with flags
>>       spi: Use BIT macro
>>       spi: Minor cleanup
>>       sf: Make IO modes at last in read modes
>>       spi: Add SPI_TX_DUAL mode
>>
>> Mugunthan V N (17):
>>       drivers: spi: ti_qspi: do not hard code chip select for memory map configuration
>>       drivers: spi:ti_qspi: change ti_qspi_slave to ti_qspi_priv for driver model conversion
>>       drivers: spi: ti_qspi: prepare driver for DM conversion
>>       dm: core: Add a new api to get indexed device address
>>       spi: Add support for dual and quad mode
>>       dra7xx_evm: qspi: do not define DM_SPI and DM_SPI_FLASH for spl
>>       dts: dra7: add spi alias for qspi
>>       drivers: spi: ti_qspi: convert driver to adopt device driver model
>>       arm: dts: dra7: add qspi register maps for memory map and control module
>>       arm: dts: am437x-gp-evm: add spi-flash comaptible for flash
>>       arm: dts: dra7-evm: add spi-flash comaptible for flash
>>       arm: dts: dra72-evm: add spi-flash comaptible for flash
>>       defconfig: dra72_evm: enable spi driver model
>>       defconfig: dra74_evm: enable spi driver model
>>       am43xx_evm: qspi: do not define DM_SPI and DM_SPI_FLASH for spl
>>       arm: dts: am4372: add qspi register maps for memory map
>>       defconfig: am437x_sk_evm: enable spi driver model
>>
>>  arch/arm/dts/am4372.dtsi        |   5 +-
>>  arch/arm/dts/am437x-sk-evm.dts  |   2 +-
>>  arch/arm/dts/dra7-evm.dts       |   2 +-
>>  arch/arm/dts/dra7.dtsi          |   8 +-
>>  arch/arm/dts/dra72-evm.dts      |   2 +-
>>  configs/am437x_sk_evm_defconfig |   3 +
>>  configs/dra72_evm_defconfig     |   2 +
>>  configs/dra74_evm_defconfig     |   2 +
>>  drivers/core/device.c           |  31 ++-
>>  drivers/mtd/spi/sf-uclass.c     |   7 +-
>>  drivers/mtd/spi/sf_internal.h   |  55 +++--
>>  drivers/mtd/spi/sf_probe.c      |   2 +-
>>  drivers/mtd/spi/spi_flash.c     | 185 +++++++++-----
>>  drivers/spi/ich.c               |   4 +-
>>  drivers/spi/spi-uclass.c        |  38 ++-
>>  drivers/spi/ti_qspi.c           | 524 ++++++++++++++++++++++++++++------------
>>  include/configs/am43xx_evm.h    |   2 +
>>  include/configs/dra7xx_evm.h    |   5 +
>>  include/dm/device.h             |  11 +
>>  include/spi.h                   |  75 +++---
>>  include/spi_flash.h             |   2 -
>>  21 files changed, 667 insertions(+), 300 deletions(-)
>
> thanks!
> --
> Jagan.
Tom Rini Jan. 2, 2016, 5:04 p.m. UTC | #3
On Wed, Dec 30, 2015 at 04:04:23PM +0530, Jagan Teki wrote:

> Tom,
> 
> Please note that subject shows u-boot-spi/next but it actually
> u-boot-spi/master and of course PR shows the repo as master (not
> next).

OK, what in here is a clear bugfix rather than new feature that we
should have taken in sooner?  As-is this needs some rework on samsung
stuff to make trats, trats2 and s5pc210_universal work.  Thanks!
Jagan Teki Jan. 3, 2016, 3:56 a.m. UTC | #4
On 2 January 2016 at 22:34, Tom Rini <trini@konsulko.com> wrote:
> On Wed, Dec 30, 2015 at 04:04:23PM +0530, Jagan Teki wrote:
>
>> Tom,
>>
>> Please note that subject shows u-boot-spi/next but it actually
>> u-boot-spi/master and of course PR shows the repo as master (not
>> next).
>
> OK, what in here is a clear bugfix rather than new feature that we
> should have taken in sooner?  As-is this needs some rework on samsung
> stuff to make trats, trats2 and s5pc210_universal work.  Thanks!

How come these sf and ti patches are blocking these samsung boards to
work? few of these were bug fixes and others were features (ti
patches) but those initiated in last MW.

thanks!
Tom Rini Jan. 3, 2016, 2:44 p.m. UTC | #5
On Sun, Jan 03, 2016 at 09:26:38AM +0530, Jagan Teki wrote:
> On 2 January 2016 at 22:34, Tom Rini <trini@konsulko.com> wrote:
> > On Wed, Dec 30, 2015 at 04:04:23PM +0530, Jagan Teki wrote:
> >
> >> Tom,
> >>
> >> Please note that subject shows u-boot-spi/next but it actually
> >> u-boot-spi/master and of course PR shows the repo as master (not
> >> next).
> >
> > OK, what in here is a clear bugfix rather than new feature that we
> > should have taken in sooner?  As-is this needs some rework on samsung
> > stuff to make trats, trats2 and s5pc210_universal work.  Thanks!
> 
> How come these sf and ti patches are blocking these samsung boards to
> work? few of these were bug fixes and others were features (ti
> patches) but those initiated in last MW.

The patch to use BIT() in spi.h causes undefined references on trats2,
hence the first patch I posted in reply to the PR.  This however broke
trats/s5pc210_universal.
Jagan Teki Jan. 3, 2016, 3:40 p.m. UTC | #6
On 3 January 2016 at 20:14, Tom Rini <trini@konsulko.com> wrote:
> On Sun, Jan 03, 2016 at 09:26:38AM +0530, Jagan Teki wrote:
>> On 2 January 2016 at 22:34, Tom Rini <trini@konsulko.com> wrote:
>> > On Wed, Dec 30, 2015 at 04:04:23PM +0530, Jagan Teki wrote:
>> >
>> >> Tom,
>> >>
>> >> Please note that subject shows u-boot-spi/next but it actually
>> >> u-boot-spi/master and of course PR shows the repo as master (not
>> >> next).
>> >
>> > OK, what in here is a clear bugfix rather than new feature that we
>> > should have taken in sooner?  As-is this needs some rework on samsung
>> > stuff to make trats, trats2 and s5pc210_universal work.  Thanks!
>>
>> How come these sf and ti patches are blocking these samsung boards to
>> work? few of these were bug fixes and others were features (ti
>> patches) but those initiated in last MW.
>
> The patch to use BIT() in spi.h causes undefined references on trats2,
> hence the first patch I posted in reply to the PR.  This however broke
> trats/s5pc210_universal.

Build looks fine for me [1]

[1] http://paste.ubuntu.com/14387171/
Tom Rini Jan. 3, 2016, 3:56 p.m. UTC | #7
On Sun, Jan 03, 2016 at 09:10:14PM +0530, Jagan Teki wrote:
> On 3 January 2016 at 20:14, Tom Rini <trini@konsulko.com> wrote:
> > On Sun, Jan 03, 2016 at 09:26:38AM +0530, Jagan Teki wrote:
> >> On 2 January 2016 at 22:34, Tom Rini <trini@konsulko.com> wrote:
> >> > On Wed, Dec 30, 2015 at 04:04:23PM +0530, Jagan Teki wrote:
> >> >
> >> >> Tom,
> >> >>
> >> >> Please note that subject shows u-boot-spi/next but it actually
> >> >> u-boot-spi/master and of course PR shows the repo as master (not
> >> >> next).
> >> >
> >> > OK, what in here is a clear bugfix rather than new feature that we
> >> > should have taken in sooner?  As-is this needs some rework on samsung
> >> > stuff to make trats, trats2 and s5pc210_universal work.  Thanks!
> >>
> >> How come these sf and ti patches are blocking these samsung boards to
> >> work? few of these were bug fixes and others were features (ti
> >> patches) but those initiated in last MW.
> >
> > The patch to use BIT() in spi.h causes undefined references on trats2,
> > hence the first patch I posted in reply to the PR.  This however broke
> > trats/s5pc210_universal.
> 
> Build looks fine for me [1]
> 
> [1] http://paste.ubuntu.com/14387171/

Yes, that and trats are fine with your series, trats2 is not.  My first
pass at fixing trats2 broke trats/s5p..
Jagan Teki Jan. 6, 2016, 9:24 a.m. UTC | #8
On 3 January 2016 at 21:26, Tom Rini <trini@konsulko.com> wrote:
> On Sun, Jan 03, 2016 at 09:10:14PM +0530, Jagan Teki wrote:
>> On 3 January 2016 at 20:14, Tom Rini <trini@konsulko.com> wrote:
>> > On Sun, Jan 03, 2016 at 09:26:38AM +0530, Jagan Teki wrote:
>> >> On 2 January 2016 at 22:34, Tom Rini <trini@konsulko.com> wrote:
>> >> > On Wed, Dec 30, 2015 at 04:04:23PM +0530, Jagan Teki wrote:
>> >> >
>> >> >> Tom,
>> >> >>
>> >> >> Please note that subject shows u-boot-spi/next but it actually
>> >> >> u-boot-spi/master and of course PR shows the repo as master (not
>> >> >> next).
>> >> >
>> >> > OK, what in here is a clear bugfix rather than new feature that we
>> >> > should have taken in sooner?  As-is this needs some rework on samsung
>> >> > stuff to make trats, trats2 and s5pc210_universal work.  Thanks!
>> >>
>> >> How come these sf and ti patches are blocking these samsung boards to
>> >> work? few of these were bug fixes and others were features (ti
>> >> patches) but those initiated in last MW.
>> >
>> > The patch to use BIT() in spi.h causes undefined references on trats2,
>> > hence the first patch I posted in reply to the PR.  This however broke
>> > trats/s5pc210_universal.
>>
>> Build looks fine for me [1]
>>
>> [1] http://paste.ubuntu.com/14387171/
>
> Yes, that and trats are fine with your series, trats2 is not.  My first
> pass at fixing trats2 broke trats/s5p..

The patch "power: pmic.h: Drop include <spi.h>" will fix trats2.