arm: dts: rk3288-evb: add earlycon to args of cmdline

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3288-miniarm.dts

diff --git a/arch/arm/boot/dts/rk3288-miniarm.dts b/arch/arm/boot/dts/rk3288-miniarm.dts
index 90c0e1a779ee8ac5f2c40761d8888775a38763c7..eee3820747d68bcb1fbf3a33e97b16d8f42bc33e 100644 (file)
--- a/arch/arm/boot/dts/rk3288-miniarm.dts
+++ b/arch/arm/boot/dts/rk3288-miniarm.dts
@@ -158,7 +158,16 @@
        #address-cells = <1>;
        #size-cells = <0>;
        #sound-dai-cells = <0>;
-       ddc-i2c-bus = <&i2c5>;
+       status = "okay";
+       /* Don't use vopl for HDMI */
+       ports {
+               hdmi_in: port {
+                       /delete-node/ endpoint@1;
+               };
+       };
+};
+
+&hevc_service {
        status = "okay";
 };
 
@@ -172,7 +181,10 @@
                interrupt-parent = <&gpio0>;
                interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
-               pinctrl-0 = <&pmic_int &global_pwroff>;
+               pinctrl-0 = <&pmic_int &global_pwroff &dvs_1 &dvs_2>;
+               dvs-gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>,
+                               <&gpio0 12 GPIO_ACTIVE_HIGH>;
+
                rockchip,system-power-controller;
                wakeup-source;
                #clock-cells = <1>;
@@ -184,12 +196,12 @@
                vcc4-supply = <&vcc_sys>;
                vcc6-supply = <&vcc_sys>;
                vcc7-supply = <&vcc_sys>;
-               vcc8-supply = <&vcc_18>;
+               vcc8-supply = <&vcc_io>;
                vcc9-supply = <&vcc_io>;
                vcc10-supply = <&vcc_io>;
                vcc11-supply = <&vcc_sys>;
                vcc12-supply = <&vcc_io>;
-               vddio-supply = <&vcc18_ldo1>;
+               vddio-supply = <&vcc_io>;
 
                regulators {
                        vdd_cpu: DCDC_REG1 {
@@ -198,6 +210,7 @@
                                regulator-min-microvolt = <750000>;
                                regulator-max-microvolt = <1350000>;
                                regulator-name = "vdd_arm";
+                               regulator-ramp-delay = <6000>;
                                regulator-state-mem {
                                        regulator-off-in-suspend;
                                };
@@ -209,6 +222,7 @@
                                regulator-min-microvolt = <850000>;
                                regulator-max-microvolt = <1250000>;
                                regulator-name = "vdd_gpu";
+                               regulator-ramp-delay = <6000>;
                                regulator-state-mem {
                                        regulator-on-in-suspend;
                                        regulator-suspend-microvolt = <1000000>;
@@ -354,46 +368,27 @@
 
 &i2c2 {
        status = "okay";
-
-       headset: nau8825@1a {
-               compatible = "nuvoton,nau8825";
-               #sound-dai-cells = <0>;
-               reg = <0x1a>;
-               interrupt-parent = <&gpio6>;
-               interrupts = <5 IRQ_TYPE_LEVEL_LOW>;
-               nuvoton,jkdet-enable = <1>;
-               nuvoton,jkdet-pull-enable = <1>;
-               nuvoton,jkdet-pull-up = <0>;
-               nuvoton,jkdet-polarity = <1>;
-               nuvoton,vref-impedance = <2>;
-               nuvoton,micbias-voltage = <6>;
-               nuvoton,sar-threshold-num = <4>;
-               nuvoton,sar-threshold = <0xa 0x14 0x26 0x73>;
-               nuvoton,sar-hysteresis = <0>;
-               nuvoton,sar-voltage = <6>;
-               nuvoton,sar-compare-time = <0>;
-               nuvoton,sar-sampling-time = <0>;
-               nuvoton,short-key-debounce = <3>;
-               nuvoton,jack-insert-debounce = <7>;
-               nuvoton,jack-eject-debounce = <7>;
-               clock-names = "mclk";
-               clocks = <&cru SCLK_I2S0_OUT>;
-       };
 };
 
-&i2c5 {
+&i2s {
+       #sound-dai-cells = <0>;
        status = "okay";
 };
 
-&i2s {
-       #sound-dai-cells = <0>;
+&io_domains {
        status = "okay";
+
+       sdcard-supply = <&vccio_sd>;
 };
 
 &pwm0 {
        status = "okay";
 };
 
+&rga {
+       status = "okay";
+};
+
 &saradc {
        vref-supply = <&vcc18_ldo1>;
        status ="okay";
@@ -410,7 +405,7 @@
        pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
        status = "okay";
        supports-sd;
-       vmmc-supply = <&vcc_sd>;
+       vmmc-supply = <&vcc33_sd>;
        vqmmc-supply = <&vccio_sd>;
 };
 
@@ -445,6 +440,7 @@
 };
 
 &usb_host0_ehci {
+       no-relinquish-port;
        status = "okay";
 };
 
@@ -466,13 +462,17 @@
 
 &vopl {
        status = "okay";
+       /* Don't use vopl for HDMI */
+       vopl_out: port {
+               /delete-node/ endpoint@0;
+       };
 };
 
 &vopl_mmu {
        status = "okay";
 };
 
-&vpu {
+&vpu_service {
        status = "okay";
 };
 
@@ -512,6 +512,14 @@
                pmic_int: pmic-int {
                        rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
                };
+
+               dvs_1: dvs-1 {
+                       rockchip,pins = <RK_GPIO0 11 RK_FUNC_GPIO &pcfg_pull_down>;
+               };
+
+               dvs_2: dvs-2 {
+                       rockchip,pins = <RK_GPIO0 12 RK_FUNC_GPIO &pcfg_pull_down>;
+               };
        };
 
        sdmmc {