leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2013-01-29 09:02:05 -08:00
parent 95e0d11f2d 42dd581bc4
commit 51063a4ed9
7 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/r8a7740-armadillo800eva.dts
View File

@@ -9,7 +9,7 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "skeleton.dtsi" /include/ "r8a7740.dtsi"
/ { / {
model = "armadillo 800 eva"; model = "armadillo 800 eva";

2
arch/arm/boot/dts/sh7372-mackerel.dts
View File

@@ -9,7 +9,7 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "skeleton.dtsi" /include/ "sh7372.dtsi"
/ { / {
model = "Mackerel (AP4 EVM 2nd)"; model = "Mackerel (AP4 EVM 2nd)";

2
arch/arm/boot/dts/sh73a0-kzm9g.dts
View File

@@ -9,7 +9,7 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "skeleton.dtsi" /include/ "sh73a0.dtsi"
/ { / {
model = "KZM-A9-GT"; model = "KZM-A9-GT";

4
arch/arm/mach-shmobile/board-ap4evb.c
View File

@@ -143,6 +143,10 @@
* *
* SW41 : ON : SH-Mobile AP4 Audio Mode * SW41 : ON : SH-Mobile AP4 Audio Mode
* : OFF : Bluetooth Audio Mode * : OFF : Bluetooth Audio Mode
*
* it needs amixer settings for playing
*
* amixer set "Headphone Enable" on
*/ */
/* /*

8
arch/arm/mach-shmobile/board-armadillo800eva.c
View File

@@ -124,6 +124,14 @@
* this command is required when playback. * this command is required when playback.
* *
* # amixer set "Headphone" 50 * # 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
*/ */
/* /*

2
arch/arm/mach-shmobile/board-kzm9g.c
View File

@@ -623,7 +623,7 @@ static int __init as3711_enable_lcdc_backlight(void)
0x45, 0xf0, 0x45, 0xf0,
}; };
if (!machine_is_kzm9g()) if (!of_machine_is_compatible("renesas,kzm9g"))
return 0; return 0;
if (!a) if (!a)

4
arch/arm/mach-shmobile/board-mackerel.c
View File

@@ -202,9 +202,7 @@
* *
* it needs amixer settings for playing * it needs amixer settings for playing
* *
* amixer set "Headphone" on * amixer set "Headphone Enable" on
* amixer set "HPOUTL Mixer DACH" on
* amixer set "HPOUTR Mixer DACH" on
*/ */
/* Fixed 3.3V and 1.8V regulators to be used by multiple devices */ /* Fixed 3.3V and 1.8V regulators to be used by multiple devices */