summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/devices-common.h
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-08-21 15:59:51 +0100
committerLinus Walleij <linus.walleij@linaro.org>2013-09-26 11:07:43 +0200
commitceb519e94fc257429011c1cc9874c8bd75834f8d (patch)
tree1c706e9e18db0cab3fe7096c407983f8d3ebcc28 /arch/arm/mach-ux500/devices-common.h
parent16b246ac50181c49e34e2846f4227cf8ad4d39c8 (diff)
downloadlinux-next-ceb519e94fc257429011c1cc9874c8bd75834f8d.tar.gz
ARM: ux500: Remove I2C support when booting with ATAG support
It's time to remove all ATAG support from ux500 and rely solely on Device Tree booting. This patch is part of that endeavour. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/devices-common.h')
-rw-r--r--arch/arm/mach-ux500/devices-common.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h
index 04fa009b5240..34ec2f75ec7b 100644
--- a/arch/arm/mach-ux500/devices-common.h
+++ b/arch/arm/mach-ux500/devices-common.h
@@ -12,7 +12,6 @@
#include <linux/dma-mapping.h>
#include <linux/sys_soc.h>
#include <linux/amba/bus.h>
-#include <linux/platform_data/i2c-nomadik.h>
struct spi_master_cntlr;
@@ -44,19 +43,6 @@ dbx500_add_uart(struct device *parent, const char *name, resource_size_t base,
return amba_ahb_device_add(parent, name, base, SZ_4K, irq, 0, pdata, 0);
}
-struct nmk_i2c_controller;
-
-static inline struct amba_device *
-dbx500_add_i2c(struct device *parent, int id, resource_size_t base, int irq,
- struct nmk_i2c_controller *data)
-{
- /* Conjure a name similar to what the platform device used to have */
- char name[16];
-
- snprintf(name, sizeof(name), "nmk-i2c.%d", id);
- return amba_apb_device_add(parent, name, base, SZ_4K, irq, 0, data, 0);
-}
-
static inline struct amba_device *
dbx500_add_rtc(struct device *parent, resource_size_t base, int irq)
{