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

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 <[email protected]>

diff --combined arch/arm/boot/dts/r8a7740-armadillo800eva.dts
index 52cfeadd2cddb3f7836dff2a3777b2547befaa6e,a8e7bd9e45c2442a5cb19f981e06720dbe7d507c..93da655b2598982e9e0635ad4bedd5477d002eb5
--- 1/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
--- 2/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
@@@ -9,16 -9,12 +9,16 @@@
   */
  
  /dts-v1/;
- /include/ "skeleton.dtsi"
+ /include/ "r8a7740.dtsi"
  
  / {
        model = "armadillo 800 eva";
        compatible = "renesas,armadillo800eva";
  
 +      chosen {
 +              bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096 rw";
 +      };
 +
        memory {
                device_type = "memory";
                reg = <0x40000000 0x20000000>;

diff --combined arch/arm/boot/dts/sh7372-mackerel.dts
index 2623de8e349729bc84e7a586b1e7d5c4a4806820,2ede70d6e2fa4f3f4761b31bbd4fbeec75716fbf..8acf51e0cdae8b10bdda5d875a61f4c9e543e19c
--- 1/arch/arm/boot/dts/sh7372-mackerel.dts
--- 2/arch/arm/boot/dts/sh7372-mackerel.dts
+++ b/arch/arm/boot/dts/sh7372-mackerel.dts
@@@ -9,16 -9,12 +9,16 @@@
   */
  
  /dts-v1/;
- /include/ "skeleton.dtsi"
+ /include/ "sh7372.dtsi"
  
  / {
        model = "Mackerel (AP4 EVM 2nd)";
        compatible = "renesas,mackerel";
  
 +      chosen {
 +              bootargs = "console=tty0, console=ttySC0,115200 earlyprintk=sh-sci.0,115200 root=/dev/nfs nfsroot=,tcp,v3 ip=dhcp mem=240m rw";
 +      };
 +
        memory {
                device_type = "memory";
                reg = <0x40000000 0x10000000>;

diff --combined arch/arm/boot/dts/sh73a0-kzm9g.dts
index 9a438795315fbf47e2b56290011136ffd251c452,7b379017a24117d95437c1fca18349433e595d06..7c4071e7790c34f180e990db3b89293cb8665f1f
--- 1/arch/arm/boot/dts/sh73a0-kzm9g.dts
--- 2/arch/arm/boot/dts/sh73a0-kzm9g.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g.dts
@@@ -9,16 -9,12 +9,16 @@@
   */
  
  /dts-v1/;
- /include/ "skeleton.dtsi"
+ /include/ "sh73a0.dtsi"
  
  / {
        model = "KZM-A9-GT";
        compatible = "renesas,kzm9g", "renesas,sh73a0";
  
 +      chosen {
 +              bootargs = "console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel earlyprintk=sh-sci.4,115200";
 +      };
 +
        memory {
                device_type = "memory";
                reg = <0x41000000 0x1e800000>;