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

Commit 6e1ae422 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-fixes-for-v3.15' of... 

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

Renesas ARM Based SoC Fixes Updates for v3.15

r8a7791 (R-Car M2) based koelsch board
* Correct renesas,gpios to renesas,groups in sd[012] pfc

8a7790 (R-Car H2) based lager board
* Correct SND_SOC_DAIFMT_CBx_CFx flags

r8a7740 (R-Mobile A1) SoC
* Drop address cells from GIC node

r8a7740 (R-Mobile A1) based Armadillo800 EVA board
* Correct SND_SOC_DAIFMT_CBx_CFx flags

sh73a0 (SH-Mobile AG5) SoC
* Drop address cells from GIC node

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

:
  ARM: shmobile: koelsch: correct renesas,gpios to renesas,groups in sd[012] pfc
  ARM: shmobile: r8a7740: drop address cells from GIC node
  ARM: shmobile: sh73a0: drop address cells from GIC node
  ARM: shmobile: armadillo800eva: fixup SND_SOC_DAIFMT_CBx_CFx flags
  ARM: shmobile: lager: fixup SND_SOC_DAIFMT_CBx_CFx flags

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8a52a116 d5dda038

arch/arm/boot/dts/r8a7740.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
	gic: interrupt-controller@c2800000 {

		compatible = "arm,cortex-a9-gic";

		#interrupt-cells = <3>;

		#address-cells = <1>;

		interrupt-controller;

		reg = <0xc2800000 0x1000>,

		      <0xc2000000 0x1000>;

arch/arm/boot/dts/r8a7791-koelsch.dts

+3 −3
Original line number Diff line number Diff line
@@ -230,17 +230,17 @@ 
	};



	sdhi0_pins: sd0 {

		renesas,gpios = "sdhi0_data4", "sdhi0_ctrl";

		renesas,groups = "sdhi0_data4", "sdhi0_ctrl";

		renesas,function = "sdhi0";

	};



	sdhi1_pins: sd1 {

		renesas,gpios = "sdhi1_data4", "sdhi1_ctrl";

		renesas,groups = "sdhi1_data4", "sdhi1_ctrl";

		renesas,function = "sdhi1";

	};



	sdhi2_pins: sd2 {

		renesas,gpios = "sdhi2_data4", "sdhi2_ctrl";

		renesas,groups = "sdhi2_data4", "sdhi2_ctrl";

		renesas,function = "sdhi2";

	};

arch/arm/boot/dts/sh73a0.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
	gic: interrupt-controller@f0001000 {

		compatible = "arm,cortex-a9-gic";

		#interrupt-cells = <3>;

		#address-cells = <1>;

		interrupt-controller;

		reg = <0xf0001000 0x1000>,

		      <0xf0000100 0x100>;

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

+1 −0
Original line number Diff line number Diff line
@@ -992,6 +992,7 @@ static struct asoc_simple_card_info fsi_wm8978_info = { 
	.platform	= "sh_fsi2",

	.daifmt		= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBM_CFM,

	.cpu_dai = {

		.fmt	= SND_SOC_DAIFMT_IB_NF,

		.name	= "fsia-dai",

	},

	.codec_dai = {

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

+1 −3
Original line number Diff line number Diff line
@@ -588,14 +588,12 @@ static struct asoc_simple_card_info rsnd_card_info = { 
	.card		= "SSI01-AK4643",

	.codec		= "ak4642-codec.2-0012",

	.platform	= "rcar_sound",

	.daifmt		= SND_SOC_DAIFMT_LEFT_J,

	.daifmt		= SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBM_CFM,

	.cpu_dai = {

		.name	= "rcar_sound",

		.fmt	= SND_SOC_DAIFMT_CBS_CFS,

	},

	.codec_dai = {

		.name	= "ak4642-hifi",

		.fmt	= SND_SOC_DAIFMT_CBM_CFM,

		.sysclk	= 11289600,

	},

};