Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a488979 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

ARM: fixes for ARM platforms

Some fallout from the 3.3. merge window as well as a couple bug fixes
for older preexisting bugs that seem valid to include at this time:

* sched_clock changes broke picoxcell, fix included
* BSYM bugs causing issues with thumb2-built kernels on SMP
* Missing module.h include on msm.
* A collection of bugfixes for samsung platforms that didn't make it into
  the first pull requests.

* tag 'arm-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: make BSYM macro assembly only
  ARM: highbank: remove incorrect BSYM usage
  ARM: imx: remove incorrect BSYM usage
  ARM: exynos: remove incorrect BSYM usage
  ARM: ux500: add missing ENDPROC to headsmp.S
  ARM: msm: Add missing ENDPROC to headsmp.S
  ARM: versatile: Add missing ENDPROC to headsmp.S
  ARM: EXYNOS: Invert VCLK polarity for framebuffer on ORIGEN
  ARM: S3C64XX: Fix interrupt configuration for PCA935x on Cragganmore
  ARM: S3C64XX: Fix the memory mapped GPIOs on Cragganmore
  ARM: S3C64XX: Remove hsmmc1 from Cragganmore
  ARM: S3C64XX: Remove unconditional power domain disables
  ARM: SAMSUNG: Declare struct platform_device in plat/s3c64xx-spi.h
  ARM: SAMSUNG: dma-ops.h needs mach/dma.h
  ARM: SAMSUNG: Guard against multiple inclusion of plat/dma.h
  ARM: picoxcell: fix sched_clock() cleanup fallout
  ARM: msm: vreg is a module and so needs module.h
parents 57f2685c 090e648a

arch/arm/include/asm/unified.h

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ 
#define THUMB(x...)	x

#ifdef __ASSEMBLY__

#define W(instr)	instr.w

#endif

#define BSYM(sym)	sym + 1

#endif



#else	/* !CONFIG_THUMB2_KERNEL */
@@ -49,8 +49,8 @@ 
#define THUMB(x...)

#ifdef __ASSEMBLY__

#define W(instr)	instr

#endif

#define BSYM(sym)	sym

#endif



#endif	/* CONFIG_THUMB2_KERNEL */

arch/arm/mach-exynos/headsmp.S

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ pen: ldr r7, [r6] 
	 * should now contain the SVC stack for this core

	 */

	b	secondary_startup

ENDPROC(exynos4_secondary_startup)



	.align 2

1:	.long	.

	.long	pen_release

arch/arm/mach-exynos/mach-origen.c

+2 −1
Original line number Diff line number Diff line
@@ -597,7 +597,8 @@ static struct s3c_fb_pd_win origen_fb_win0 = { 
static struct s3c_fb_platdata origen_lcd_pdata __initdata = {

	.win[0]		= &origen_fb_win0,

	.vidcon0	= VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,

	.vidcon1	= VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,

	.vidcon1	= VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC |

				VIDCON1_INV_VCLK,

	.setup_gpio	= exynos4_fimd0_gpio_setup_24bpp,

};

arch/arm/mach-exynos/platsmp.c

+2 −3
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <asm/cacheflush.h>

#include <asm/hardware/gic.h>

#include <asm/smp_scu.h>

#include <asm/unified.h>



#include <mach/hardware.h>

#include <mach/regs-clock.h>
@@ -137,7 +136,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) 
	while (time_before(jiffies, timeout)) {

		smp_rmb();



		__raw_writel(BSYM(virt_to_phys(exynos4_secondary_startup)),

		__raw_writel(virt_to_phys(exynos4_secondary_startup),

			CPU1_BOOT_REG);

		gic_raise_softirq(cpumask_of(cpu), 1);
@@ -192,6 +191,6 @@ void __init platform_smp_prepare_cpus(unsigned int max_cpus) 
	 * until it receives a soft interrupt, and then the

	 * secondary CPU branches to this address.

	 */

	__raw_writel(BSYM(virt_to_phys(exynos4_secondary_startup)),

	__raw_writel(virt_to_phys(exynos4_secondary_startup),

			CPU1_BOOT_REG);

}

arch/arm/mach-highbank/highbank.c

+1 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/smp.h>



#include <asm/cacheflush.h>

#include <asm/unified.h>

#include <asm/smp_scu.h>

#include <asm/hardware/arm_timer.h>

#include <asm/hardware/timer-sp.h>
@@ -76,7 +75,7 @@ void highbank_set_cpu_jump(int cpu, void *jump_addr) 
#ifdef CONFIG_SMP

	cpu = cpu_logical_map(cpu);

#endif

	writel(BSYM(virt_to_phys(jump_addr)), HB_JUMP_TABLE_VIRT(cpu));

	writel(virt_to_phys(jump_addr), HB_JUMP_TABLE_VIRT(cpu));

	__cpuc_flush_dcache_area(HB_JUMP_TABLE_VIRT(cpu), 16);

	outer_clean_range(HB_JUMP_TABLE_PHYS(cpu),

			  HB_JUMP_TABLE_PHYS(cpu) + 15);