Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / renesas / hihope-common.dtsi

diff --git a/arch/arm64/boot/dts/renesas/hihope-common.dtsi b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
index 3311a982fff89f66fa52c4a435ad2eeeebeec55c..3e376d29a73002e04edaf7edc543ed2fa1dfe53c 100644 (file)
--- a/arch/arm64/boot/dts/renesas/hihope-common.dtsi
+++ b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
@@ -10,6 +10,7 @@
 / {
        aliases {
                serial0 = &scif2;
+               serial1 = &hscif0;
        };
 
        chosen {
@@ -31,6 +32,13 @@
        leds {
                compatible = "gpio-leds";
 
+               bt_active_led {
+                       label = "blue:bt";
+                       gpios = <&gpio7  0 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "hci0-power";
+                       default-state = "off";
+               };
+
                led0 {
                        gpios = <&gpio6 11 GPIO_ACTIVE_HIGH>;
                };
@@ -46,6 +54,13 @@
                led3 {
                        gpios = <&gpio0  0 GPIO_ACTIVE_HIGH>;
                };
+
+               wlan_active_led {
+                       label = "yellow:wlan";
+                       gpios = <&gpio7  1 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "phy0tx";
+                       default-state = "off";
+               };
        };
 
        reg_1p8v: regulator0 {
@@ -66,6 +81,14 @@
                regulator-always-on;
        };
 
+       sound_card: sound {
+               compatible = "audio-graph-card";
+
+               label = "rcar-sound";
+
+               dais = <&rsnd_port0>;
+       };
+
        vbus0_usb2: regulator-vbus0-usb2 {
                compatible = "regulator-fixed";
 
@@ -90,6 +113,17 @@
                          1800000 0>;
        };
 
+       wlan_en_reg: regulator-wlan_en {
+               compatible = "regulator-fixed";
+               regulator-name = "wlan-en-regulator";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               startup-delay-us = <70000>;
+
+               gpio = <&gpio_expander 1 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
+
        x302_clk: x302-clock {
                compatible = "fixed-clock";
                #clock-cells = <0>;
@@ -103,6 +137,10 @@
        };
 };
 
+&audio_clk_a {
+       clock-frequency = <22579200>;
+};
+
 &du {
        clocks = <&cpg CPG_MOD 724>,
                 <&cpg CPG_MOD 723>,
@@ -150,6 +188,25 @@
                                remote-endpoint = <&hdmi0_con>;
                        };
                };
+               port@2 {
+                       reg = <2>;
+                       dw_hdmi0_snd_in: endpoint {
+                               remote-endpoint = <&rsnd_endpoint0>;
+                       };
+               };
+       };
+};
+
+&hscif0 {
+       pinctrl-0 = <&hscif0_pins>;
+       pinctrl-names = "default";
+
+       uart-has-rtscts;
+       status = "okay";
+
+       bluetooth {
+               compatible = "ti,wl1837-st";
+               enable-gpios = <&gpio_expander 2 GPIO_ACTIVE_HIGH>;
        };
 };
 
@@ -162,6 +219,13 @@
        clock-frequency = <400000>;
        status = "okay";
 
+       gpio_expander: gpio@20 {
+               compatible = "onnn,pca9654";
+               reg = <0x20>;
+               gpio-controller;
+               #gpio-cells = <2>;
+       };
+
        versaclock5: clock-generator@6a {
                compatible = "idt,5p49v5923";
                reg = <0x6a>;
@@ -187,6 +251,11 @@
        pinctrl-0 = <&scif_clk_pins>;
        pinctrl-names = "default";
 
+       hscif0_pins: hscif0 {
+               groups = "hscif0_data", "hscif0_ctrl";
+               function = "hscif0";
+       };
+
        scif2_pins: scif2 {
                groups = "scif2_data_a";
                function = "scif2";
@@ -209,12 +278,23 @@
                power-source = <1800>;
        };
 
+       sdhi2_pins: sd2 {
+               groups = "sdhi2_data4", "sdhi2_ctrl";
+               function = "sdhi2";
+               power-source = <1800>;
+       };
+
        sdhi3_pins: sd3 {
                groups = "sdhi3_data8", "sdhi3_ctrl", "sdhi3_ds";
                function = "sdhi3";
                power-source = <1800>;
        };
 
+       sound_clk_pins: sound_clk {
+               groups = "audio_clk_a_a";
+               function = "audio_clk";
+       };
+
        usb0_pins: usb0 {
                groups = "usb0";
                function = "usb0";
@@ -238,6 +318,30 @@
        };
 };
 
+&rcar_sound {
+       pinctrl-0 = <&sound_clk_pins>;
+       pinctrl-names = "default";
+
+       status = "okay";
+
+       /* Single DAI */
+       #sound-dai-cells = <0>;
+
+       ports {
+               rsnd_port0: port@0 {
+                       rsnd_endpoint0: endpoint {
+                               remote-endpoint = <&dw_hdmi0_snd_in>;
+
+                               dai-format = "i2s";
+                               bitclock-master = <&rsnd_endpoint0>;
+                               frame-master = <&rsnd_endpoint0>;
+
+                               playback = <&ssi2>;
+                       };
+               };
+       };
+};
+
 &rwdt {
        timeout-sec = <60>;
        status = "okay";
@@ -268,6 +372,27 @@
        status = "okay";
 };
 
+&sdhi2 {
+       status = "okay";
+       pinctrl-0 = <&sdhi2_pins>;
+       pinctrl-names = "default";
+
+       vmmc-supply = <&wlan_en_reg>;
+       bus-width = <4>;
+       non-removable;
+       cap-power-off-card;
+       keep-power-in-suspend;
+
+       #address-cells = <1>;
+       #size-cells = <0>;
+       wlcore: wlcore@2 {
+               compatible = "ti,wl1837";
+               reg = <2>;
+               interrupt-parent = <&gpio2>;
+               interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
+       };
+};
+
 &sdhi3 {
        pinctrl-0 = <&sdhi3_pins>;
        pinctrl-1 = <&sdhi3_pins>;
@@ -279,6 +404,7 @@
        mmc-hs200-1_8v;
        non-removable;
        fixed-emmc-driver-type = <1>;
+       status = "okay";
 };
 
 &usb_extal_clk {