Pull request: u-boot-spi/next
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(-)
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).
Quoted 79 lines · Jagan Teki
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.gitmasterfor 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 fromspi_flash
spi: make mode visible to both dm and non-dm
spi: Use mode instead ofop_mode_tx
spi: Rename SPI_TX_BP|QPP to SPI_TX_BYTE|QUAD
sf: Movespi_read_cmds_arraylocally
sf: Rename spi_flash_set_* functions
sf: Renamebank_endtobar_endinread_bar
sf: Removespi_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: RemoveSPI_OPM_RX_EXTN
spi: Remove SPI_OPM_RX_DIO|QIOF
spi: Rename SPI_OPM_RX_* to SPI_RX_*
spi: Renameop_mode_rxtomode_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: AddSPI_TX_DUALmodeMugunthan V N (17):
drivers: spi:ti_qspi: do not hard code chip select for memory map configuration
drivers: spi:ti_qspi: changeti_qspi_slavetoti_qspi_privfor 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 defineDM_SPIandDM_SPI_FLASHfor 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 defineDM_SPIandDM_SPI_FLASHfor spl
arm: dts: am4372: add qspi register maps for memory map
defconfig:am437x_sk_evm: enable spi driver modelarch/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 +-
Quoted 8 lines
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!
Signature · 1 line
Jagan.
Quoted 1 line · Jagan Teki
Tom,
Please pull this asap, in case if you miss.
Quoted 97 lines
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).
Quoted 79 lines · Jagan Teki
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.gitmasterfor 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 fromspi_flash
spi: make mode visible to both dm and non-dm
spi: Use mode instead ofop_mode_tx
spi: Rename SPI_TX_BP|QPP to SPI_TX_BYTE|QUAD
sf: Movespi_read_cmds_arraylocally
sf: Rename spi_flash_set_* functions
sf: Renamebank_endtobar_endinread_bar
sf: Removespi_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: RemoveSPI_OPM_RX_EXTN
spi: Remove SPI_OPM_RX_DIO|QIOF
spi: Rename SPI_OPM_RX_* to SPI_RX_*
spi: Renameop_mode_rxtomode_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: AddSPI_TX_DUALmodeMugunthan V N (17):
drivers: spi:ti_qspi: do not hard code chip select for memory map configuration
drivers: spi:ti_qspi: changeti_qspi_slavetoti_qspi_privfor 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 defineDM_SPIandDM_SPI_FLASHfor 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 defineDM_SPIandDM_SPI_FLASHfor spl
arm: dts: am4372: add qspi register maps for memory map
defconfig:am437x_sk_evm: enable spi driver modelarch/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 +-Quoted 8 lines
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.
Signature · 1 line
Jagan.
Quoted 5 lines · Jagan Teki
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!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160102/024415ed/attachment.sig>
Quoted 11 lines · Tom Rini
Quoted 5 lines · Jagan Teki
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_universalwork. 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!
Signature · 1 line
Jagan.
Quoted 9 lines · Jagan Teki
Quoted 8 lines · Tom Rini
Quoted 5 lines · Jagan Teki
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).
Quoted 7 lines
Quoted 3 lines
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_universalwork. 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.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160103/a7ea8bc4/attachment.sig>
Quoted 14 lines · Tom Rini
Quoted 13 lines · Jagan Teki
Quoted 11 lines · Tom Rini
Quoted 5 lines · Jagan Teki
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_universalwork. Thanks!
Quoted 7 lines
Quoted 3 lines
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()inspi.hcauses 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/
Signature · 1 line
Jagan.
Quoted 19 lines · Jagan Teki
Quoted 18 lines · Tom Rini
Quoted 16 lines · Jagan Teki
Quoted 11 lines · Tom Rini
Quoted 5 lines · Jagan Teki
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_universalwork. 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.
Quoted 7 lines
Quoted 3 lines
The patch to use
BIT()inspi.hcauses 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]
Yes, that and trats are fine with your series, trats2 is not. My first pass at fixing trats2 broke trats/s5p..
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160103/94e50d7d/attachment.sig>
Quoted 24 lines · Tom Rini
Quoted 23 lines · Jagan Teki
Quoted 21 lines · Tom Rini
Quoted 9 lines · Jagan Teki
Quoted 8 lines · Tom Rini
Quoted 5 lines · Jagan Teki
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).
Quoted 7 lines
Quoted 3 lines
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_universalwork. 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()inspi.hcauses undefined references on trats2, hence the first patch I posted in reply to the PR. This however broke trats/s5pc210_universal.
Quoted 6 lines
Quoted 3 lines
Build looks fine for me [1]
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.
Signature · 1 line
Jagan.
PATCH 1/1 trats2: Move include of power/max77686_pmic.h
In reply to Jagan TekiWe only need this include file in board/samsung/common/misc.c, so move it there.
--- board/samsung/common/misc.c | 1 + include/configs/trats2.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-)
board/samsung/common/misc.c +1 -0
@@ -19,6 +19,7 @@#include <linux/input.h> #include <dm.h> #include <power/pmic.h> +#include <power/max77686_pmic.h> #include <mmc.h> DECLARE_GLOBAL_DATA_PTR ;
include/configs/trats2.h +0 -2
@@ -209,8 +209,6 @@ int get_soft_i2c_sda_pin(void);/* Download menu - definitions for check keys */ #ifndef __ASSEMBLY__ -#include <power/max77686_pmic.h> -#define KEY_PWR_PMIC_NAME "MAX77686_PMIC"#define KEY_PWR_STATUS_REG MAX77686_REG_PMIC_STATUS1#define KEY_PWR_STATUS_MASK (1 << 0)
Signature · 1 line
1.7.9.5
PATCH 1/1 trats2: Move include of power/max77686_pmic.h
Quoted 4 lines · Tom Rini
We only need this include file in
board/samsung/common/misc.c, so move it there.Signed-off-by Tom Rini <[email protected]>
This in turn breaks trats and s5pc210_universal, so it's not quite there. I'll take another run at this tomorrow perhaps, but this does block the spi PR.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151231/37773487/attachment.sig>