Rename CONFIG_SF_DATAFLASH into CONFIG_SPI_FLASH_DATAFLASH
as it follows the naming convention same as remaining configs.
Signed-off-by: NJagan Teki <jteki@openedev.com>

This commit moves:
- CONFIG_OF_CONTROL
- SPL_DISABLE_OF_CONTROL

from zynq_*_defconfig files into arch/arm/Kconfig "config ARCH_ZYNQ"
Signed-off-by: NJagan Teki <jteki@openedev.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>

Enable FDT support for zynq_picozed board.
Signed-off-by: NJagan Teki <jteki@openedev.com>

Add Zynq SPI controller Kconfig entry.
Signed-off-by: NJagan Teki <jteki@openedev.com>
Reviewed-by: NSimon Glass <sjg@chromium.org>
Cc: Marek Vasut <marex@denx.de>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>

This patch includes asm/io.h for readl and writel calls.

build errors:
drivers/spi/xilinx_spi.c: In function 'xilinx_spi_probe':
drivers/spi/xilinx_spi.c:119:2: warning: implicit declaration of function 'writel' [-Wimplicit-function-declaration]
drivers/spi/xilinx_spi.c: In function 'xilinx_spi_xfer':
drivers/spi/xilinx_spi.c:193:2: warning: implicit declaration of function 'readl' [-Wimplicit-function-declaration]
Signed-off-by: NJagan Teki <jteki@openedev.com>
Cc: Michal Simek <michal.simek@xilinx.com>

This converts the xilinx spi driver to use the driver model.
Signed-off-by: NJagan Teki <jteki@openedev.com>
Acked-by: NSimon Glass <sjg@chromium.org>
Cc: Michal Simek <michal.simek@xilinx.com>

This patch enables spi1 for zynq zc770_xm010 board dts
Signed-off-by: NJagan Teki <jteki@openedev.com>
Tested-by: NJagan Teki <jteki@openedev.com>

Now zynq spi driver platform data is controlled by devicetree,
enable the status by saying "okay" on respective board dts to use
the devicetree generated platdata.

Ex:
&spi1 {
	status = "okay";
};
Signed-off-by: NJagan Teki <jteki@openedev.com>
Acked-by: NSimon Glass <sjg@chromium.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Tested-by: NJagan Teki <jteki@openedev.com>

This patch adds zynq spi controller nodes in zynq-7000.dtsi.
Signed-off-by: NJagan Teki <jteki@openedev.com>
Acked-by: NSimon Glass <sjg@chromium.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Tested-by: NJagan Teki <jteki@openedev.com>

Enabled CONFIG_DM_SPI and CONFIG_DM_SPI_FLASH for zynq soc.
Signed-off-by: NJagan Teki <jteki@openedev.com>
Acked-by: NSimon Glass <sjg@chromium.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Tested-by: NJagan Teki <jteki@openedev.com>

This converts the zynq spi driver to use the driver model.

Minimal functional changes like using meaningful name on
structure members wrt mainlined dm spi drivers.
- input_hz -> frequency
- req_hz -> freq
- base -> regs
Signed-off-by: NJagan Teki <jteki@openedev.com>
Acked-by: NSimon Glass <sjg@chromium.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Tested-by: NJagan Teki <jteki@openedev.com>

- Adjust tab spaces
- Add comments
Signed-off-by: NJagan Teki <jteki@openedev.com>

Arrange driver code in more readable format[1] for easy accessing
and readable.
[1] http://patchwork.ozlabs.org/patch/265683/Signed-off-by: NJagan Teki <jteki@openedev.com>
Cc: Rex Chang <rchang@ti.com>
Cc: Murali Karicheri <m-karicheri2@ti.com>

Move the header code into driver for more readable and
easy to access it.
Signed-off-by: NJagan Teki <jteki@openedev.com>
Cc: Rex Chang <rchang@ti.com>
Cc: Murali Karicheri <m-karicheri2@ti.com>

- Zap unneeded macros
- Re-arrange the code
- Removed __attribute__((weak))
- Replace __func__ macro with func names to save macro transition.
- Re-arranged comment lines.
- Arrange driver code in more readable format[1]

[1]  http://patchwork.ozlabs.org/patch/265683/Signed-off-by: NJagan Teki <jteki@openedev.com>
Acked-by: NMichal Simek <michal.simek@xilinx.com>

Move the header code into driver for more readable and
easy to access it.
Signed-off-by: NJagan Teki <jteki@openedev.com>
Acked-by: NMichal Simek <michal.simek@xilinx.com>

Zap oc_tiny_spi driver since the boards used this driver
is no longer been active.
Signed-off-by: NJagan Teki <jteki@openedev.com>
Cc: Thomas Chou <thomas@wytron.com.tw>

Zap ftssp010_spi driver since the boards used this driver
is no longer been active.
Signed-off-by: NJagan Teki <jteki@openedev.com>
Cc: Kuo-Jung Su <dantesu@faraday-tech.com>
Cc: Axel Lin <axel.lin@ingics.com>

Zap andes_spi driver since the boards used this driver
is no longer been active.
Signed-off-by: NJagan Teki <jteki@openedev.com>
Cc: Macpaul Lin <macpaul@andestech.com>

sst25wf040b doesn't support Auto Address Increment Programming command.
Remove SST_WR flag.
Signed-off-by: NHaikun Wang <B53464@freescale.com>
Tested-by: NHaikun Wang <haikun.wang@freescale.com>
Reviewed-by: NJagannadh Teki <jteki@openedev.com>

If flash pointer is used free it, before probing a new
flash and storing it in flash.
Signed-off-by: NHeiko Schocher <hs@denx.de>
Tested-by: NJagannadh Teki <jteki@openedev.com>
Reviewed-by: NJagannadh Teki <jteki@openedev.com>

With this patch, it is possible to get the offset and size information
from the mtdpartiton setting in "mtdparts", similiar to the
"nand" commandos.

=> sf
sf - SPI flash sub-system

Usage:
sf probe [[bus:]cs] [hz] [mode] - init flash device on given SPI bus
                                  and chip select
sf read addr offset|partition len       - read `len' bytes starting at
                                          `offset' to memory at `addr'
sf write addr offset|partition len      - write `len' bytes from memory
                                          at `addr' to flash at `offset'
sf erase offset|partition [+]len        - erase `len' bytes from `offset'
                                          `+len' round up `len' to block size
sf update addr offset|partition len     - erase and write `len' bytes from memory
                                          at `addr' to flash at `offset'
=>
for example "env" is defined in mtdparts:

=> sf read 13000000 env
device 0 offset 0xd0000, size 0x10000
SF: 65536 bytes @ 0xd0000 Read: OK

zynq-uboot> mtdparts add nor0 0x10000@0x0 env
zynq-uboot> sf erase env 0x10000
SF: 65536 bytes @ 0x0 Erased: OK

zynq-uboot> sf write 0x100 env
device 0 offset 0x0, size 0x10000
SF: 65536 bytes @ 0x0 Written: OK

zynq-uboot> sf read 0x40000 env
device 0 offset 0x0, size 0x10000
SF: 65536 bytes @ 0x0 Read: OK
Signed-off-by: NHeiko Schocher <hs@denx.de>
Tested-by: NJagannadh Teki <jteki@openedev.com>
Reviewed-by: NJagannadh Teki <jteki@openedev.com>

Move common functions from cmd_nand.c (for calculating offset
and size from cmdline paramter) to common place, so they could
used from other commands which use mtd partitions.

For onenand the arg_off_size() is left in common/cmd_onenand.c.
It should use now the common arg_off() function, but as I could
not test onenand I let it there ...
Signed-off-by: NHeiko Schocher <hs@denx.de>
Acked-by: NScott Wood <scottwood@freescale.com>
Reviewed-by: NJagannadh Teki <jteki@openedev.com>

Add MTD layer driver for spi, original patch from:
http://git.denx.de/?p=u-boot/u-boot-mips.git;a=commitdiff;h=bb246819cdc90493dd7089eaa51b9e639765cced

Changes from Heiko Schocher against this patch:
- Remove compile error if not defining CONFIG_SPI_FLASH_MTD:

  LD      drivers/mtd/spi/built-in.o
drivers/mtd/spi/sf_probe.o: In function `spi_flash_mtd_unregister':
/home/hs/abb/imx6/u-boot/drivers/mtd/spi/sf_internal.h:168: multiple definition of `spi_flash_mtd_unregister'
drivers/mtd/spi/sf_params.o:/home/hs/abb/imx6/u-boot/drivers/mtd/spi/sf_internal.h:168: first defined here
drivers/mtd/spi/sf_ops.o: In function `spi_flash_mtd_unregister':
/home/hs/abb/imx6/u-boot/drivers/mtd/spi/sf_internal.h:168: multiple definition of `spi_flash_mtd_unregister'
drivers/mtd/spi/sf_params.o:/home/hs/abb/imx6/u-boot/drivers/mtd/spi/sf_internal.h:168: first defined here
make[1]: *** [drivers/mtd/spi/built-in.o] Fehler 1
make: *** [drivers/mtd/spi] Fehler 2

- Add a README entry.
- Add correct writebufsize, to fit with Linux v3.14
  MTD, UBI/UBIFS sync.

Note (From Jagan): For testing raw mtd parition erase/read/write operations
using cmd_sf, sf_mtd should be required to register the spi flash device to
MTD layer but the sf_mtd_info ops were not required until and unless if we
use any flash filesystem layer say for example UBI. Due to this the foot-print
got increased ~290bytes in non-UBI case here that should be acceptible.
Signed-off-by: NDaniel Schwierzeck <daniel.schwierzeck@gmail.com>
Signed-off-by: NHeiko Schocher <hs@denx.de>
Tested-by: NJagannadh Teki <jteki@openedev.com>
Reviewed-by: NJagannadh Teki <jteki@openedev.com>

PI and QSPI only work when boot from QSPI on ls1021a.
This patch only enable options in qspi boot defconfig.
Signed-off-by: NHaikun Wang <haikun.wang@freescale.com>
Tested-by: NHaikun Wang <haikun.wang@freescale.com>
Signed-off-by: NJagan Teki <jteki@openedev.com>

Enable Driver Model SPI for ls1021atwr board.
DSPI and QSPI only be enabled when boot from QSPI.
DSPI and QSPI are compatible under Driver Model SPI.
Signed-off-by: NHaikun Wang <Haikun.Wang@freescale.com>
Tested-by: NReview Code-CDREVIEW <CDREVIEW@freescale.com>
Tested-by: NHaikun Wang <haikun.wang@freescale.com>
Reviewed-by: NPrabhakar Kushwaha <prabhakar@freescale.com>
Reviewed-by: NJagan Teki <jteki@openedev.com>

Enable Driver Model SPI for ls1021aqds board.
DSPI and QSPI is enabled only when boot from QSPI.
DSPI and QSPI are compatible under Driver Model SPI.
Signed-off-by: NHaikun Wang <Haikun.Wang@freescale.com>
Tested-by: NHaikun Wang <haikun.wang@freescale.com>
Reviewed-by: NJagan Teki <jteki@openedev.com>

The type of DSPI flash on ls1021aqds is AT45DB021, it has specail
commands and page-size.
Use the special spi flash driver instead of "spi_flash_std" driver.
Signed-off-by: NHaikun Wang <haikun.wang@freescale.com>
Tested-by: NHaikun Wang <haikun.wang@freescale.com>
Reviewed-by: NSimon Glass <sjg@chromium.org>
Reviewed-by: NJagan Teki <jteki@openedev.com>

Atmel DataFlash chips have commands different from common spi
flash commands.
Atmel DataFlash also have special page-size.
This driver add support for accessing Atmel DataFlash.
It is based on the Driver Model.
Example:
=> sf probe 1:0
SPI DataFlash: Detected AT45DB021B with page size 264 Bytes, erase size 264 Bytes, total 264 KiB, revision d
=> sf erase 0 42000
SF: 270336 bytes @ 0x0 Erased: OK
=> mw.l 82000000 45444342 20000
=> sf write 82000000 0 42000
SF: 270336 bytes @ 0x0 Written: OK
=> sf read 83000000 0 42000
SF: 270336 bytes @ 0x0 Read: OK
=> cmp.b 82000000 83000000 42000
Total of 270336 byte(s) were the same
Signed-off-by: NHaikun Wang <haikun.wang@freescale.com>
Tested-by: NHaikun Wang <haikun.wang@freescale.com>
Reviewed-by: NSimon Glass <sjg@chromium.org>
Reviewed-by: NChakra Divi <cdivi@openedev.com>
Reviewed-by: NJagan Teki <jteki@openedev.com>

By default on this platform, u-boot loads data into high memory
in the range of 0x7Fxxxxxx, which generates a data abort when the
kernel tries to read it.  Config the u-boot environment to load
the device tree and initrd image into lower memory to make them
accessible to the kernel.
Signed-off-by: NKevin Smith <kevin.smith@elecsyscorp.com>
Acked-by: NStefan Roese <sr@denx.de>

Signed-off-by: NKevin Smith <kevin.smith@elecsyscorp.com>
Acked-by: NStefan Roese <sr@denx.de>

This reverts commit f76eba38.

This patch did not have a full and proper copyright/S-o-b chain.
Signed-off-by: NIan Campbell <ijc@hellion.org.uk>

Conflicts:
	include/configs/sun6i.h
	include/configs/sun8i.h

This sets the default commands Kconfig to match
include/config_cmd_default.h commands in the common/Kconfig and removes
them from include/configs.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>
[trini: rastaban, am43xx_evm_usbhost_boot, am43xx_evm_ethboot updates]
Signed-off-by: NTom Rini <trini@konsulko.com>

Some archs/boards specify their own default by pre-defining the config
which causes the Kconfig system to mix up the order of the configs in
the defconfigs... This will cause merge pain if allowed to proliferate.

Remove the configs that behave this way from the archs.

A few configs still remain, but that is because they only exist as
defaults and do not have a proper Kconfig entry. Those appear to be:

SPIFLASH
DISPLAY_BOARDINFO
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>
[trini: rastaban, am43xx_evm_usbhost_boot, am43xx_evm_ethboot updates,
drop DM_USB from MSI_Primo81 as USB_MUSB_SUNXI isn't converted yet to DM]
Signed-off-by: NTom Rini <trini@konsulko.com>

Boards using link-local need lib rand.

When link-local is moved to Kconfig, this dependency will be described
there.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

This command needs to exist in the Kconfig so that it can be moved from
the config_cmd_default.h.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

The help for this was simply copied from another command.

Update it to reflect the command.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

This config needs to be available in the Kconfig to allow it to be
removed from arch defaults.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

Patch 33fe2fb8 titled
"mmc: bcm283x: Remove get_timer_us() from mmc driver"
incorrectly replaced ad-hoc get_timer_us() function
with a plain get_timer(). The get_timer() operates in
mSec units instead of uSec though, which caused very
slow operation of the driver.

Restore the original behavior of the driver, but avoid
get_timer_us() and use timer_get_us() instead. The later
is part of the standard API.
Signed-off-by: NMarek Vasut <marex@denx.de>
Cc: Jakub Kiciński <moorray3@wp.pl>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Tested-by: NJakub Kicinski <kubakici@wp.pl>