* [PATCH 1/4] ARM: shmobile: armadillo800eva: Don't request GPIO 166 in board code
2013-07-31 1:33 [GIT 0/4] Second round of Renesas ARM based SoC fixes for v3.11 Simon Horman
@ 2013-07-31 1:33 ` Simon Horman
2013-07-31 1:33 ` [PATCH 2/4] shdma: fixup sh_dmae_get_partial() calculation error Simon Horman
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2013-07-31 1:33 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
89ae7b5bbd3e65bc6ab7a577ca5ec18569589c8c
(ARM: shmobile: armadillo800eva: Register pinctrl mapping for INTC)
mistakenly requests GPIO 166 in board code,
most probably due to a wrong merge conflict resolution.
As the GPIO is passed to the st1232 driver through platform
data and requested by the driver,
there's no need to request it in board code. Fix it.
Tested by: Cao Minh Hiep <cm-hiep@jinso.co.jp>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-armadillo800eva.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index e115f67..c5be60d 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -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 */
--
1.8.3.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] shdma: fixup sh_dmae_get_partial() calculation error
2013-07-31 1:33 [GIT 0/4] Second round of Renesas ARM based SoC fixes for v3.11 Simon Horman
2013-07-31 1:33 ` [PATCH 1/4] ARM: shmobile: armadillo800eva: Don't request GPIO 166 in board code Simon Horman
@ 2013-07-31 1:33 ` Simon Horman
2013-07-31 1:33 ` [PATCH 3/4] ARM: shmobile: BOCK-W: fix SDHI0 PFC settings Simon Horman
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2013-07-31 1:33 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
sh_desc->hw.tcr is controlling real data size,
and, register TCR is controlling data transfer count
which was xmit_shifted value of hw.tcr.
Current sh_dmae_get_partial() is calculating in different unit.
This patch fixes it.
This bug has been present since c014906a870ce70e009def0c9d170ccabeb0be63
("dmaengine: shdma: extend .device_terminate_all() to record partial
transfer"), which was added in 2.6.34-rc1.
Cc: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
drivers/dma/sh/shdma.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/sh/shdma.c b/drivers/dma/sh/shdma.c
index b67f45f..5039fbc 100644
--- a/drivers/dma/sh/shdma.c
+++ b/drivers/dma/sh/shdma.c
@@ -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 */
--
1.8.3.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] ARM: shmobile: BOCK-W: fix SDHI0 PFC settings
2013-07-31 1:33 [GIT 0/4] Second round of Renesas ARM based SoC fixes for v3.11 Simon Horman
2013-07-31 1:33 ` [PATCH 1/4] ARM: shmobile: armadillo800eva: Don't request GPIO 166 in board code Simon Horman
2013-07-31 1:33 ` [PATCH 2/4] shdma: fixup sh_dmae_get_partial() calculation error Simon Horman
@ 2013-07-31 1:33 ` Simon Horman
2013-07-31 1:33 ` [PATCH 4/4] ARM: shmobile: lager: do not annotate gpio_buttons as __initdata Simon Horman
2013-08-04 20:38 ` [GIT 0/4] Second round of Renesas ARM based SoC fixes for v3.11 Olof Johansson
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2013-07-31 1:33 UTC (permalink / raw)
To: linux-arm-kernel
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
The following message is printed on the BOCK-W kernel bootup:
sh-pfc pfc-r8a7778: invalid group "sdhi0" for function "sdhi0"
In addition, SD card cannot be detected. The reason is apparently that commit
ca7bb309485e4ec89a9addd47bea (ARM: shmobile: bockw: add SDHI0 support) matched
the previous version of commit 564617d2f92473031d035deb273da5 (sh-pfc: r8a7778:
add SDHI support).
Add the missing pin groups according to the BOCK-W board schematics.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-bockw.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index d555464..3354a85 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -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
--
1.8.3.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] ARM: shmobile: lager: do not annotate gpio_buttons as __initdata
2013-07-31 1:33 [GIT 0/4] Second round of Renesas ARM based SoC fixes for v3.11 Simon Horman
` (2 preceding siblings ...)
2013-07-31 1:33 ` [PATCH 3/4] ARM: shmobile: BOCK-W: fix SDHI0 PFC settings Simon Horman
@ 2013-07-31 1:33 ` Simon Horman
2013-08-04 20:38 ` [GIT 0/4] Second round of Renesas ARM based SoC fixes for v3.11 Olof Johansson
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2013-07-31 1:33 UTC (permalink / raw)
To: linux-arm-kernel
When the gpio-keys device is registered using
platform_device_register_data() the platform data argument,
lager_keys_pdata is duplicated and thus should be marked as __initdata
to avoid wasting memory. However, this is not true of gpio_buttons,
a reference to it rather than its value is duplicated when lager_keys_pdata
is duplicated.
This avoids accessing freed memory if gpio-key events occur
after unused kernel memory is freed late in the kernel's boot.
This but was added when support for gpio-keys was added to lager
in c3842e4fcbb7664276443b79187b7808c2e80a35
("ARM: shmobile: lager: support GPIO switches") which was included
in v3.11-rc1.
Tested-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-lager.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index d73e21d..8d6bd5c 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -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"),
--
1.8.3.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [GIT 0/4] Second round of Renesas ARM based SoC fixes for v3.11
2013-07-31 1:33 [GIT 0/4] Second round of Renesas ARM based SoC fixes for v3.11 Simon Horman
` (3 preceding siblings ...)
2013-07-31 1:33 ` [PATCH 4/4] ARM: shmobile: lager: do not annotate gpio_buttons as __initdata Simon Horman
@ 2013-08-04 20:38 ` Olof Johansson
4 siblings, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2013-08-04 20:38 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 31, 2013 at 10:33:44AM +0900, Simon Horman wrote:
> Hi Olof, Hi Arnd,
>
> please consider the following Renesas ARM based SoC fixes for v3.11.
>
> The following changes since commit ad81f0545ef01ea651886dddac4bef6cec930092:
>
> Linux 3.11-rc1 (2013-07-14 15:18:27 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes2-for-v3.11
>
> for you to fetch changes up to a601469386b543df2a4d97ad7d524716945278a3:
>
> ARM: shmobile: lager: do not annotate gpio_buttons as __initdata (2013-07-31 10:11:17 +0900)
>
> ----------------------------------------------------------------
> 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
Pulled, thanks for the excellent tag description.
-Olof
^ permalink raw reply [flat|nested] 6+ messages in thread