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

Commit 51063a4e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'boards' of... 

Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

From Simon Horman, updates to a few shmobile boards.

* 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: Include sh73a0 DTSI in kzm9g
  ARM: shmobile: Include DTSI of r8a7740 to armadillo800eva
  ARM: shmobile: kzm9g: Use of_machine_is_compatible()
  ARM: shmobile: add sample amixer settings for armadillo800eva
  ARM: shmobile: add sample amixer settings for ap4evb
  ARM: shmobile: fix sample amixer settings for mackerel
  ARM: mackerel: include the correct .dtsi file

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 95e0d11f 42dd581b

arch/arm/boot/dts/r8a7740-armadillo800eva.dts

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 */



/dts-v1/;

/include/ "skeleton.dtsi"

/include/ "r8a7740.dtsi"



/ {

	model = "armadillo 800 eva";

arch/arm/boot/dts/sh7372-mackerel.dts

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 */



/dts-v1/;

/include/ "skeleton.dtsi"

/include/ "sh7372.dtsi"



/ {

	model = "Mackerel (AP4 EVM 2nd)";

arch/arm/boot/dts/sh73a0-kzm9g.dts

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 */



/dts-v1/;

/include/ "skeleton.dtsi"

/include/ "sh73a0.dtsi"



/ {

	model = "KZM-A9-GT";

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

+4 −0
Original line number Diff line number Diff line
@@ -143,6 +143,10 @@ 
 *

 * SW41	:  ON : SH-Mobile AP4 Audio Mode

 *	: OFF : Bluetooth Audio Mode

 *

 * it needs amixer settings for playing

 *

 * amixer set "Headphone Enable" on

 */



/*

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

+8 −0
Original line number Diff line number Diff line
@@ -124,6 +124,14 @@ 
 * this command is required when playback.

 *

 * # amixer set "Headphone" 50

 *

 * this command is required when capture.

 *

 * # amixer set "Input PGA" 15

 * # amixer set "Left Input Mixer MicP" on

 * # amixer set "Left Input Mixer MicN" on

 * # amixer set "Right Input Mixer MicN" on

 * # amixer set "Right Input Mixer MicP" on

 */



/*