From 5048bcba4d27d975593ef5c55f217aafe015ec3b Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 23 Jul 2007 12:59:46 +0100 Subject: [ARM] setup_profiling_timer must not be __init It's called by writes to /proc/profile, so it must not be marked __init Signed-off-by: Russell King --- arch/arm/kernel/smp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 1b76d87fa33..9746e529324 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -630,7 +630,7 @@ void smp_send_stop(void) /* * not supported here */ -int __init setup_profiling_timer(unsigned int multiplier) +int setup_profiling_timer(unsigned int multiplier) { return -EINVAL; } -- cgit From 981d0f3952c977d799c2bb72e083cb9306ccb797 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Tue, 24 Jul 2007 01:22:43 +0100 Subject: [ARM] 4526/1: pxa: make ARCH_PXA select GENERIC_CLOCKEVENTS make ARCH_PXA select GENERIC_CLOCKEVENTS to fix the building issue due to merge of clockevents based PXA timer Signed-off-by: eric miao Signed-off-by: Russell King --- arch/arm/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 85016313bd1..c8569e862c6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -341,6 +341,7 @@ config ARCH_PXA select ARCH_MTD_XIP select GENERIC_GPIO select GENERIC_TIME + select GENERIC_CLOCKEVENTS help Support for Intel's PXA2XX processor line. -- cgit From a14ff99232f449e5f9e440757a9049be3fd9e23a Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 26 Jul 2007 14:54:47 +0100 Subject: [ARM] Remove CONFIG_IGNORE_FIQ IGNORE_FIQ does not appear in the Kconfig files, so can be removed. Signed-off-by: Russell King --- arch/arm/kernel/traps.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index f2114bcf09d..8ad47619c07 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -352,10 +352,8 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs) asmlinkage void do_unexp_fiq (struct pt_regs *regs) { -#ifndef CONFIG_IGNORE_FIQ printk("Hmm. Unexpected FIQ received, but trying to continue\n"); printk("You may have a hardware problem...\n"); -#endif } /* -- cgit From 219e3dcd1dd34d5b9b663977136877dcb393626a Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Thu, 26 Jul 2007 07:41:12 +0100 Subject: [ARM] 4528/1: [HP Jornada 7XX] - Fix typo in jornada720_ssp.c Fixes TxDummy -> TXDUMMY typo. Makes Jornada720_ssp.c compile nicely again. Signed-off-by: Kristoffer Ericson Signed-off-by: Russell King --- arch/arm/mach-sa1100/jornada720_ssp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-sa1100/jornada720_ssp.c b/arch/arm/mach-sa1100/jornada720_ssp.c index 0a45e1ac8ad..395c39bed7d 100644 --- a/arch/arm/mach-sa1100/jornada720_ssp.c +++ b/arch/arm/mach-sa1100/jornada720_ssp.c @@ -161,7 +161,7 @@ static int __init jornada_ssp_probe(struct platform_device *dev) ret = jornada_ssp_inout(GETBRIGHTNESS); /* seems like it worked, just feed it with TxDummy to get rid of data */ - if (ret == TxDummy) + if (ret == TXDUMMY) jornada_ssp_inout(TXDUMMY); jornada_ssp_end(); -- cgit From cc46f659705c722ae6020dd7411c4ac39cec4408 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Thu, 26 Jul 2007 07:46:17 +0100 Subject: [ARM] 4529/1: [HP Jornada 7XX] - Fix jornada720.c to use SSP driver This fixes the jornada720.c file : * ifdef for CONFIG_SA1100_JORNADA720_SSP since we dont want to include anything not selected in menyconfig. * add documentation for init for future reference * change platform driver name from jornada720_mcu -> jornada_ssp. * change maintainer in file. Signed-off-by: Kristoffer Ericson Signed-off-by: Russell King --- arch/arm/mach-sa1100/jornada720.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c index 64067cd58d3..52ac37d1e23 100644 --- a/arch/arm/mach-sa1100/jornada720.c +++ b/arch/arm/mach-sa1100/jornada720.c @@ -3,6 +3,7 @@ * * HP Jornada720 init code * + * Copyright (C) 2007 Kristoffer Ericson * Copyright (C) 2006 Filip Zyzniewski * Copyright (C) 2005 Michael Gernoth * @@ -220,14 +221,16 @@ static struct platform_device sa1111_device = { .resource = sa1111_resources, }; -static struct platform_device jornada720_mcu_device = { - .name = "jornada720_mcu", - .id = -1, +static struct platform_device jornada_ssp_device = { + .name = "jornada_ssp", + .id = -1, }; static struct platform_device *devices[] __initdata = { &sa1111_device, - &jornada720_mcu_device, +#ifdef CONFIG_SA1100_JORNADA720_SSP + &jornada_ssp_device, +#endif &s1d13xxxfb_device, }; @@ -236,19 +239,19 @@ static int __init jornada720_init(void) int ret = -ENODEV; if (machine_is_jornada720()) { - GPDR |= GPIO_GPIO20; - /* oscillator setup (line 116 of HP's doc) */ + /* we want to use gpio20 as input to drive the clock of our uart 3 */ + GPDR |= GPIO_GPIO20; /* Clear gpio20 pin as input */ TUCR = TUCR_VAL; - /* resetting SA1111 (line 118 of HP's doc) */ - GPSR = GPIO_GPIO20; + GPSR = GPIO_GPIO20; /* start gpio20 pin */ udelay(1); - GPCR = GPIO_GPIO20; + GPCR = GPIO_GPIO20; /* stop gpio20 */ udelay(1); - GPSR = GPIO_GPIO20; - udelay(20); + GPSR = GPIO_GPIO20; /* restart gpio20 */ + udelay(20); /* give it some time to restart */ ret = platform_add_devices(devices, ARRAY_SIZE(devices)); } + return ret; } @@ -345,7 +348,7 @@ static void __init jornada720_mach_init(void) } MACHINE_START(JORNADA720, "HP Jornada 720") - /* Maintainer: Michael Gernoth */ + /* Maintainer: Kristoffer Ericson */ .phys_io = 0x80000000, .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, .boot_params = 0xc0000100, -- cgit From 03e5386e1e6e4f19c18c33fb69afd43054d448b2 Mon Sep 17 00:00:00 2001 From: Quinn Jensen Date: Fri, 27 Jul 2007 23:30:55 +0100 Subject: [ARM] 4530/1: MXC: fix elf_hwcap compile breakage as in iop13xx MXC needs the same change as IOP. See [ARM] 4494/1 or commit 7dea1b20066cd30fb54da7e686b16b5e38b46b2d An undefined reference to elf_hwcap prevents linkage, due to changes made by f884b1cf578e079f01682514ae1ae64c74586602 and d1cbbd6b413510c6512f4f80ffd48db1a8dd554a Removing processor.h removes the extern definition of elf_hwcap, which fixes the link issue, but forgets cpu_relax(). So, instead, we'll call barrier() directly. Cc: Lennert Buytenhek Cc: Catalin Marinas Acked-by: Ross Wille Signed-off-by: Quinn Jensen Signed-off-by: Russell King --- include/asm-arm/arch-mxc/uncompress.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/asm-arm/arch-mxc/uncompress.h b/include/asm-arm/arch-mxc/uncompress.h index ec5787d0e78..42cc0cb3fef 100644 --- a/include/asm-arm/arch-mxc/uncompress.h +++ b/include/asm-arm/arch-mxc/uncompress.h @@ -26,7 +26,6 @@ #define __MXC_BOOT_UNCOMPRESS #include -#include #define UART(x) (*(volatile unsigned long *)(serial_port + (x))) @@ -62,7 +61,7 @@ static void putc(int ch) } while (!(UART(USR2) & USR2_TXFE)) - cpu_relax(); + barrier(); UART(TXR) = ch; } -- cgit From 0a9c2df263b2ef487e6b4015644cc18012d7411b Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Thu, 26 Jul 2007 02:01:04 +0100 Subject: [ARM] 4527/1: pxa: fix pxa27x ac97 cold reset in ASoC due to CKEN change due to CKEN_xxx definition and pxa_set_cken() change, the pxa27x ac97 cold reset is broken in ASoC, fixed to use bit index instead of bit mask Signed-off-by: eric miao Signed-off-by: Russell King --- sound/soc/pxa/pxa2xx-ac97.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 129d851b315..dd14abcdf1b 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -160,9 +160,9 @@ static void pxa2xx_ac97_cold_reset(struct snd_ac97 *ac97) gsr_bits = 0; #ifdef CONFIG_PXA27x /* PXA27x Developers Manual section 13.5.2.2.1 */ - pxa_set_cken(1 << 31, 1); + pxa_set_cken(31, 1); udelay(5); - pxa_set_cken(1 << 31, 0); + pxa_set_cken(31, 0); GCR = GCR_COLD_RST; udelay(50); #else -- cgit