diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2012-11-09 21:37:54 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2012-11-09 21:37:54 +0000 |
| commit | f3f3f52259c1db74069295ad296ac1d53b080b45 (patch) | |
| tree | 74aec692086c606fa5b276a13e2cef64b86eeb04 /target/linux/cns3xxx/patches-3.3/470-gpio_irq.patch | |
| parent | 71ddec8091c215661ef3934fc93eb497b6cc2985 (diff) | |
| download | upstream-f3f3f52259c1db74069295ad296ac1d53b080b45.tar.gz upstream-f3f3f52259c1db74069295ad296ac1d53b080b45.tar.bz2 upstream-f3f3f52259c1db74069295ad296ac1d53b080b45.zip | |
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>
SVN-Revision: 34132
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 cb80d6419b..fa40c5ba4e 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 @@ |