diff options
| author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-11-09 21:37:54 +0000 |
|---|---|---|
| committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-11-09 21:37:54 +0000 |
| commit | 42fc31c3969f22ab2eb9ccea31338a6fd11e836e (patch) | |
| tree | 87ee73c0fb13566e648c8ba3bc71d05f05e0fec0 /target/linux/cns3xxx/patches-3.3/470-gpio_irq.patch | |
| parent | 50d37a89fe99a2aa1ced3737ded240412ad2b599 (diff) | |
cns3xxx: clean up pcie patches
Combine two pcie patches (2nd patch undid the 1st patch) together
and refresh the other affected patches
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34132 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/cns3xxx/patches-3.3/470-gpio_irq.patch')
| -rw-r--r-- | target/linux/cns3xxx/patches-3.3/470-gpio_irq.patch | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/cns3xxx/patches-3.3/470-gpio_irq.patch b/target/linux/cns3xxx/patches-3.3/470-gpio_irq.patch index cb80d6419..fa40c5ba4 100644 --- a/target/linux/cns3xxx/patches-3.3/470-gpio_irq.patch +++ b/target/linux/cns3xxx/patches-3.3/470-gpio_irq.patch @@ -8,18 +8,17 @@ obj-$(CONFIG_MACH_GW2388) += laguna.o --- a/arch/arm/mach-cns3xxx/cns3420vb.c +++ b/arch/arm/mach-cns3xxx/cns3420vb.c -@@ -199,7 +199,10 @@ static void __init cns3420_init(void) +@@ -198,6 +198,10 @@ static void __init cns3420_init(void) cns3xxx_ahci_init(); cns3xxx_sdhci_init(); -- + cns3xxx_gpio_init( 0, 32, CNS3XXX_GPIOA_BASE_VIRT, IRQ_CNS3XXX_GPIOA, + NR_IRQS_CNS3XXX); + cns3xxx_gpio_init(32, 32, CNS3XXX_GPIOB_BASE_VIRT, IRQ_CNS3XXX_GPIOB, + NR_IRQS_CNS3XXX + 32); - cns3xxx_pcie_init(0x3); pm_power_off = cns3xxx_power_off; + } --- a/arch/arm/mach-cns3xxx/core.c +++ b/arch/arm/mach-cns3xxx/core.c @@ -21,7 +21,6 @@ |