Commit ca2480a9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-fixes2-for-v3.11' of... 

Merge tag 'renesas-fixes2-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes

From Simon Horman:
Second round of Renesas ARM based SoC fixes for v3.11

* Lager board: do not annotate gpio_buttons as __initdata
  - This avoids accessing uninitialised memory if keys are pressed
    after kernel initialisation completes.
  - Bug introduced in gpio-keys were enabled in v3.11-rc1

* Bock-W board: fix SDHI0 PFC settings
  - Allow detection of SD card
  - Bug introduced in SDHI support was added in v3.11-rc1

* shdma: fixup sh_dmae_get_partial() calculation error
  - Bug introduced in 2.6.34-rc1.

* armadillo800eva board: Don't request GPIO 166 in board code
  - Allow use of touchscreen
  - Bug introduced in v3.11-rc1

* tag 'renesas-fixes2-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: lager: do not annotate gpio_buttons as __initdata
  ARM: shmobile: BOCK-W: fix SDHI0 PFC settings
  shdma: fixup sh_dmae_get_partial() calculation error
  ARM: shmobile: armadillo800eva: Don't request GPIO 166 in board code

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 08d047a4 a6014693

arch/arm/mach-shmobile/board-armadillo800eva.c

+0 −3
Original line number Diff line number Diff line
@@ -1162,9 +1162,6 @@ static void __init eva_init(void) 
	gpio_request_one(61, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */

	gpio_request_one(202, GPIOF_OUT_INIT_LOW, NULL); /* LCD0_LED_CONT */



	/* Touchscreen */

	gpio_request_one(166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */



	/* GETHER */

	gpio_request_one(18, GPIOF_OUT_INIT_HIGH, NULL); /* PHY_RST */

arch/arm/mach-shmobile/board-bockw.c

+7 −1
Original line number Diff line number Diff line
@@ -167,7 +167,13 @@ static const struct pinctrl_map bockw_pinctrl_map[] = { 
				  "usb1", "usb1"),

	/* SDHI0 */

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",

				  "sdhi0", "sdhi0"),

				  "sdhi0_data4", "sdhi0"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",

				  "sdhi0_ctrl", "sdhi0"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",

				  "sdhi0_cd", "sdhi0"),

	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",

				  "sdhi0_wp", "sdhi0"),

};



#define FPGA	0x18200000

arch/arm/mach-shmobile/board-lager.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static __initdata struct gpio_led_platform_data lager_leds_pdata = { 
#define GPIO_KEY(c, g, d, ...) \

	{ .code = c, .gpio = g, .desc = d, .active_low = 1 }



static __initdata struct gpio_keys_button gpio_buttons[] = {

static struct gpio_keys_button gpio_buttons[] = {

	GPIO_KEY(KEY_4,		RCAR_GP_PIN(1, 28),	"SW2-pin4"),

	GPIO_KEY(KEY_3,		RCAR_GP_PIN(1, 26),	"SW2-pin3"),

	GPIO_KEY(KEY_2,		RCAR_GP_PIN(1, 24),	"SW2-pin2"),

drivers/dma/sh/shdma.c

+2 −2
Original line number Diff line number Diff line
@@ -400,8 +400,8 @@ static size_t sh_dmae_get_partial(struct shdma_chan *schan, 
						    shdma_chan);

	struct sh_dmae_desc *sh_desc = container_of(sdesc,

					struct sh_dmae_desc, shdma_desc);

	return (sh_desc->hw.tcr - sh_dmae_readl(sh_chan, TCR)) <<

		sh_chan->xmit_shift;

	return sh_desc->hw.tcr -

		(sh_dmae_readl(sh_chan, TCR) << sh_chan->xmit_shift);

}



/* Called from error IRQ or NMI */

CRA Git | Maintained and supported by SUSTech CRA and CCSE