Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 342345
b: refs/heads/master
c: f9e7592
h: refs/heads/master
i:
  342343: f52ec74
v: v3
  • Loading branch information
Andrew Lunn authored and Jason Cooper committed Nov 24, 2012
1 parent 2362112 commit abc9170
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 49e928d6cfd4a27f2b2e0ea6cdcb9e853360a9a1
refs/heads/master: f9e7592230b72acb703e6c29691d587341b6c710
2 changes: 2 additions & 0 deletions trunk/arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,8 @@ config ARCH_KIRKWOOD
select CPU_FEROCEON
select GENERIC_CLOCKEVENTS
select PCI
select PINCTRL
select PINCTRL_KIRKWOOD
select PLAT_ORION_LEGACY
help
Support for the following Marvell Kirkwood series SoCs:
Expand Down
10 changes: 8 additions & 2 deletions trunk/arch/arm/boot/dts/kirkwood.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
compatible = "marvell,kirkwood";
interrupt-parent = <&intc>;

aliases {
gpio0 = &gpio0;
gpio1 = &gpio1;
};
intc: interrupt-controller {
compatible = "marvell,orion-intc", "marvell,intc";
interrupt-controller;
Expand All @@ -24,7 +28,8 @@
#gpio-cells = <2>;
gpio-controller;
reg = <0x10100 0x40>;
ngpio = <32>;
ngpios = <32>;
interrupt-controller;
interrupts = <35>, <36>, <37>, <38>;
};

Expand All @@ -33,7 +38,8 @@
#gpio-cells = <2>;
gpio-controller;
reg = <0x10140 0x40>;
ngpio = <18>;
ngpios = <18>;
interrupt-controller;
interrupts = <39>, <40>, <41>;
};

Expand Down
6 changes: 1 addition & 5 deletions trunk/arch/arm/plat-orion/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr)
static int __init orion_add_irq_domain(struct device_node *np,
struct device_node *interrupt_parent)
{
int i = 0, irq_gpio;
int i = 0;
void __iomem *base;

do {
Expand All @@ -54,10 +54,6 @@ static int __init orion_add_irq_domain(struct device_node *np,

irq_domain_add_legacy(np, i * 32, 0, 0,
&irq_domain_simple_ops, NULL);

irq_gpio = i * 32;
orion_gpio_of_init(irq_gpio);

return 0;
}

Expand Down

0 comments on commit abc9170

Please sign in to comment.