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

Commit 4cff6123 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge tag 'renesas-fixes2-for-v3.13' 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.13

* r8a7790 (R-Car H2) based Lager board
  - Correct SHDI resource sizes
    This bug has been present since sdhi resources were added to the r8a7790 by
    8c9b1aa4 ("ARM: shmobile: r8a7790: add MMCIF and SDHI DT
    templates") in v3.11-rc2.

* r8a7778 (R-Car M1) based Bock-W board
  - Correct DMA mask
    This resolves a regression introduced by 4dcfa600
    ("ARM: DMA-API: better handing of DMA masks for coherent allocations")
    in v3.12-rc1.

* r8a7740 (R-Mobile A1) based Armadillo board
  - Add PWM backlight power supply
    This resolves a regression introduced by 22ceeee1
    ("pwm-backlight: Add power supply support") in v3.12.

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

:
  ARM: shmobile: r8a7790: fix shdi resource sizes
  ARM: shmobile: bockw: fixup DMA mask
  ARM: shmobile: armadillo: Add PWM backlight power supply

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9928422f d721a15c

arch/arm/boot/dts/r8a7790.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ 


	sdhi0: sdhi@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@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;

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

+7 −0
Original line number Diff line number Diff line
@@ -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));

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

+1 −1
Original line number Diff line number Diff line
@@ -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);