projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
brcm47xx: various fixes and code cleanups for irq code
[openwrt.git]
/
target
/
linux
/
brcm47xx
/
patches-3.6
/
235-bcma-dont-expose-mips-irq.patch
diff --git
a/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch
b/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch
index
90d05bc
..
5df8636
100644
(file)
--- a/
target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch
+++ b/
target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch
@@
-1,6
+1,6
@@
--- a/include/linux/bcma/bcma_driver_mips.h
+++ b/include/linux/bcma/bcma_driver_mips.h
--- a/include/linux/bcma/bcma_driver_mips.h
+++ b/include/linux/bcma/bcma_driver_mips.h
-@@ -4
9,6 +49
,6 @@ static inline void bcma_core_mips_early_
+@@ -4
8,6 +48
,6 @@ static inline void bcma_core_mips_early_
extern u32 bcma_cpu_clock(struct bcma_drv_mips *mcore);
extern u32 bcma_cpu_clock(struct bcma_drv_mips *mcore);
@@
-30,7
+30,7
@@
{
struct bcma_device *mdev = dev->bus->drv_mips.core;
u32 irqflag;
{
struct bcma_device *mdev = dev->bus->drv_mips.core;
u32 irqflag;
-@@ -10
6,7 +106,12
@@ unsigned int bcma_core_mips_irq(struct b
+@@ -10
3,7 +103,13
@@ unsigned int bcma_core_mips_irq(struct b
return 5;
}
return 5;
}
@@
-38,7
+38,8
@@
+
+unsigned int bcma_core_irq(struct bcma_device *dev)
+{
+
+unsigned int bcma_core_irq(struct bcma_device *dev)
+{
-+ return bcma_core_mips_irq(dev) + 2;
++ unsigned int mips_irq = bcma_core_mips_irq(dev);
++ return mips_irq <= 4 ? mips_irq + 2 : 0;
+}
+EXPORT_SYMBOL(bcma_core_irq);
+}
+EXPORT_SYMBOL(bcma_core_irq);