* [U-Boot] [PATCH] blackfin: Add <asm/clock.h> to numerous drivers
2014-02-20 13:05 ` [U-Boot] [i2c] Pull request Heiko Schocher
@ 2014-02-20 15:16 ` Tom Rini
2014-02-20 17:17 ` Tom Rini
2014-02-20 17:17 ` [U-Boot] [i2c] Pull request Tom Rini
1 sibling, 1 reply; 4+ messages in thread
From: Tom Rini @ 2014-02-20 15:16 UTC (permalink / raw)
To: u-boot
With d6a320d we moved some clock externs out of blackfin_local.h and
into clock.h but now need to include <asm/clock.h> in more drivers to
avoid warnings.
Cc: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Tom Rini <trini@ti.com>
---
arch/blackfin/lib/board.c | 1 +
board/cm-bf548/video.c | 1 +
common/cmd_otp.c | 1 +
drivers/block/pata_bfin.c | 1 +
drivers/mmc/bfin_sdh.c | 1 +
drivers/net/bfin_mac.c | 1 +
drivers/usb/musb/blackfin_usb.c | 1 +
7 files changed, 7 insertions(+)
diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c
index facbc7a..6234201 100644
--- a/arch/blackfin/lib/board.c
+++ b/arch/blackfin/lib/board.c
@@ -23,6 +23,7 @@
#include <asm/cplb.h>
#include <asm/mach-common/bits/mpu.h>
+#include <asm/clock.h>
#include <kgdb.h>
#ifdef CONFIG_CMD_NAND
diff --git a/board/cm-bf548/video.c b/board/cm-bf548/video.c
index a43413e..c35d285 100644
--- a/board/cm-bf548/video.c
+++ b/board/cm-bf548/video.c
@@ -11,6 +11,7 @@
#include <config.h>
#include <malloc.h>
#include <asm/blackfin.h>
+#include <asm/clock.h>
#include <asm/gpio.h>
#include <asm/portmux.h>
#include <asm/mach-common/bits/dma.h>
diff --git a/common/cmd_otp.c b/common/cmd_otp.c
index 6f93335..67808aa 100644
--- a/common/cmd_otp.c
+++ b/common/cmd_otp.c
@@ -18,6 +18,7 @@
#include <command.h>
#include <asm/blackfin.h>
+#include <asm/clock.h>
#include <asm/mach-common/bits/otp.h>
static const char *otp_strerror(uint32_t err)
diff --git a/drivers/block/pata_bfin.c b/drivers/block/pata_bfin.c
index 27ecaf4..b7fd1cd 100644
--- a/drivers/block/pata_bfin.c
+++ b/drivers/block/pata_bfin.c
@@ -12,6 +12,7 @@
#include <command.h>
#include <config.h>
#include <asm/byteorder.h>
+#include <asm/clock.h>
#include <asm/io.h>
#include <asm/errno.h>
#include <asm/portmux.h>
diff --git a/drivers/mmc/bfin_sdh.c b/drivers/mmc/bfin_sdh.c
index 2631174..bd9b641 100644
--- a/drivers/mmc/bfin_sdh.c
+++ b/drivers/mmc/bfin_sdh.c
@@ -15,6 +15,7 @@
#include <asm/errno.h>
#include <asm/byteorder.h>
#include <asm/blackfin.h>
+#include <asm/clock.h>
#include <asm/portmux.h>
#include <asm/mach-common/bits/sdh.h>
#include <asm/mach-common/bits/dma.h>
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 42e208c..0c2d2ef 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -16,6 +16,7 @@
#include <linux/mii.h>
#include <asm/blackfin.h>
+#include <asm/clock.h>
#include <asm/portmux.h>
#include <asm/mach-common/bits/dma.h>
#include <asm/mach-common/bits/emac.h>
diff --git a/drivers/usb/musb/blackfin_usb.c b/drivers/usb/musb/blackfin_usb.c
index 35268ba..65fff88 100644
--- a/drivers/usb/musb/blackfin_usb.c
+++ b/drivers/usb/musb/blackfin_usb.c
@@ -11,6 +11,7 @@
#include <usb.h>
#include <asm/blackfin.h>
+#include <asm/clock.h>
#include <asm/mach-common/bits/usb.h>
#include "musb_core.h"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [i2c] Pull request
2014-02-20 13:05 ` [U-Boot] [i2c] Pull request Heiko Schocher
2014-02-20 15:16 ` [U-Boot] [PATCH] blackfin: Add <asm/clock.h> to numerous drivers Tom Rini
@ 2014-02-20 17:17 ` Tom Rini
1 sibling, 0 replies; 4+ messages in thread
From: Tom Rini @ 2014-02-20 17:17 UTC (permalink / raw)
To: u-boot
On Thu, Feb 20, 2014 at 02:05:54PM +0100, Heiko Schocher wrote:
> Hello Tom,
>
> please pull from u-boot-i2c.git, thanks!
>
> The following changes since commit 0a8e823ad0c5a602c93c2e8a54caf622ade6d3fb:
>
> Prepare v2014.04-rc1 (2014-02-19 16:01:28 -0500)
>
> are available in the git repository at:
>
> git://git.denx.de/u-boot-i2c.git master
>
> for you to fetch changes up to 39abd65c342a271d39fa580dc4c5cb7fce516ef3:
>
> arc: remove "hardware.h" (2014-02-20 06:49:19 +0100)
>
> ----------------------------------------------------------------
> Alexey Brodkin (3):
> spear: move CONFIG_SYS_I2C_BASE from arch-spear/hardware to board configs
> designware_i2c: remove inclusion of <asm/arch/hardware.h>
> arc: remove "hardware.h"
>
> Chin Liang See (1):
> designware_i2c: Enhance DesignWare I2C driver address support
>
> Hannes Petermaier (1):
> OMAP24xx I2C: Add support for set-speed
>
> Heiko Schocher (1):
> i2c, bootcount: add support for bootcounter on i2c devices
>
> Marek Vasut (1):
> i2c: i2c-mxs: Wait for I2C to empty queue
>
> Michael Burr (2):
> i2c: zynq: Support for 0-length register address
> i2c: zynq: Add support for the second i2c controller
>
> Scott Jiang (1):
> blackfin: make i2c driver blackfin independant
>
> Sonic Zhang (3):
> blackfin: the sclk MHz in i2c driver should be divided by 1000 other than 1024
> blackfin: add spi and i2c specific get clock functions
> blackfin: rename bfin-twi_i2c driver to adi_i2c
>
> README | 20 +++++++++
> arch/arc/include/asm/arch-arc700/hardware.h | 10 -----
> arch/arm/include/asm/arch-spear/hardware.h | 4 --
> arch/blackfin/include/asm/blackfin_local.h | 7 ---
> arch/blackfin/include/asm/clock.h | 11 +++++
> arch/blackfin/include/asm/twi.h | 15 +++++++
> drivers/bootcount/Makefile | 1 +
> drivers/bootcount/bootcount_i2c.c | 44 +++++++++++++++++++
> drivers/i2c/adi_i2c.c | 387 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> drivers/i2c/bfin-twi_i2c.c | 3 +-
> drivers/i2c/designware_i2c.c | 42 ++++--------------
> drivers/i2c/mxs_i2c.c | 39 ++++++++++++++---
> drivers/i2c/omap24xx_i2c.c | 147 +++++++++++++++++++++++++++++++++++++++++----------------------
> drivers/i2c/zynq_i2c.c | 82 ++++++++++++++++++++---------------
> drivers/spi/bfin_spi.c | 7 +--
> drivers/spi/bfin_spi6xx.c | 7 +--
> include/configs/spear-common.h | 9 ++++
> include/configs/x600.h | 1 +
> include/configs/zynq-common.h | 6 +--
> include/i2c.h | 1 +
> 20 files changed, 688 insertions(+), 155 deletions(-)
> delete mode 100644 arch/arc/include/asm/arch-arc700/hardware.h
> create mode 100644 arch/blackfin/include/asm/twi.h
> create mode 100644 drivers/bootcount/bootcount_i2c.c
> create mode 100644 drivers/i2c/adi_i2c.c
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140220/746b619a/attachment.pgp>
^ permalink raw reply [flat|nested] 4+ messages in thread