1 files changed, 80 insertions, 3 deletions

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index d01048ab3e77..dd2fe46073f2 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -12,11 +12,17 @@
 /dts-v1/;
 #include "r8a7790.dtsi"
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 
 / {
         model = "Lager";
         compatible = "renesas,lager", "renesas,r8a7790";
 
+        aliases {
+                serial6 = &scif0;
+                serial7 = &scif1;
+        };
+
         chosen {
                 bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
         };
@@ -36,6 +42,39 @@
                 #size-cells = <1>;
         };
 
+        gpio_keys {
+                compatible = "gpio-keys";
+
+                button@1 {
+                        linux,code = <KEY_1>;
+                        label = "SW2-1";
+                        gpio-key,wakeup;
+                        debounce-interval = <20>;
+                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+                };
+                button@2 {
+                        linux,code = <KEY_2>;
+                        label = "SW2-2";
+                        gpio-key,wakeup;
+                        debounce-interval = <20>;
+                        gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
+                };
+                button@3 {
+                        linux,code = <KEY_3>;
+                        label = "SW2-3";
+                        gpio-key,wakeup;
+                        debounce-interval = <20>;
+                        gpios = <&gpio1 26 GPIO_ACTIVE_LOW>;
+                };
+                button@4 {
+                        linux,code = <KEY_4>;
+                        label = "SW2-4";
+                        gpio-key,wakeup;
+                        debounce-interval = <20>;
+                        gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;
+                };
+        };
+
         leds {
                 compatible = "gpio-leds";
                 led6 {
@@ -112,7 +151,7 @@
 };
 
 &pfc {
-        pinctrl-0 = <&du_pins &scif0_pins &scif1_pins>;
+        pinctrl-0 = <&du_pins>;
         pinctrl-names = "default";
 
         du_pins: du {
@@ -155,10 +194,16 @@
                 renesas,function = "mmc1";
         };
 
-        qspi_pins: spi {
+        qspi_pins: spi0 {
                 renesas,groups = "qspi_ctrl", "qspi_data4";
                 renesas,function = "qspi";
         };
+
+        msiof1_pins: spi2 {
+                renesas,groups = "msiof1_clk", "msiof1_sync", "msiof1_rx",
+                                 "msiof1_tx";
+                renesas,function = "msiof1";
+        };
 };
 
 &ether {
@@ -173,6 +218,7 @@
                 reg = <1>;
                 interrupt-parent = <&irqc0>;
                 interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+                micrel,led-mode = <1>;
         };
 };
 
@@ -190,7 +236,7 @@
         status = "okay";
 };
 
-&spi {
+&qspi {
         pinctrl-0 = <&qspi_pins>;
         pinctrl-names = "default";
 
@@ -202,6 +248,8 @@
                 compatible = "spansion,s25fl512s";
                 reg = <0>;
                 spi-max-frequency = <30000000>;
+                spi-tx-bus-width = <4>;
+                spi-rx-bus-width = <4>;
                 m25p,fast-read;
 
                 partition@0 {
@@ -221,6 +269,35 @@
         };
 };
 
+&scif0 {
+        pinctrl-0 = <&scif0_pins>;
+        pinctrl-names = "default";
+
+        status = "okay";
+};
+
+&scif1 {
+        pinctrl-0 = <&scif1_pins>;
+        pinctrl-names = "default";
+
+        status = "okay";
+};
+
+&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;
+        };
+};
+
 &sdhi0 {
         pinctrl-0 = <&sdhi0_pins>;
         pinctrl-names = "default";