projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bcm63xx: fix WPS button polarity for Alice Gate VoIP 2 + Wifi
[openwrt.git]
/
target
/
linux
/
brcm63xx
/
patches-3.3
/
305-missing_ext_irq_bits.patch
diff --git
a/target/linux/brcm63xx/patches-3.3/305-missing_ext_irq_bits.patch
b/target/linux/brcm63xx/patches-3.3/305-missing_ext_irq_bits.patch
index a350c4d554ff21ba0f1d84c208105d49334a33e7..703f4b54b16464e39f132313cde78453ae5a2b47 100644
(file)
--- a/
target/linux/brcm63xx/patches-3.3/305-missing_ext_irq_bits.patch
+++ b/
target/linux/brcm63xx/patches-3.3/305-missing_ext_irq_bits.patch
@@
-1,6
+1,6
@@
--- a/arch/mips/bcm63xx/irq.c
+++ b/arch/mips/bcm63xx/irq.c
--- a/arch/mips/bcm63xx/irq.c
+++ b/arch/mips/bcm63xx/irq.c
-@@ -
45,8 +45
,8 @@ static void __internal_irq_unmask_64(uns
+@@ -
56,8 +56
,8 @@ static void __internal_irq_unmask_64(uns
#define is_ext_irq_cascaded 0
#define ext_irq_start 0
#define ext_irq_end 0
#define is_ext_irq_cascaded 0
#define ext_irq_start 0
#define ext_irq_end 0
@@
-11,7
+11,7
@@
#define ext_irq_cfg_reg2 0
#endif
#ifdef CONFIG_BCM63XX_CPU_6348
#define ext_irq_cfg_reg2 0
#endif
#ifdef CONFIG_BCM63XX_CPU_6348
-@@ -1
22,11 +122
,15 @@ static void bcm63xx_init_irq(void)
+@@ -1
43,11 +143
,15 @@ static void bcm63xx_init_irq(void)
irq_stat_addr += PERF_IRQSTAT_6338_REG;
irq_mask_addr += PERF_IRQMASK_6338_REG;
irq_bits = 32;
irq_stat_addr += PERF_IRQSTAT_6338_REG;
irq_mask_addr += PERF_IRQMASK_6338_REG;
irq_bits = 32;
@@
-27,7
+27,7
@@
break;
case BCM6348_CPU_ID:
irq_stat_addr += PERF_IRQSTAT_6348_REG;
break;
case BCM6348_CPU_ID:
irq_stat_addr += PERF_IRQSTAT_6348_REG;
-@@ -4
13,7 +417
,8 @@ static int bcm63xx_external_irq_set_type
+@@ -4
34,7 +438
,8 @@ static int bcm63xx_external_irq_set_type
reg = bcm_perf_readl(regaddr);
irq %= 4;
reg = bcm_perf_readl(regaddr);
irq %= 4;
@@
-37,7
+37,7
@@
if (levelsense)
reg |= EXTIRQ_CFG_LEVELSENSE_6348(irq);
else
if (levelsense)
reg |= EXTIRQ_CFG_LEVELSENSE_6348(irq);
else
-@@ -4
26,9 +431
,12 @@ static int bcm63xx_external_irq_set_type
+@@ -4
47,9 +452
,12 @@ static int bcm63xx_external_irq_set_type
reg |= EXTIRQ_CFG_BOTHEDGE_6348(irq);
else
reg &= ~EXTIRQ_CFG_BOTHEDGE_6348(irq);
reg |= EXTIRQ_CFG_BOTHEDGE_6348(irq);
else
reg &= ~EXTIRQ_CFG_BOTHEDGE_6348(irq);
@@
-52,7
+52,7
@@
if (levelsense)
reg |= EXTIRQ_CFG_LEVELSENSE(irq);
else
if (levelsense)
reg |= EXTIRQ_CFG_LEVELSENSE(irq);
else
-@@ -4
41,6 +449
,9 @@ static int bcm63xx_external_irq_set_type
+@@ -4
62,6 +470
,9 @@ static int bcm63xx_external_irq_set_type
reg |= EXTIRQ_CFG_BOTHEDGE(irq);
else
reg &= ~EXTIRQ_CFG_BOTHEDGE(irq);
reg |= EXTIRQ_CFG_BOTHEDGE(irq);
else
reg &= ~EXTIRQ_CFG_BOTHEDGE(irq);
@@
-64,7
+64,7
@@
bcm_perf_writel(reg, regaddr);
--- a/arch/mips/bcm63xx/setup.c
+++ b/arch/mips/bcm63xx/setup.c
bcm_perf_writel(reg, regaddr);
--- a/arch/mips/bcm63xx/setup.c
+++ b/arch/mips/bcm63xx/setup.c
-@@ -7
1,6 +71
,9 @@ void bcm63xx_machine_reboot(void)
+@@ -7
4,6 +74
,9 @@ void bcm63xx_machine_reboot(void)
case BCM6338_CPU_ID:
perf_regs[0] = PERF_EXTIRQ_CFG_REG_6338;
break;
case BCM6338_CPU_ID:
perf_regs[0] = PERF_EXTIRQ_CFG_REG_6338;
break;
@@
-74,7
+74,7
@@
case BCM6348_CPU_ID:
perf_regs[0] = PERF_EXTIRQ_CFG_REG_6348;
break;
case BCM6348_CPU_ID:
perf_regs[0] = PERF_EXTIRQ_CFG_REG_6348;
break;
-@@ -8
0,6 +83
,9 @@ void bcm63xx_machine_reboot(void)
+@@ -8
3,6 +86
,9 @@ void bcm63xx_machine_reboot(void)
}
for (i = 0; i < 2; i++) {
}
for (i = 0; i < 2; i++) {
@@
-86,9
+86,9
@@
reg &= ~EXTIRQ_CFG_MASK_ALL_6348;
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
reg &= ~EXTIRQ_CFG_MASK_ALL_6348;
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-@@ -134,6 +134,7 @@
-
+@@ -161,6 +161,7 @@
/* External Interrupt Configuration register */
/* External Interrupt Configuration register */
+ #define PERF_EXTIRQ_CFG_REG_6328 0x18
#define PERF_EXTIRQ_CFG_REG_6338 0x14
+#define PERF_EXTIRQ_CFG_REG_6345 0x14
#define PERF_EXTIRQ_CFG_REG_6348 0x14
#define PERF_EXTIRQ_CFG_REG_6338 0x14
+#define PERF_EXTIRQ_CFG_REG_6345 0x14
#define PERF_EXTIRQ_CFG_REG_6348 0x14