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

Commit 85eb1513 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (65 commits)
  ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support
  ARM: 6838/1: etm: fix section mismatch warning
  ARM: 6837/1: remove unused pci_fixup_prpmc1100
  ARM: 6836/1: kprobes/fix emulation of LDR/STR instruction when Rn == PC
  Fix the broken build for Marvell Dove platform.
  ARM: 6835/1: perf: ensure overflows aren't missed due to IRQ latency
  ARM: 6834/1: perf: reset counters on all CPUs during initialisation
  ARM: 6833/1: perf: add required isbs() to ARMv7 backend
  ARM: 6825/1: kernel/sleep.S: fix Thumb2 compilation issues
  ARM: 6807/1: realview: Fix secondary GIC initialisation for EB with MPCore tile
  arm: mach-mx3: pcm043: add write-protect and card-detect for SD1
  eukrea_mbimxsd51: add SD Card detect
  eukrea_mbimxsd25-baseboard: add SD card detect
  mx3/eukrea_mbimxsd-baseboard: add SD card detect support
  mx3/eukrea_mbimxsd-baseboard: fix gpio request
  ARM: mxs/mx28evk: add mmc device
  ARM: mxs/mx23evk: add mmc device
  ARM: mxs: dynamically allocate mmc device
  ARM: mx51_efika: update platform data for new mfd changes
  mx2/iomux: Set direction for CSPI2 pins
  ...
parents e122996a b43d151e

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ config ARCH_MXC 
	select GENERIC_CLOCKEVENTS

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select HAVE_SCHED_CLOCK

	help

	  Support for Freescale MXC/iMX-based family of processors

arch/arm/boot/compressed/head.S

+1 −9
Original line number Diff line number Diff line
@@ -21,20 +21,12 @@ 


#if defined(CONFIG_DEBUG_ICEDCC)



#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K)

#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7)

		.macro	loadsp, rb, tmp

		.endm

		.macro	writeb, ch, rb

		mcr	p14, 0, \ch, c0, c5, 0

		.endm

#elif defined(CONFIG_CPU_V7)

		.macro	loadsp, rb, tmp

		.endm

		.macro	writeb, ch, rb

wait:		mrc	p14, 0, pc, c0, c1, 0

		bcs	wait

		mcr	p14, 0, \ch, c0, c5, 0

		.endm

#elif defined(CONFIG_CPU_XSCALE)

		.macro	loadsp, rb, tmp

		.endm

arch/arm/boot/compressed/misc.c

+1 −11
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ extern void error(char *x); 


#ifdef CONFIG_DEBUG_ICEDCC



#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K)

#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7)



static void icedcc_putc(int ch)

{
@@ -52,16 +52,6 @@ static void icedcc_putc(int ch) 
	asm("mcr p14, 0, %0, c0, c5, 0" : : "r" (ch));

}



#elif defined(CONFIG_CPU_V7)



static void icedcc_putc(int ch)

{

	asm(

	"wait:	mrc	p14, 0, pc, c0, c1, 0			\n\

		bcs	wait					\n\

		mcr     p14, 0, %0, c0, c5, 0			"

	: : "r" (ch));

}



#elif defined(CONFIG_CPU_XSCALE)

arch/arm/include/asm/mach/udc_pxa2xx.h

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ struct pxa2xx_udc_mach_info { 
	 * VBUS IRQ and omit the methods above.  Store the GPIO number

	 * here.  Note that sometimes the signals go through inverters...

	 */

	bool	gpio_vbus_inverted;

	int	gpio_vbus;			/* high == vbus present */

	bool	gpio_pullup_inverted;

	int	gpio_pullup;			/* high == pullup activated */

};

arch/arm/kernel/debug.S

+1 −18
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
		.macro	addruart, rp, rv

		.endm



#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K)

#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7)



		.macro	senduart, rd, rx

		mcr	p14, 0, \rd, c0, c5, 0
@@ -49,23 +49,6 @@ 
1002:

		.endm



#elif defined(CONFIG_CPU_V7)



		.macro	senduart, rd, rx

		mcr	p14, 0, \rd, c0, c5, 0

		.endm



		.macro	busyuart, rd, rx

busy:		mrc	p14, 0, pc, c0, c1, 0

		bcs	busy

		.endm



		.macro	waituart, rd, rx

wait:		mrc	p14, 0, pc, c0, c1, 0

		bcs	wait



		.endm



#elif defined(CONFIG_CPU_XSCALE)



		.macro	senduart, rd, rx