Merge branch 'heads/dt-scif-for-v3.16' into next

Conflicts:
	arch/arm/boot/dts/r8a7790-lager.dts

diff --cc arch/arm/boot/dts/r8a7790-lager.dts
index 86d676f629429ab3c304111fcdd987e91fca0c9a,25e048525ce6907c13035e48e3148c6984fd6802..9becef78c797da3a72c1c0bc63ed2b6c745358a2
--- 1/arch/arm/boot/dts/r8a7790-lager.dts
--- 2/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@@ -264,20 -226,18 +269,33 @@@
        };
  };
  
 +&msiof1 {
 +      pinctrl-0 = <&msiof1_pins>;
 +      pinctrl-names = "default";
 +
 +      status = "okay";
 +
 +      pmic: pmic@0 {
 +              compatible = "renesas,r2a11302ft";
 +              reg = <0>;
 +              spi-max-frequency = <6000000>;
 +              spi-cpol;
 +              spi-cpha;
 +      };
++};
 +
+ &scif0 {
+       pinctrl-0 = <&scif0_pins>;
+       pinctrl-names = "default";
+ 
+       status = "okay";
+ };
+ 
+ &scif1 {
+       pinctrl-0 = <&scif1_pins>;
+       pinctrl-names = "default";
+ 
+       status = "okay";
  };
  
  &sdhi0 {

diff --cc arch/arm/boot/dts/r8a7791-koelsch.dts
index 0d69813def859eb1d235576acc565e9269a8e5d6,10c6b4012e12e755ec6be06698afd2a4cbde0d58..05d44f9b202f5d5199c2f576298c76cd8774dfde
--- 1/arch/arm/boot/dts/r8a7791-koelsch.dts
--- 2/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@@ -224,16 -200,11 +229,16 @@@
        };
  };
  
 +&i2c6 {
 +      status = "okay";
 +      clock-frequency = <100000>;
 +};
 +
  &pfc {
-       pinctrl-0 = <&du_pins &scif0_pins &scif1_pins>;
+       pinctrl-0 = <&du_pins>;
        pinctrl-names = "default";
  
 -      i2c2_pins: i2c {
 +      i2c2_pins: i2c2 {
                renesas,groups = "i2c2";
                renesas,function = "i2c2";
        };

diff --cc arch/arm/mach-shmobile/board-koelsch-reference.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-r8a7790.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-r8a7791.c
Simple merge