* [PATCH 1/3] ARM: shmobile: armadillo: Add PWM backlight power supply
2013-12-24 6:04 [GIT PULL 0/3] Second Round of Renesas ARM based SoC Fixes for v3.13 Simon Horman
@ 2013-12-24 6:04 ` Simon Horman
2013-12-24 6:05 ` [PATCH 2/3] ARM: shmobile: bockw: fixup DMA mask Simon Horman
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2013-12-24 6:04 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Commit 22ceeee16eb8f0d04de3ef43a5174fb30ec18af9 ("pwm-backlight: Add
power supply support") added a mandatory power supply for the PWM
backlight. Add a fixed 5V regulator to board code with a consumer supply
entry for the backlight device.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit ad11cb9a5cf96346f1240995c672cdbb5501785c)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-armadillo800eva.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 958e3cb..c186891 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -614,6 +614,11 @@ static struct regulator_consumer_supply fixed3v3_power_consumers[] = {
REGULATOR_SUPPLY("vqmmc", "sh_mmcif"),
};
+/* Fixed 3.3V regulator used by LCD backlight */
+static struct regulator_consumer_supply fixed5v0_power_consumers[] = {
+ REGULATOR_SUPPLY("power", "pwm-backlight.0"),
+};
+
/* Fixed 3.3V regulator to be used by SDHI0 */
static struct regulator_consumer_supply vcc_sdhi0_consumers[] = {
REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
@@ -1196,6 +1201,8 @@ static void __init eva_init(void)
regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
+ regulator_register_always_on(3, "fixed-5.0V", fixed5v0_power_consumers,
+ ARRAY_SIZE(fixed5v0_power_consumers), 5000000);
pinctrl_register_mappings(eva_pinctrl_map, ARRAY_SIZE(eva_pinctrl_map));
pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup));
--
1.8.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] ARM: shmobile: bockw: fixup DMA mask
2013-12-24 6:04 [GIT PULL 0/3] Second Round of Renesas ARM based SoC Fixes for v3.13 Simon Horman
2013-12-24 6:04 ` [PATCH 1/3] ARM: shmobile: armadillo: Add PWM backlight power supply Simon Horman
@ 2013-12-24 6:05 ` Simon Horman
2013-12-24 6:05 ` [PATCH 3/3] ARM: shmobile: r8a7790: fix shdi resource sizes Simon Horman
2013-12-28 23:37 ` [GIT PULL 0/3] Second Round of Renesas ARM based SoC Fixes for v3.13 Olof Johansson
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2013-12-24 6:05 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
4dcfa60071b3d23f0181f27d8519f12e37cefbb9
(ARM: DMA-API: better handing of DMA masks for coherent allocations)
exchanged DMA mask check method.
Below warning will appear without this patch
asoc-simple-card asoc-simple-card.0: \
Coherent DMA mask 0xffffffffffffffff is larger than dma_addr_t allows
asoc-simple-card asoc-simple-card.0: \
Driver did not use or check the return value from dma_set_coherent_mask()?
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-bockw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index 3861152..3c4995a 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -679,7 +679,7 @@ static void __init bockw_init(void)
.id = i,
.data = &rsnd_card_info[i],
.size_data = sizeof(struct asoc_simple_card_info),
- .dma_mask = ~0,
+ .dma_mask = DMA_BIT_MASK(32),
};
platform_device_register_full(&cardinfo);
--
1.8.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] ARM: shmobile: r8a7790: fix shdi resource sizes
2013-12-24 6:04 [GIT PULL 0/3] Second Round of Renesas ARM based SoC Fixes for v3.13 Simon Horman
2013-12-24 6:04 ` [PATCH 1/3] ARM: shmobile: armadillo: Add PWM backlight power supply Simon Horman
2013-12-24 6:05 ` [PATCH 2/3] ARM: shmobile: bockw: fixup DMA mask Simon Horman
@ 2013-12-24 6:05 ` Simon Horman
2013-12-28 23:37 ` [GIT PULL 0/3] Second Round of Renesas ARM based SoC Fixes for v3.13 Olof Johansson
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2013-12-24 6:05 UTC (permalink / raw)
To: linux-arm-kernel
From: Ben Dooks <ben.dooks@codethink.co.uk>
The r8a7790.dtsi file has four sdhi nodes which the first two have the wrong
resource size for their register block. This causes the sh_modbile_sdhi driver
to fail to communicate with card at-all.
Change sdhi{0,1} node size from 0x100 to 0x200 to correct these nodes
as per Kuninori Morimoto's response to the original patch where all four
nodes where changed. sdhi{2,3} are the correct size.
This bug has been present since sdhi resources were added to the r8a7790 by
8c9b1aa41853272a ("ARM: shmobile: r8a7790: add MMCIF and SDHI DT
templates") in v3.11-rc2.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Tested-by: William Towle <william.towle@codethink.co.uk>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 46e1d7e..9987dd0e 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -241,7 +241,7 @@
sdhi0: sdhi at ee100000 {
compatible = "renesas,sdhi-r8a7790";
- reg = <0 0xee100000 0 0x100>;
+ reg = <0 0xee100000 0 0x200>;
interrupt-parent = <&gic>;
interrupts = <0 165 4>;
cap-sd-highspeed;
@@ -250,7 +250,7 @@
sdhi1: sdhi at ee120000 {
compatible = "renesas,sdhi-r8a7790";
- reg = <0 0xee120000 0 0x100>;
+ reg = <0 0xee120000 0 0x200>;
interrupt-parent = <&gic>;
interrupts = <0 166 4>;
cap-sd-highspeed;
--
1.8.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [GIT PULL 0/3] Second Round of Renesas ARM based SoC Fixes for v3.13
2013-12-24 6:04 [GIT PULL 0/3] Second Round of Renesas ARM based SoC Fixes for v3.13 Simon Horman
` (2 preceding siblings ...)
2013-12-24 6:05 ` [PATCH 3/3] ARM: shmobile: r8a7790: fix shdi resource sizes Simon Horman
@ 2013-12-28 23:37 ` Olof Johansson
3 siblings, 0 replies; 5+ messages in thread
From: Olof Johansson @ 2013-12-28 23:37 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Dec 24, 2013 at 03:04:43PM +0900, Simon Horman wrote:
> Hi Kevin, Hi Olof, Hi Arnd,
>
> please consider this second round of Renesas ARM based SoC fixes for v3.13.
> It is based on the first round of fixes, tagged as renesas-fixes-for-v3.13,
> which you have previously pulled.
>
>
> The following changes since commit 23de2278ebc3a2f971ce45ca5e5e35c9d5a74040:
>
> ARM: shmobile: r8a7790: Fix GPIO resources in DTS (2013-11-28 17:04:39 +0900)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes2-for-v3.13
>
> for you to fetch changes up to d721a15c300c5f638a11573a6dd492158e737d6a:
>
> ARM: shmobile: r8a7790: fix shdi resource sizes (2013-12-19 18:14:48 +0900)
Pulled, thanks.
-Olof
^ permalink raw reply [flat|nested] 5+ messages in thread