mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
kernel: update bcma and ssb to master-2012-10-18 from wireless-testing
* update the flash driver for bcm47xx to use the stubs already in bcma * do some misc enhancements to the flash drivers for bcm47xx git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33920 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
@@ -4,4 +4,3 @@
|
||||
#
|
||||
|
||||
obj-y += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o sprom.o bus.o
|
||||
obj-y += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o sprom.o
|
||||
-obj-$(CONFIG_BCM47XX_SSB) += wgt634u.o
|
||||
--- a/arch/mips/bcm47xx/wgt634u.c
|
||||
+++ /dev/null
|
||||
@@ -153,7 +153,7 @@
|
||||
- if (et0mac[0] == 0x00 &&
|
||||
- ((et0mac[1] == 0x09 && et0mac[2] == 0x5b) ||
|
||||
- (et0mac[1] == 0x0f && et0mac[2] == 0xb5))) {
|
||||
- struct ssb_chipcommon *ccore = &bcm47xx_bus.ssb.chipco;
|
||||
- struct ssb_mipscore *mcore = &bcm47xx_bus.ssb.mipscore;
|
||||
-
|
||||
- printk(KERN_INFO "WGT634U machine detected.\n");
|
||||
-
|
||||
@@ -165,18 +165,18 @@
|
||||
-
|
||||
- if (!request_irq(gpio_to_irq(WGT634U_GPIO_RESET),
|
||||
- gpio_interrupt, IRQF_SHARED,
|
||||
- "WGT634U GPIO", ccore)) {
|
||||
- "WGT634U GPIO", &bcm47xx_bus.ssb.chipco)) {
|
||||
- gpio_direction_input(WGT634U_GPIO_RESET);
|
||||
- gpio_intmask(WGT634U_GPIO_RESET, 1);
|
||||
- ssb_chipco_irq_mask(ccore,
|
||||
- ssb_chipco_irq_mask(&bcm47xx_bus.ssb.chipco,
|
||||
- SSB_CHIPCO_IRQ_GPIO,
|
||||
- SSB_CHIPCO_IRQ_GPIO);
|
||||
- }
|
||||
-
|
||||
- wgt634u_flash_data.width = ccore->pflash.buswidth;
|
||||
- wgt634u_flash_resource.start = ccore->pflash.window;
|
||||
- wgt634u_flash_resource.end = ccore->pflash.window
|
||||
- + ccore->pflash.window_size
|
||||
- wgt634u_flash_data.width = mcore->pflash.buswidth;
|
||||
- wgt634u_flash_resource.start = mcore->pflash.window;
|
||||
- wgt634u_flash_resource.end = mcore->pflash.window
|
||||
- + mcore->pflash.window_size
|
||||
- - 1;
|
||||
- return platform_add_devices(wgt634u_devices,
|
||||
- ARRAY_SIZE(wgt634u_devices));
|
||||
|
||||
Reference in New Issue
Block a user