mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
brcm47xx: fix patch which moves the flash struct in wgt634u code
SVN-Revision: 33000
This commit is contained in:
parent
1ae8b7c433
commit
1d40a652ee
target/linux/brcm47xx/patches-3.3
@ -24,7 +24,24 @@
|
||||
#ifdef CONFIG_BCM47XX_BCMA
|
||||
--- a/arch/mips/bcm47xx/wgt634u.c
|
||||
+++ b/arch/mips/bcm47xx/wgt634u.c
|
||||
@@ -156,10 +156,10 @@ static int __init wgt634u_init(void)
|
||||
@@ -142,24 +142,24 @@ static int __init wgt634u_init(void)
|
||||
if (et0mac[0] == 0x00 &&
|
||||
((et0mac[1] == 0x09 && et0mac[2] == 0x5b) ||
|
||||
(et0mac[1] == 0x0f && et0mac[2] == 0xb5))) {
|
||||
- struct ssb_mipscore *mcore = &bcm47xx_bus.ssb.mipscore;
|
||||
+ struct ssb_chipcommon *ccore = &bcm47xx_bus.ssb.chipco;
|
||||
|
||||
printk(KERN_INFO "WGT634U machine detected.\n");
|
||||
|
||||
if (!request_irq(gpio_to_irq(WGT634U_GPIO_RESET),
|
||||
gpio_interrupt, IRQF_SHARED,
|
||||
- "WGT634U GPIO", &bcm47xx_bus.ssb.chipco)) {
|
||||
+ "WGT634U GPIO", ccore)) {
|
||||
gpio_direction_input(WGT634U_GPIO_RESET);
|
||||
gpio_intmask(WGT634U_GPIO_RESET, 1);
|
||||
- ssb_chipco_irq_mask(&bcm47xx_bus.ssb.chipco,
|
||||
+ ssb_chipco_irq_mask(ccore,
|
||||
SSB_CHIPCO_IRQ_GPIO,
|
||||
SSB_CHIPCO_IRQ_GPIO);
|
||||
}
|
||||
|
||||
@ -32,10 +49,10 @@
|
||||
- wgt634u_flash_resource.start = mcore->flash_window;
|
||||
- wgt634u_flash_resource.end = mcore->flash_window
|
||||
- + mcore->flash_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
|
||||
+ 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
|
||||
- 1;
|
||||
return platform_add_devices(wgt634u_devices,
|
||||
ARRAY_SIZE(wgt634u_devices));
|
||||
|
@ -153,7 +153,7 @@
|
||||
- if (et0mac[0] == 0x00 &&
|
||||
- ((et0mac[1] == 0x09 && et0mac[2] == 0x5b) ||
|
||||
- (et0mac[1] == 0x0f && et0mac[2] == 0xb5))) {
|
||||
- struct ssb_mipscore *mcore = &bcm47xx_bus.ssb.mipscore;
|
||||
- struct ssb_chipcommon *ccore = &bcm47xx_bus.ssb.chipco;
|
||||
-
|
||||
- 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", &bcm47xx_bus.ssb.chipco)) {
|
||||
- "WGT634U GPIO", ccore)) {
|
||||
- gpio_direction_input(WGT634U_GPIO_RESET);
|
||||
- gpio_intmask(WGT634U_GPIO_RESET, 1);
|
||||
- ssb_chipco_irq_mask(&bcm47xx_bus.ssb.chipco,
|
||||
- ssb_chipco_irq_mask(ccore,
|
||||
- SSB_CHIPCO_IRQ_GPIO,
|
||||
- SSB_CHIPCO_IRQ_GPIO);
|
||||
- }
|
||||
-
|
||||
- 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
|
||||
- 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
|
||||
- - 1;
|
||||
- return platform_add_devices(wgt634u_devices,
|
||||
- ARRAY_SIZE(wgt634u_devices));
|
||||
|
Loading…
Reference in New Issue
Block a user