diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-06-12 14:48:45 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-06-12 14:48:45 +0000 |
commit | 87f994d16d4bf80a5c7104b2ee0647df6f92d5fd (patch) | |
tree | 2497c9379a7b0707664887456dc1846d1cdf8064 /target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch | |
parent | 990423f3efad559289c3a084f2cb40a0c0f2834e (diff) | |
download | upstream-87f994d16d4bf80a5c7104b2ee0647df6f92d5fd.tar.gz upstream-87f994d16d4bf80a5c7104b2ee0647df6f92d5fd.tar.bz2 upstream-87f994d16d4bf80a5c7104b2ee0647df6f92d5fd.zip |
brcm47xx: remove support for kernel 3.6
SVN-Revision: 36927
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch b/target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch deleted file mode 100644 index 3c90013d6c..0000000000 --- a/target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- a/drivers/ssb/driver_mipscore.c -+++ b/drivers/ssb/driver_mipscore.c -@@ -14,6 +14,7 @@ - #include <linux/serial_core.h> - #include <linux/serial_reg.h> - #include <linux/time.h> -+#include <linux/platform_device.h> - - #include "ssb_private.h" - -@@ -186,6 +187,19 @@ static void ssb_mips_serial_init(struct - mcore->nr_serial_ports = 0; - } - -+static struct resource ssb_pflash_resource = { -+ .name = "ssb_pflash", -+ .start = 0, -+ .end = 0, -+ .flags = 0, -+}; -+ -+struct platform_device ssb_pflash_dev = { -+ .name = "bcm47xx-pflash", -+ .resource = &ssb_pflash_resource, -+ .num_resources = 1, -+}; -+ - static void ssb_mips_flash_detect(struct ssb_mipscore *mcore) - { - struct ssb_bus *bus = mcore->dev->bus; -@@ -196,6 +210,9 @@ static void ssb_mips_flash_detect(struct - mcore->pflash.buswidth = 2; - mcore->pflash.window = SSB_FLASH1; - mcore->pflash.window_size = SSB_FLASH1_SZ; -+ ssb_pflash_resource.start = mcore->pflash.window; -+ ssb_pflash_resource.end = mcore->pflash.window + -+ mcore->pflash.window_size; - return; - } - -@@ -216,6 +233,9 @@ static void ssb_mips_flash_detect(struct - mcore->pflash.buswidth = 1; - else - mcore->pflash.buswidth = 2; -+ ssb_pflash_resource.start = mcore->pflash.window; -+ ssb_pflash_resource.end = mcore->pflash.window + -+ mcore->pflash.window_size; - break; - } - } ---- a/drivers/ssb/main.c -+++ b/drivers/ssb/main.c -@@ -549,6 +549,14 @@ static int ssb_devices_register(struct s - "Error registering serial flash\n"); - } - #endif -+#ifdef CONFIG_SSB_DRIVER_MIPS -+ if (bus->mipscore.pflash.present) { -+ err = platform_device_register(&ssb_pflash_dev); -+ if (err) -+ ssb_printk(KERN_ERR PFX -+ "Error registering parallel flash\n"); -+ } -+#endif - - return 0; - error: ---- a/drivers/ssb/ssb_private.h -+++ b/drivers/ssb/ssb_private.h -@@ -271,4 +271,6 @@ static inline int ssb_gpio_init(struct s - } - #endif /* CONFIG_SSB_DRIVER_GPIO */ - -+extern struct platform_device ssb_pflash_dev; -+ - #endif /* LINUX_SSB_PRIVATE_H_ */ |