From e1695307e6b85477afd2421d3b4891ca5bea8300 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Sat, 15 May 2010 11:25:35 +0100 Subject: [PATCH 01/15] ARM: 6135/1: mx21/devices: fix USBOTG resource It got a typo from 988addf82e4c03739375279de73929580a2d4a6a. Signed-off-by: Wolfram Sang Cc: Signed-off-by: Russell King --- arch/arm/mach-mx2/devices.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-mx2/devices.c b/arch/arm/mach-mx2/devices.c index b91e412f7b3e..04f36d820ca5 100644 --- a/arch/arm/mach-mx2/devices.c +++ b/arch/arm/mach-mx2/devices.c @@ -483,8 +483,8 @@ int __init mxc_register_gpios(void) #ifdef CONFIG_MACH_MX21 static struct resource mx21_usbhc_resources[] = { { - .start = MX21_BASE_ADDR, - .end = MX21_BASE_ADDR + 0x1FFF, + .start = MX21_USBOTG_BASE_ADDR, + .end = MX21_USBOTG_BASE_ADDR + SZ_8K - 1, .flags = IORESOURCE_MEM, }, { From a901ff715d53c109821cbbd9d7ea1f2a311646a9 Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Thu, 20 May 2010 08:33:38 +0100 Subject: [PATCH 02/15] ARM: 6139/1: ARMv7: Use the Inner Shareable I-cache on MP This patch fixes the flush_cache_all for ARMv7 SMP.It was missing from commit b8349b569aae661dea9d59d7d2ee587ccea3336c Signed-off-by: Santosh Shilimkar Acked-by: Catalin Marinas Cc: Signed-off-by: Russell King --- arch/arm/mm/cache-v7.S | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S index 06a90dcfc60a..37c8157e116e 100644 --- a/arch/arm/mm/cache-v7.S +++ b/arch/arm/mm/cache-v7.S @@ -91,7 +91,11 @@ ENTRY(v7_flush_kern_cache_all) THUMB( stmfd sp!, {r4-r7, r9-r11, lr} ) bl v7_flush_dcache_all mov r0, #0 +#ifdef CONFIG_SMP + mcr p15, 0, r0, c7, c1, 0 @ invalidate I-cache inner shareable +#else mcr p15, 0, r0, c7, c5, 0 @ I+BTB cache invalidate +#endif ARM( ldmfd sp!, {r4-r5, r7, r9-r11, lr} ) THUMB( ldmfd sp!, {r4-r7, r9-r11, lr} ) mov pc, lr From 3cde11c1b48735dc4108cffefccf4c1817c7bfd2 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 23 May 2010 10:36:15 +0100 Subject: [PATCH 03/15] ARM: Continue removing useless bootmem.h includes Catch those which have been missed by 6262c92f because they were submitted via other routes. Signed-off-by: Russell King --- arch/arm/mach-msm/board-msm7x27.c | 1 - arch/arm/mach-msm/board-msm7x30.c | 1 - arch/arm/mach-msm/board-qsd8x50.c | 1 - 3 files changed, 3 deletions(-) diff --git a/arch/arm/mach-msm/board-msm7x27.c b/arch/arm/mach-msm/board-msm7x27.c index cccb9f3c9d01..db9381b85bf0 100644 --- a/arch/arm/mach-msm/board-msm7x27.c +++ b/arch/arm/mach-msm/board-msm7x27.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c index bac1f3c38a3b..e32981928c77 100644 --- a/arch/arm/mach-msm/board-msm7x30.c +++ b/arch/arm/mach-msm/board-msm7x30.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c index ec4606643d2c..e3cc80792d6c 100644 --- a/arch/arm/mach-msm/board-qsd8x50.c +++ b/arch/arm/mach-msm/board-qsd8x50.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include From 3ff987801d0ab35794cc8a8142c14c2392a9a404 Mon Sep 17 00:00:00 2001 From: Huang Weiyi Date: Thu, 20 May 2010 07:11:58 +0800 Subject: [PATCH 04/15] ARM: SPEAR6xx: remove duplicated #include Remove duplicated #include('s) in arch/arm/mach-spear6xx/spear6xx.c Signed-off-by: Huang Weiyi Signed-off-by: Russell King --- arch/arm/mach-spear6xx/spear6xx.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/mach-spear6xx/spear6xx.c b/arch/arm/mach-spear6xx/spear6xx.c index b67e571d4bf7..baf6bcc3169c 100644 --- a/arch/arm/mach-spear6xx/spear6xx.c +++ b/arch/arm/mach-spear6xx/spear6xx.c @@ -13,7 +13,6 @@ #include #include -#include #include #include #include From c145211d1f9e2ef19e7b4c2b943f68366daa97af Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Sun, 23 May 2010 21:55:42 +0200 Subject: [PATCH 05/15] ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup arch/arm/boot/bootp/bootp.lds:22: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini Signed-off-by: Russell King --- arch/arm/boot/bootp/bootp.lds | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/bootp/bootp.lds b/arch/arm/boot/bootp/bootp.lds index 8e3d81ce695e..fc54394f4340 100644 --- a/arch/arm/boot/bootp/bootp.lds +++ b/arch/arm/boot/bootp/bootp.lds @@ -19,7 +19,7 @@ SECTIONS initrd_size = initrd_end - initrd_start; _etext = .; } - + .stab 0 : { *(.stab) } .stabstr 0 : { *(.stabstr) } .stab.excl 0 : { *(.stab.excl) } From a04dd9fd97e2179700c0f3391523ee8909d53b72 Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Sun, 23 May 2010 21:55:43 +0200 Subject: [PATCH 06/15] ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup arch/arm/mach-clps711x/Makefile.boot:2: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini Signed-off-by: Russell King --- arch/arm/mach-clps711x/Makefile.boot | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/mach-clps711x/Makefile.boot b/arch/arm/mach-clps711x/Makefile.boot index d3d29339e149..a51fcef64fe0 100644 --- a/arch/arm/mach-clps711x/Makefile.boot +++ b/arch/arm/mach-clps711x/Makefile.boot @@ -1,7 +1,6 @@ # The standard locations for stuff on CLPS711x type processors - zreladdr-y := 0xc0028000 + zreladdr-y := 0xc0028000 params_phys-y := 0xc0000100 # Should probably have some agreement on these... initrd_phys-$(CONFIG_ARCH_P720T) := 0xc0400000 initrd_phys-$(CONFIG_ARCH_CDB89712) := 0x00700000 - From 49b95e282608f2683ea5be46a581e819bce20f5f Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Sun, 23 May 2010 21:55:44 +0200 Subject: [PATCH 07/15] ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup arch/arm/mach-footbridge/ebsa285-pci.c:22: ERROR: switch and case should be at the same indent Signed-off-by: Andrea Gelmini Signed-off-by: Russell King --- arch/arm/mach-footbridge/ebsa285-pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-footbridge/ebsa285-pci.c b/arch/arm/mach-footbridge/ebsa285-pci.c index 720c0bac1702..e5ab5bddbc8c 100644 --- a/arch/arm/mach-footbridge/ebsa285-pci.c +++ b/arch/arm/mach-footbridge/ebsa285-pci.c @@ -20,9 +20,9 @@ static int __init ebsa285_map_irq(struct pci_dev *dev, u8 slot, u8 pin) if (dev->vendor == PCI_VENDOR_ID_CONTAQ && dev->device == PCI_DEVICE_ID_CONTAQ_82C693) switch (PCI_FUNC(dev->devfn)) { - case 1: return 14; - case 2: return 15; - case 3: return 12; + case 1: return 14; + case 2: return 15; + case 3: return 12; } return irqmap_ebsa285[(slot + pin) & 3]; From 9f1e0f25e2d5ad2e8ed096e75be756de8b1d4f93 Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Sun, 23 May 2010 21:55:45 +0200 Subject: [PATCH 08/15] ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup arch/arm/mach-h720x/common.h:17: WARNING: space prohibited between function name and open parenthesis '(' arch/arm/mach-h720x/common.h:23: WARNING: space prohibited between function name and open parenthesis '(' Signed-off-by: Andrea Gelmini Signed-off-by: Russell King --- arch/arm/mach-h720x/common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-h720x/common.h b/arch/arm/mach-h720x/common.h index d8798dbc44f8..7dd5fa604efc 100644 --- a/arch/arm/mach-h720x/common.h +++ b/arch/arm/mach-h720x/common.h @@ -14,13 +14,13 @@ */ extern unsigned long h720x_gettimeoffset(void); -extern void __init h720x_init_irq (void); +extern void __init h720x_init_irq(void); extern void __init h720x_map_io(void); #ifdef CONFIG_ARCH_H7202 extern struct sys_timer h7202_timer; extern void __init init_hw_h7202(void); -extern void __init h7202_init_irq (void); +extern void __init h7202_init_irq(void); extern void __init h7202_init_time(void); #endif From 9d0ff6d62462ecbe7a3188d97d8d08b87eaf0065 Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Sun, 23 May 2010 21:55:46 +0200 Subject: [PATCH 09/15] ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup arch/arm/mach-sa1100/leds.c:21: ERROR: code indent should use tabs where possible arch/arm/mach-sa1100/leds.c:21: WARNING: please, no space before tabs arch/arm/mach-sa1100/leds.c:22: ERROR: code indent should use tabs where possible arch/arm/mach-sa1100/leds.c:22: WARNING: please, no space before tabs arch/arm/mach-sa1100/leds.c:24: ERROR: code indent should use tabs where possible arch/arm/mach-sa1100/leds.c:24: WARNING: please, no space before tabs Signed-off-by: Andrea Gelmini Signed-off-by: Russell King --- arch/arm/mach-sa1100/leds.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-sa1100/leds.c b/arch/arm/mach-sa1100/leds.c index 4cf7c565aaed..bbfe197fb4d6 100644 --- a/arch/arm/mach-sa1100/leds.c +++ b/arch/arm/mach-sa1100/leds.c @@ -2,7 +2,7 @@ * linux/arch/arm/mach-sa1100/leds.c * * SA1100 LEDs dispatcher - * + * * Copyright (C) 2001 Nicolas Pitre */ #include @@ -18,10 +18,10 @@ sa1100_leds_init(void) { if (machine_is_assabet()) leds_event = assabet_leds_event; - if (machine_is_consus()) - leds_event = consus_leds_event; + if (machine_is_consus()) + leds_event = consus_leds_event; if (machine_is_badge4()) - leds_event = badge4_leds_event; + leds_event = badge4_leds_event; if (machine_is_brutus()) leds_event = brutus_leds_event; if (machine_is_cerf()) From 9ffdfb47d7c13130db111a59a9885547333322e7 Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Sun, 23 May 2010 21:55:48 +0200 Subject: [PATCH 10/15] ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup arch/arm/nwfpe/ChangeLog:75: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini Signed-off-by: Russell King --- arch/arm/nwfpe/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/nwfpe/ChangeLog b/arch/arm/nwfpe/ChangeLog index eeb5a7c5ff09..fa8028b1e1cf 100644 --- a/arch/arm/nwfpe/ChangeLog +++ b/arch/arm/nwfpe/ChangeLog @@ -72,7 +72,7 @@ 1998-11-23 Scott Bambrough * README.FPE - fix typo in description of lfm/sfm instructions - * NOTES - Added file to describe known bugs/problems + * NOTES - Added file to describe known bugs/problems * fpmodule.c - Changed version number to 0.94 1998-11-20 Scott Bambrough From ff4659c1a7b207391a132bc3d11d007160a45147 Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Sun, 23 May 2010 21:55:47 +0200 Subject: [PATCH 11/15] ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup arch/arm/mach-shark/pci.c:19: ERROR: trailing statements should be on next line arch/arm/mach-shark/pci.c:20: ERROR: trailing statements should be on next line arch/arm/mach-shark/pci.c:21: ERROR: trailing statements should be on next line arch/arm/mach-shark/pci.c:24: WARNING: externs should be avoided in .c files arch/arm/mach-shark/pci.c:28: WARNING: please, no space before tabs Signed-off-by: Andrea Gelmini Signed-off-by: Russell King --- arch/arm/mach-shark/pci.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-shark/pci.c b/arch/arm/mach-shark/pci.c index 37a7112d4117..89d175ce74d2 100644 --- a/arch/arm/mach-shark/pci.c +++ b/arch/arm/mach-shark/pci.c @@ -16,16 +16,19 @@ static int __init shark_map_irq(struct pci_dev *dev, u8 slot, u8 pin) { if (dev->bus->number == 0) - if (dev->devfn == 0) return 255; - else return 11; - else return 255; + if (dev->devfn == 0) + return 255; + else + return 11; + else + return 255; } extern void __init via82c505_preinit(void); static struct hw_pci shark_pci __initdata = { .setup = via82c505_setup, - .swizzle = pci_std_swizzle, + .swizzle = pci_std_swizzle, .map_irq = shark_map_irq, .nr_controllers = 1, .scan = via82c505_scan_bus, From 7b2e6a162447e217b0abe0710409c517d2b7c0b3 Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Sun, 23 May 2010 21:55:49 +0200 Subject: [PATCH 12/15] ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup arch/arm/nwfpe/fpsr.h:33: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini Signed-off-by: Russell King --- arch/arm/nwfpe/fpsr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/nwfpe/fpsr.h b/arch/arm/nwfpe/fpsr.h index 859b300d89fd..bd425dc13b61 100644 --- a/arch/arm/nwfpe/fpsr.h +++ b/arch/arm/nwfpe/fpsr.h @@ -30,7 +30,7 @@ one byte. EXCEPTION TRAP ENABLE BYTE SYSTEM CONTROL BYTE CUMULATIVE EXCEPTION FLAGS BYTE - + The FPCR is a 32 bit register consisting of bit flags. */ From becba8a3589fdbc364b6dc09e90f54e4d459d4cd Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Sun, 23 May 2010 22:09:58 +0200 Subject: [PATCH 13/15] ARM: mach-at91: duplicated include arch/arm/mach-at91/board-sam9m10g45ek.c: mach/hardware.h is included more than once Signed-off-by: Andrea Gelmini Signed-off-by: Russell King --- arch/arm/mach-at91/board-sam9m10g45ek.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c index 98f9f4bc9396..ee800595594d 100644 --- a/arch/arm/mach-at91/board-sam9m10g45ek.c +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c @@ -25,7 +25,6 @@ #include #include -#include #include