Commit 2989950c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC Non-critical bug fixes from Olof Johansson:
 "Simple bug fixes that were not considered important enough for
  inclusion into 3.7, especially those that arrived late during the
  merge window.

  There's also a MAINTAINERS update for the Renesas platforms in here,
  marking Simon Horman as a maintainer and changing the git url to his
  tree."

* tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  Update ARM/SHMOBILE section of MAINTAINERS
  ARM: Fix Kconfig symbols typo for LEDS
  ARM: pxa: add dummy SA1100 rtc clock in pxa25x
  ARM: pxa: fix pxa25x gpio wakeup setting
  ARM: OMAP4: PM: fix errata handling when CONFIG_PM=n
  ARM: cns3xxx: drop unnecessary symbol selection
  ARM: vexpress: fix ll debug code when building multiplatform
  ARM: OMAP4: retrigger localtimers after re-enabling gic
  ARM: OMAP4460: Workaround for ROM bug because of CA9 r2pX GIC control register change.
  ARM: OMAP4: PM: add errata support
  ARM: davinci: fix return value check by using IS_ERR in tnetv107x_devices_init()
  ARM: davinci: uncompress.h: bail out if uart not initialized
  ARM: davinci: serial.h: fix uart number in the comment
  ARM: davinci: dm644x evm: move pointer dereference below NULL check
  ARM: vexpress: Make the debug UART detection more specific
parents b1286f4e 0a9995e4

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1130,12 +1130,12 @@ S: Maintained 
F:	drivers/media/platform/s5p-tv/



ARM/SHMOBILE ARM ARCHITECTURE

M:	Paul Mundt <lethal@linux-sh.org>

M:	Simon Horman <horms@verge.net.au>

M:	Magnus Damm <magnus.damm@gmail.com>

L:	linux-sh@vger.kernel.org

W:	http://oss.renesas.com

Q:	http://patchwork.kernel.org/project/linux-sh/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-latest

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next

S:	Supported

F:	arch/arm/mach-shmobile/

F:	drivers/sh/

arch/arm/include/debug/vexpress.S

+7 −4
Original line number Diff line number Diff line
@@ -21,14 +21,17 @@ 
#if defined(CONFIG_DEBUG_VEXPRESS_UART0_DETECT)



		.macro	addruart,rp,rv,tmp

		.arch   armv7-a



		@ Make an educated guess regarding the memory map:

		@ - the original A9 core tile, which has MPCore peripherals

		@   located at 0x1e000000, should use UART at 0x10009000

		@ - the original A9 core tile (based on ARM Cortex-A9 r0p1)

		@   should use UART at 0x10009000

		@ - all other (RS1 complaint) tiles use UART mapped

		@   at 0x1c090000

		mrc	p15, 4, \tmp, c15, c0, 0

		cmp	\tmp, #0x1e000000

		mrc	p15, 0, \rp, c0, c0, 0

		movw	\rv, #0xc091

		movt	\rv, #0x410f

		cmp	\rp, \rv



		@ Original memory map

		moveq	\rp, #DEBUG_LL_UART_OFFSET

arch/arm/mach-cns3xxx/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ menu "CNS3XXX platform type" 


config MACH_CNS3420VB

	bool "Support for CNS3420 Validation Board"

	select MIGHT_HAVE_PCI

	help

	  Include support for the Cavium Networks CNS3420 MPCore Platform

	  Baseboard.

arch/arm/mach-davinci/board-dm644x-evm.c

+3 −2
Original line number Diff line number Diff line
@@ -519,13 +519,11 @@ static int dm6444evm_msp430_get_pins(void) 
	char buf[4];

	struct i2c_msg msg[2] = {

		{

			.addr = dm6446evm_msp->addr,

			.flags = 0,

			.len = 2,

			.buf = (void __force *)txbuf,

		},

		{

			.addr = dm6446evm_msp->addr,

			.flags = I2C_M_RD,

			.len = 4,

			.buf = buf,
@@ -536,6 +534,9 @@ static int dm6444evm_msp430_get_pins(void) 
	if (!dm6446evm_msp)

		return -ENXIO;



	msg[0].addr = dm6446evm_msp->addr;

	msg[1].addr = dm6446evm_msp->addr;



	/* Command 4 == get input state, returns port 2 and port3 data

	 *   S Addr W [A] len=2 [A] cmd=4 [A]

	 *   RS Addr R [A] [len=4] A [cmd=4] A [port2] A [port3] N P

arch/arm/mach-davinci/devices-tnetv107x.c

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ void __init tnetv107x_devices_init(struct tnetv107x_device_info *info) 
	 * complete sample conversion in time.

	 */

	tsc_clk = clk_get(NULL, "sys_tsc_clk");

	if (tsc_clk) {

	if (!IS_ERR(tsc_clk)) {

		error = clk_set_rate(tsc_clk, 5000000);

		WARN_ON(error < 0);

		clk_put(tsc_clk);

CRA Git | Maintained and supported by SUSTech CRA and CCSE