ARM64: dts: rockchip: rk3366-tb: fix power_key gpio error

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / boot / dts / rockchip / rk3366-tb.dts

diff --git a/arch/arm64/boot/dts/rockchip/rk3366-tb.dts b/arch/arm64/boot/dts/rockchip/rk3366-tb.dts
index 1f84d52148cb8a473bf3fcf784957c10ddc86b23..43ce6a5d95a9ceb49a54520728a0f6194c2c3dd0 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3366-tb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3366-tb.dts
@@ -124,7 +124,7 @@
                };
 
                power-key {
-                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                        linux,code = <116>;
                        label = "power";
                        gpio-key,wakeup;
@@ -155,6 +155,27 @@
                };
        };
 
+       sound {
+               compatible = "simple-audio-card";
+               simple-audio-card,format = "i2s";
+               simple-audio-card,name = "rockchip,rt5640-codec";
+               simple-audio-card,mclk-fs = <256>;
+               simple-audio-card,widgets =
+                       "Microphone", "Mic Jack",
+                       "Headphone", "Headphone Jack";
+               simple-audio-card,routing =
+                       "Mic Jack", "MICBIAS1",
+                       "IN1P", "Mic Jack",
+                       "Headphone Jack", "HPOL",
+                       "Headphone Jack", "HPOR";
+               simple-audio-card,cpu {
+                       sound-dai = <&i2s_8ch>;
+               };
+               simple-audio-card,codec {
+                       sound-dai = <&rt5640>;
+               };
+       };
+
        vcc_sys: vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
@@ -163,6 +184,36 @@
                regulator-min-microvolt = <3800000>;
                regulator-max-microvolt = <3800000>;
        };
+
+       ext_gmac: external-gmac-clock {
+               compatible = "fixed-clock";
+               clock-frequency = <125000000>;
+               clock-output-names = "ext_gmac";
+               #clock-cells = <0>;
+       };
+
+       vcc_phy: vcc-phy-regulator {
+               compatible = "regulator-fixed";
+               enable-active-high;
+               gpio = <&gpio0 24 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&eth_phy_pwr>;
+               regulator-name = "vcc_phy";
+               regulator-always-on;
+               regulator-boot-on;
+       };
+
+       io-domains {
+               compatible = "rockchip,rk3366-io-voltage-domain";
+               rockchip,grf = <&grf>;
+
+               lcdc-supply = <&vcc_io>;
+               dvpts-supply = <&vcc_18>;
+               wifibt-supply = <&vccio_wl>;
+               audio-supply = <&vcc_io>;
+               sdcard-supply = <&vccio_sd>;
+               tphdsor-supply = <&vcc_io>;
+       };
 };
 
 &emmc {
@@ -422,6 +473,27 @@
        };
 };
 
+&i2c1 {
+       status = "okay";
+
+       rt5640: rt5640@1c {
+               #sound-dai-cells = <0>;
+               compatible = "realtek,rt5640";
+               reg = <0x1c>;
+               clocks = <&cru SCLK_I2S_8CH_OUT>;
+               clock-names = "mclk";
+               realtek,in1-differential;
+       };
+};
+
+&i2s_8ch {
+       status = "okay";
+       rockchip,i2s-broken-burst-len;
+       rockchip,playback-channels = <8>;
+       rockchip,capture-channels = <2>;
+       #sound-dai-cells = <0>;
+};
+
 &pwm0 {
        status = "okay";
 };
@@ -438,7 +510,8 @@
 
 &rk_screen {
        status = "okay";
-       #include <dt-bindings/display/screen-timing/lcd-b101ew05.dtsi>
+       #include <dt-bindings/display/screen-timing/lcd-tv080wum-mipi.dtsi>
+       /* #include <dt-bindings/display/screen-timing/lcd-b101ew05.dtsi> */
 };
 
 &lvds {
@@ -448,6 +521,10 @@
        status = "disabled";
 };
 
+&dsihost0 {
+       status = "okay";
+};
+
 &vop_lite {
        status = "okay";
        rockchip,prop = <EXTEND>;
@@ -500,4 +577,20 @@
                         rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_up>;
                 };
         };
-};
\ No newline at end of file
+};
+
+&gmac {
+       phy_regulator = "vcc_phy";
+       phy-mode = "rgmii";
+       clock_in_out = "input";
+       snps,reset-gpio = <&gpio2 15 0>;
+       snps,reset-active-low;
+       snps,reset-delays-us = <0 10000 1000000>;
+       assigned-clocks = <&cru SCLK_MAC>;
+       assigned-clock-parents = <&ext_gmac>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&rgmii_pins>;
+       tx_delay = <0x30>;
+       rx_delay = <0x10>;
+       status = "okay";
+};