aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-3.3/190-cambria_support.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2012-10-17 21:53:37 +0000
committerJohn Crispin <blogic@openwrt.org>2012-10-17 21:53:37 +0000
commitfb47a917c207afa0631518b0b7a80e19ac0c796d (patch)
tree7119a1430707d10597e1c1a4cb2d4189cb396fbd /target/linux/ixp4xx/patches-3.3/190-cambria_support.patch
parentc921e6607e2a0db1af65834d172f83d59268b71e (diff)
downloadmaster-187ad058-fb47a917c207afa0631518b0b7a80e19ac0c796d.tar.gz
master-187ad058-fb47a917c207afa0631518b0b7a80e19ac0c796d.tar.bz2
master-187ad058-fb47a917c207afa0631518b0b7a80e19ac0c796d.zip
drop GPIODEV platform code
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33825 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-3.3/190-cambria_support.patch')
-rw-r--r--target/linux/ixp4xx/patches-3.3/190-cambria_support.patch16
1 files changed, 1 insertions, 15 deletions
diff --git a/target/linux/ixp4xx/patches-3.3/190-cambria_support.patch b/target/linux/ixp4xx/patches-3.3/190-cambria_support.patch
index 57dfdace8e..4eb1631a9e 100644
--- a/target/linux/ixp4xx/patches-3.3/190-cambria_support.patch
+++ b/target/linux/ixp4xx/patches-3.3/190-cambria_support.patch
@@ -82,7 +82,7 @@
+subsys_initcall(cambria_pci_init);
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/cambria-setup.c
-@@ -0,0 +1,1006 @@
+@@ -0,0 +1,992 @@
+/*
+ * arch/arm/mach-ixp4xx/cambria-setup.c
+ *
@@ -517,13 +517,6 @@
+ {131, GPIOF_IN, "DIO4" },
+};
+
-+static struct platform_device cambria_gpio = {
-+ .name = "GPIODEV",
-+ .id = -1,
-+ .num_resources = ARRAY_SIZE(cambria_gpio_resources),
-+ .resource = cambria_gpio_resources,
-+};
-+
+static struct latch_led cambria_latch_leds[] = {
+ {
+ .name = "ledA", /* green led */
@@ -683,7 +676,6 @@
+ (1 << 5) | (1 << 8) | (1 << 9) | (1 << 12);
+ cambria_gpio_resources[0].end = cambria_gpio_resources[0].start;
+
-+ platform_device_register(&cambria_gpio);
+ platform_device_register(&cambria_npec_device);
+ platform_device_register(&cambria_npea_device);
+}
@@ -706,7 +698,6 @@
+ (1 << 5) | (1 << 8) | (1 << 9) | (1 << 12);
+ cambria_gpio_resources[0].end = cambria_gpio_resources[0].start;
+
-+ platform_device_register(&cambria_gpio);
+ platform_device_register(&cambria_optional_uart);
+ platform_device_register(&cambria_npec_device);
+ platform_device_register(&cambria_npea_device);
@@ -737,7 +728,6 @@
+ (1 << 19) | (1 << 20) | (1 << 24) | (1 << 25);
+ cambria_gpio_resources[0].end = cambria_gpio_resources[0].start;
+
-+ platform_device_register(&cambria_gpio);
+ platform_device_register(&cambria_optional_uart);
+
+ platform_device_register(&cambria_npec_device);
@@ -761,8 +751,6 @@
+
+static void __init cambria_gw2359_setup(void)
+{
-+ platform_device_register(&cambria_gpio);
-+
+#if defined(CONFIG_MVSWITCH_PHY) || defined(CONFIG_MVSWITCH_PHY_MODULE)
+ /* The mvswitch driver has some hard-coded values which could
+ * easily be turned into a platform resource if needed. For now they
@@ -865,8 +853,6 @@
+ cambria_optional_uart.num_resources = 7,
+ platform_device_register(&cambria_optional_uart);
+
-+ platform_device_register(&cambria_gpio);
-+
+#if defined(CONFIG_MVSWITCH_PHY) || defined(CONFIG_MVSWITCH_PHY_MODULE)
+ /* The mvswitch driver has some hard-coded values which could
+ * easily be turned into a platform resource if needed. For now they