From f3f3f52259c1db74069295ad296ac1d53b080b45 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Fri, 9 Nov 2012 21:37:54 +0000 Subject: 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 SVN-Revision: 34132 --- target/linux/cns3xxx/patches-3.3/470-gpio_irq.patch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'target/linux/cns3xxx/patches-3.3/470-gpio_irq.patch') 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 cb80d64..fa40c5b 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 @@ -- cgit v1.1