aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-08-19 10:46:25 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-09-26 05:07:05 -0400
commit422383a18fa86bc48d579ed1874ca8b78fc2bd21 (patch)
treefd313e9a0f457d980d6293f4ee3db5becdcac506
parentfa9a65f7cbec439a029551b14084fc8efdc4a2ac (diff)
ARM: ux500: Disable Snowball's SMSC911x Ethernet when booting with ATAGs
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>
-rw-r--r--arch/arm/mach-ux500/board-mop500.c32
1 files changed, 0 insertions, 32 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 6dcf023b0b96..a1c433062f62 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -33,7 +33,6 @@
33#include <linux/mfd/abx500/ab8500-codec.h> 33#include <linux/mfd/abx500/ab8500-codec.h>
34#include <linux/platform_data/leds-lp55xx.h> 34#include <linux/platform_data/leds-lp55xx.h>
35#include <linux/input.h> 35#include <linux/input.h>
36#include <linux/smsc911x.h>
37#include <linux/gpio_keys.h> 36#include <linux/gpio_keys.h>
38#include <linux/delay.h> 37#include <linux/delay.h>
39#include <linux/leds.h> 38#include <linux/leds.h>
@@ -118,36 +117,6 @@ static struct ab8500_codec_platform_data ab8500_codec_pdata = {
118 .ear_cmv = EAR_CMV_0_95V 117 .ear_cmv = EAR_CMV_0_95V
119}; 118};
120 119
121static struct smsc911x_platform_config snowball_sbnet_cfg = {
122 .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH,
123 .irq_type = SMSC911X_IRQ_TYPE_PUSH_PULL,
124 .flags = SMSC911X_USE_16BIT | SMSC911X_FORCE_INTERNAL_PHY,
125 .shift = 1,
126};
127
128static struct resource sbnet_res[] = {
129 {
130 .name = "smsc911x-memory",
131 .start = (0x5000 << 16),
132 .end = (0x5000 << 16) + 0xffff,
133 .flags = IORESOURCE_MEM,
134 },
135 {
136 .start = NOMADIK_GPIO_TO_IRQ(140),
137 .end = NOMADIK_GPIO_TO_IRQ(140),
138 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
139 },
140};
141
142static struct platform_device snowball_sbnet_dev = {
143 .name = "smsc911x",
144 .num_resources = ARRAY_SIZE(sbnet_res),
145 .resource = sbnet_res,
146 .dev = {
147 .platform_data = &snowball_sbnet_cfg,
148 },
149};
150
151struct ab8500_platform_data ab8500_platdata = { 120struct ab8500_platform_data ab8500_platdata = {
152 .irq_base = MOP500_AB8500_IRQ_BASE, 121 .irq_base = MOP500_AB8500_IRQ_BASE,
153 .regulator = &ab8500_regulator_plat_data, 122 .regulator = &ab8500_regulator_plat_data,
@@ -408,7 +377,6 @@ static void __init u8500_cryp1_hash1_init(struct device *parent)
408} 377}
409 378
410static struct platform_device *snowball_platform_devs[] __initdata = { 379static struct platform_device *snowball_platform_devs[] __initdata = {
411 &snowball_sbnet_dev,
412 &snowball_gpio_en_3v3_regulator_dev, 380 &snowball_gpio_en_3v3_regulator_dev,
413 &u8500_cpufreq_cooling_device, 381 &u8500_cpufreq_cooling_device,
414 &sdi0_regulator, 382 &sdi0_regulator,