diff options
| author | John Crispin <john@openwrt.org> | 2015-02-13 07:38:27 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-02-13 07:38:27 +0000 |
| commit | 9b74de00f7b35427bbea34c5d59d6f05fc0e3a8f (patch) | |
| tree | d195a3dab5e103006253d85283b3bd4b21708e09 /target/linux/brcm2708/patches-3.18/0050-BCM2708-armctrl-Add-IRQ-Device-Tree-support.patch | |
| parent | 2dbcf5e91f4f9db57d618d801674c3792d4504e7 (diff) | |
| download | upstream-9b74de00f7b35427bbea34c5d59d6f05fc0e3a8f.tar.gz upstream-9b74de00f7b35427bbea34c5d59d6f05fc0e3a8f.tar.bz2 upstream-9b74de00f7b35427bbea34c5d59d6f05fc0e3a8f.zip | |
brcm2708: refresh patches
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
SVN-Revision: 44433
Diffstat (limited to 'target/linux/brcm2708/patches-3.18/0050-BCM2708-armctrl-Add-IRQ-Device-Tree-support.patch')
| -rw-r--r--[-rwxr-xr-x] | target/linux/brcm2708/patches-3.18/0050-BCM2708-armctrl-Add-IRQ-Device-Tree-support.patch | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/target/linux/brcm2708/patches-3.18/0050-BCM2708-armctrl-Add-IRQ-Device-Tree-support.patch b/target/linux/brcm2708/patches-3.18/0050-BCM2708-armctrl-Add-IRQ-Device-Tree-support.patch index 04d58fcd3d..f548d40712 100755..100644 --- a/target/linux/brcm2708/patches-3.18/0050-BCM2708-armctrl-Add-IRQ-Device-Tree-support.patch +++ b/target/linux/brcm2708/patches-3.18/0050-BCM2708-armctrl-Add-IRQ-Device-Tree-support.patch @@ -23,8 +23,6 @@ Signed-off-by: Noralf Tronnes <notro@tronnes.org> arch/arm/mach-bcm2708/armctrl.c | 96 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) -diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi -index 50da059..a06f5b8 100644 --- a/arch/arm/boot/dts/bcm2708.dtsi +++ b/arch/arm/boot/dts/bcm2708.dtsi @@ -4,6 +4,8 @@ @@ -50,8 +48,6 @@ index 50da059..a06f5b8 100644 }; clocks { -diff --git a/arch/arm/mach-bcm2708/armctrl.c b/arch/arm/mach-bcm2708/armctrl.c -index 96fa9b9..74bacb3 100644 --- a/arch/arm/mach-bcm2708/armctrl.c +++ b/arch/arm/mach-bcm2708/armctrl.c @@ -23,6 +23,8 @@ @@ -63,7 +59,7 @@ index 96fa9b9..74bacb3 100644 #include <asm/mach/irq.h> #include <mach/hardware.h> -@@ -79,6 +81,99 @@ static void armctrl_unmask_irq(struct irq_data *d) +@@ -79,6 +81,99 @@ static void armctrl_unmask_irq(struct ir } } @@ -163,13 +159,10 @@ index 96fa9b9..74bacb3 100644 #if defined(CONFIG_PM) /* for kernels 3.xx use the new syscore_ops apis but for older kernels use the sys dev class */ -@@ -215,5 +310,6 @@ int __init armctrl_init(void __iomem * base, unsigned int irq_start, +@@ -215,5 +310,6 @@ int __init armctrl_init(void __iomem * b armctrl_pm_register(base, irq_start, resume_sources); init_FIQ(FIQ_START); + armctrl_dt_init(); return 0; } --- -1.8.3.2 - |