Tom Rini
891b487098
Merge branch 'master' of git://git.denx.de/u-boot-spi
2015-07-01 15:38:12 -04:00
Tom Rini
6762ae6888
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
2015-07-01 15:37:56 -04:00
Angelo Dureghello
8aa5f1d971
spi: cf_qspi: fix clamp macro type check compilation warnings
...
Fix compilation warnings for redefined 'clamp' macro and non-uniform
clamp macro types.
Signed-off-by: Angelo Dureghello <angelo@sysam.it >
Reviewed-by: Jagannadh Teki <jteki@openedev.com >
2015-07-01 22:58:50 +05:30
Jagan Teki
23cbd16db6
README: Remove CONFIG_SPI_FLASH_DATAFLASH help text
...
Since the help text is added in drivers/mtd/spi/Kconfig
Signed-off-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:39:06 +05:30
Jagan Teki
afdfe387cd
README: Remove CONFIG_SPI_FLASH_BAR help text
...
Since the help text is added in drivers/mtd/spi/Kconfig
Signed-off-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:39:06 +05:30
Jagan Teki
84d31b3b8f
sf: Kconfig: Add SPI_FLASH_BAR entry
...
Added SPI_FLASH_BAR entry on Kconfig with help description
Signed-off-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:39:06 +05:30
Jagan Teki
9cb528de48
defconfig: Move CONFIG_SPI_FLASH_BAR from configs
...
This commit moves:
- CONFIG_SPI_FLASH_BAR
from include/configs/*.h into configs/*_defconfigs
Signed-off-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:39:06 +05:30
Jagan Teki
0c79bde479
README: Remove CONFIG_SPI_FLASH_MTD help text
...
Since the help text is added in drivers/mtd/spi/Kconfig
Signed-off-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:39:05 +05:30
Jagan Teki
4495830c58
spi: Kconfig: Add TEGRA20_SLINK entry
...
Added TEGRA20_SLINK entry on Kconfig with help description.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Reviewed-by: Simon Glass <sjg@chromium.org >
Cc: Tom Warren <twarren@nvidia.com >
Cc: Stephen Warren <swarren@nvidia.com >
2015-07-01 21:39:05 +05:30
Jagan Teki
2f3e6f8cc1
spi: Kconfig: Add TEGRA20_SFLASH entry
...
Added TEGRA20_SFLASH entry on Kconfig with help description.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Reviewed-by: Simon Glass <sjg@chromium.org >
Cc: Tom Warren <twarren@nvidia.com >
Cc: Stephen Warren <swarren@nvidia.com >
2015-07-01 21:39:05 +05:30
Jagan Teki
5bf9a2d3dd
spi: Kconfig: Add TEGRA114_SPI entry
...
Added TEGRA114_SPI entry on Kconfig with help description.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Reviewed-by: Simon Glass <sjg@chromium.org >
Cc: Tom Warren <twarren@nvidia.com >
Cc: Stephen Warren <swarren@nvidia.com >
2015-07-01 21:39:05 +05:30
Jagan Teki
456360102c
spi: Kconfig: Add ICH_SPI entry
...
Added ICH_SPI entry on Kconfig with help description.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Reviewed-by: Simon Glass <sjg@chromium.org >
Reviewed-by: Bin Meng <bmeng.cn@gmail.com >
2015-07-01 21:39:05 +05:30
Jagan Teki
c354eee8d0
spi: Kconfig: Add EXYNOS_SPI entry
...
Added EXYNOS_SPI entry on Kconfig with help description.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Reviewed-by: Simon Glass <sjg@chromium.org >
2015-07-01 21:39:05 +05:30
Jagan Teki
91c22d046c
spi: Kconfig: Add FSL_QSPI entry
...
Added FSL_QSPI entry on Kconfig with help description.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Cc: Peng Fan <Peng.Fan@freescale.com >
Cc: Haikun Wang <haikun.wang@freescale.com >
2015-07-01 21:39:04 +05:30
Jagan Teki
3debffa704
spi: Kconfig: Add FSL_ESPI entry
...
Added FSL_ESPI entry on Kconfig with help description.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Cc: Haikun Wang <haikun.wang@freescale.com >
2015-07-01 21:39:04 +05:30
Jagan Teki
94ea308d75
spi: Kconfig: Add FSL_DSPI entry
...
Added FSL_DSPI entry on Kconfig with help description.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Cc: Haikun Wang <haikun.wang@freescale.com >
2015-07-01 21:39:04 +05:30
Jagan Teki
e4976af865
spi: Kconfig: Show dm-spi drivers if DM_SPI set
...
DM supported spi drivers are enbled only when DM_SPI enabled,
so added DM_SPI if condition in Kconfig to show thoese only
when it enabled.
Also re-order the config items as incresing alphabetic order.
Signed-off-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:39:04 +05:30
Jagan Teki
1360004233
spi: Makefile: Use object file alphabetic order
...
Use object files as incresing alphabetic order, so-that it's
easy for readability.
Signed-off-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:39:04 +05:30
Jagan Teki
f924a20908
spi: Kconfig: Add TI_QSPI entry
...
Added TI_QSPI entry on Kconfig with help description.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Reviewed-by: Tom Rini <trini@konsulko.com >
2015-07-01 21:39:04 +05:30
Jagan Teki
075143d3cf
spi: Kconfig: Add XILINX_SPI entry
...
Added XILINX_SPI entry on Kconfig with help description.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Cc: Michal Simek <michal.simek@xilinx.com >
2015-07-01 21:39:03 +05:30
Jagan Teki
de8230535b
spi: Add Kconfig menu entry
...
Added Kconfig menu ... endmenu enties for spi support.
Signed-off-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:39:03 +05:30
Masahiro Yamada
8101b98298
ARM: UniPhier: add IDs for PH1-Pro5, ProXstream2, PH1-LD6b
...
This prepares for new SoCs support.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com >
2015-07-02 01:07:25 +09:00
Masahiro Yamada
13b2ba1a11
ARM: dts: UniPhier: re-license device tree files under GPLv2+/X11
...
The current GPL only licensing on the device trees makes it very
impractical for other software components licensed under another
license.
To make it easier to reuse them, the device trees for UniPhier
SoCs and boards have already been dual-licensed in Linux.
Follow this trend in U-boot too.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com >
2015-07-02 01:07:11 +09:00
Masahiro Yamada
edcfaeb8fd
ARM: dts: UniPhier: sync device trees with the Linux kernel
...
This makes code diff much easier.
Device trees describe hardware attributes, which are independent
of software architecture. It generally makes sense to synchronize
them beyond software projects.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com >
2015-07-02 01:06:56 +09:00
Masahiro Yamada
84875f881e
ARM: UniPhier: drop special CONFIG_AUTOBOOT_ settings
...
There is no good reason to use a particular key to stop autobooting.
The default allows us to stop the autoboot with any key input.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com >
2015-07-02 01:06:51 +09:00
Jagan Teki
cd9accdcd9
sf: Kconfig: Add SPI_FLASH_DATAFLASH entry
...
Added SPI_FLASH_DATAFLASH entry on Kconfig with help description.
data flash driver comes with good decription, hence moved the
same on to kconfig help decription.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Reviewed-by: Simon Glass <sjg@chromium.org >
Cc: Haikun Wang <haikun.wang@freescale.com >
2015-07-01 21:22:19 +05:30
Jagan Teki
7678dd93ec
sf: Kconfig: Add SPI_FLASH_MTD entry
...
Added SPI_FLASH_MTD entry on Kconfig with help description.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Acked-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com >
Cc: Heiko Schocher <hs@denx.de >
2015-07-01 21:15:04 +05:30
Jagan Teki
2ce7e2b6fc
sf: Kconfig: Update SPI_FLASH entry
...
Updated SPI_FLASH entry on Kconfig with depends on
and along with config help description.
Signed-off-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:15:04 +05:30
Jagan Teki
f39eb75b22
common: Add CMD_SF Kconfig entry
...
Added Kconfig entry for CMD_SF.
Signed-off-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:15:04 +05:30
Jagan Teki
810fd69672
sf: Add Kconfig menu entry
...
Added Kconfig menu ... endmenu enties for spi flash suppor
Signed-off-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:15:04 +05:30
Jagan Teki
a128197b81
README: Add CONFIG_SPI_FLASH_DATAFLASH description
...
This patch adds CONFIG_SPI_FLASH_DATAFLASH descrition on README
file for more readble for users.
Signed-off-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:15:04 +05:30
Jagan Teki
6812484a40
sf: dataflash: Rename to CONFIG_SPI_FLASH_DATAFLASH
...
Rename CONFIG_SF_DATAFLASH into CONFIG_SPI_FLASH_DATAFLASH
as it follows the naming convention same as remaining configs.
Signed-off-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:15:04 +05:30
Jagan Teki
d065cfd9fd
zynq: defconfig: Move CONFIG_OF_* to Kconfig
...
This commit moves:
- CONFIG_OF_CONTROL
- SPL_DISABLE_OF_CONTROL
from zynq_*_defconfig files into arch/arm/Kconfig "config ARCH_ZYNQ"
Signed-off-by: Jagan 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 >
2015-07-01 21:15:03 +05:30
Jagan Teki
55c4c44d41
defconfig: Add CONFIG_OF_CONTROL in zynq_picozed
...
Enable FDT support for zynq_picozed board.
Signed-off-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:15:03 +05:30
Jagan Teki
df30a425bb
spi: Kconfig: Add Zynq SPI controller entry
...
Add Zynq SPI controller Kconfig entry.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Reviewed-by: Simon 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 >
2015-07-01 21:15:03 +05:30
Jagan Teki
5f24d123c8
spi: xilinx_spi: Add asm/io.h include file
...
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: Jagan Teki <jteki@openedev.com >
Cc: Michal Simek <michal.simek@xilinx.com >
2015-07-01 21:15:03 +05:30
Jagan Teki
9505c36ed0
dm: spi: xilinx_spi: Convert to driver model
...
This converts the xilinx spi driver to use the driver model.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Acked-by: Simon Glass <sjg@chromium.org >
Cc: Michal Simek <michal.simek@xilinx.com >
2015-07-01 21:15:03 +05:30
Jagan Teki
89cab97e98
dts: zynq: Enable spi1 for zc770_xm010 board
...
This patch enables spi1 for zynq zc770_xm010 board dts
Signed-off-by: Jagan Teki <jteki@openedev.com >
Tested-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:15:03 +05:30
Jagan Teki
cdc9dd0750
spi: zynq_spi: Add fdt support in driver
...
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: Jagan Teki <jteki@openedev.com >
Acked-by: Simon Glass <sjg@chromium.org >
Cc: Michal Simek <michal.simek@xilinx.com >
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com >
Tested-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:15:03 +05:30
Jagan Teki
a8a8fc9cee
dts: zynq: Add zynq spi controller nodes
...
This patch adds zynq spi controller nodes in zynq-7000.dtsi.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Acked-by: Simon Glass <sjg@chromium.org >
Cc: Michal Simek <michal.simek@xilinx.com >
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com >
Tested-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:15:03 +05:30
Jagan Teki
9f7a45020b
zynq: Kconfig: Enable dm spi and spi_flash
...
Enabled CONFIG_DM_SPI and CONFIG_DM_SPI_FLASH for zynq soc.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Acked-by: Simon Glass <sjg@chromium.org >
Cc: Michal Simek <michal.simek@xilinx.com >
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com >
Tested-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:15:03 +05:30
Jagan Teki
b1c82da266
dm: spi: zynq_spi: Convert to driver model
...
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: Jagan Teki <jteki@openedev.com >
Acked-by: Simon Glass <sjg@chromium.org >
Cc: Michal Simek <michal.simek@xilinx.com >
Cc: Siva Durga Prasad Paladugu <sivadur@xilinx.com >
Tested-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:15:03 +05:30
Jagan Teki
5d69df3541
spi/sf: Minor cleanups
...
- Adjust tab spaces
- Add comments
Signed-off-by: Jagan Teki <jteki@openedev.com >
2015-07-01 21:15:03 +05:30
Jagan Teki
ff6e31d3a1
spi: davinci_spi: Driver cleanup
...
Arrange driver code in more readable format[1] for easy accessing
and readable.
[1] http://patchwork.ozlabs.org/patch/265683/
Signed-off-by: Jagan Teki <jteki@openedev.com >
Cc: Rex Chang <rchang@ti.com >
Cc: Murali Karicheri <m-karicheri2@ti.com >
2015-07-01 21:15:03 +05:30
Jagan Teki
e6d2fbf70a
spi: davinci_spi: Move header code to driver
...
Move the header code into driver for more readable and
easy to access it.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Cc: Rex Chang <rchang@ti.com >
Cc: Murali Karicheri <m-karicheri2@ti.com >
2015-07-01 21:15:02 +05:30
Jagan Teki
a7b6ef05bf
spi: xilinx_spi: Driver clean-up
...
- 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: Jagan Teki <jteki@openedev.com >
Acked-by: Michal Simek <michal.simek@xilinx.com >
2015-07-01 21:15:02 +05:30
Jagan Teki
f93542a873
spi: xilinx_spi: Move header code to driver
...
Move the header code into driver for more readable and
easy to access it.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Acked-by: Michal Simek <michal.simek@xilinx.com >
2015-07-01 21:15:02 +05:30
Jagan Teki
f23d532b63
spi: Zap oc_tiny_spi driver
...
Zap oc_tiny_spi driver since the boards used this driver
is no longer been active.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Cc: Thomas Chou <thomas@wytron.com.tw >
2015-07-01 21:15:02 +05:30
Jagan Teki
4d934a9ffd
spi: Zap ftssp010_spi driver
...
Zap ftssp010_spi driver since the boards used this driver
is no longer been active.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Cc: Kuo-Jung Su <dantesu@faraday-tech.com >
Cc: Axel Lin <axel.lin@ingics.com >
2015-07-01 21:15:02 +05:30
Jagan Teki
4ad479e3d6
spi: Zap andes_spi driver
...
Zap andes_spi driver since the boards used this driver
is no longer been active.
Signed-off-by: Jagan Teki <jteki@openedev.com >
Cc: Macpaul Lin <macpaul@andestech.com >
2015-07-01 21:15:02 +05:30