Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3128-sdk.dts

diff --git a/arch/arm/boot/dts/rk3128-sdk.dts b/arch/arm/boot/dts/rk3128-sdk.dts
index 99a0d15254456053f567041ca6488d4336984194..b570b7612a327c8a70398ed89d7e55b0670c5817 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-sdk.dts
+++ b/arch/arm/boot/dts/rk3128-sdk.dts
@@ -1,9 +1,13 @@
+/dts-v1/;
+
+#include "rk3128.dtsi"
+#include "rk3128-cif-sensor.dtsi"
 #include "rk312x-sdk.dtsi"
 #include "lcd-b101ew05.dtsi"
 
 / {
         compatible = "rockchip,rk3128";
-        backlight {
+        backlight: backlight {
                 compatible = "pwm-backlight";
                 pwms = <&pwm0 0 25000>;
                 brightness-levels = <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255>;
@@ -24,6 +28,7 @@
 
 &fb {
        rockchip,disp-mode = <ONE_DUAL>;
+       rockchip,uboot-logo-on = <1>;
 };
 
 &rk_screen {
@@ -33,14 +38,14 @@
 &lvds {
        status = "okay";
 
-       pinctrl-names = "lcdc", "sleep";
+       pinctrl-names = "lcdc";
        pinctrl-0 = <&lcdc0_lcdc_d>;
-       pinctrl-1 = <&lcdc0_lcdc_gpio>;
 };
 
 &lcdc {
        status = "okay";
 
+       backlight = <&backlight>;
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&lcdc0_lcdc>;
        pinctrl-1 = <&lcdc0_gpio>;
@@ -87,7 +92,7 @@
         hp_volume = <25>;
         capture_volume = <26>;
         gpio_debug = <1>;
-        codec_hp_det = <0>;
+        codec_hp_det = <1>;
 };
 
 &rk3128_cif_sensor{
@@ -108,6 +113,36 @@
                1296000 1350000
                1320000 1375000
                >;
+       virt-temp-limit-1-cpu-busy = <
+       /* target-temp  limit-freq */
+               75      1008000
+               85      1200000
+               95      1200000
+               100     1200000
+               >;
+       virt-temp-limit-2-cpu-busy = <
+       /* target-temp  limit-freq */
+               75      912000
+               85      1008000
+               95      1104000
+               100     1200000
+               >;
+       virt-temp-limit-3-cpu-busy = <
+       /* target-temp  limit-freq */
+               75      816000
+               85      912000
+               95      100800
+               100     110400
+               >;
+       virt-temp-limit-4-cpu-busy = <
+       /* target-temp  limit-freq */
+               75      816000
+               85      912000
+               95      100800
+               100     110400
+               >;
+       temp-limit-enable = <1>;
+       target-temp = <85>;
        status="okay";
 };
 
@@ -125,28 +160,28 @@
 &clk_ddr_dvfs_table {
        operating-points = <
                /* KHz    uV */
-               200000 950000
-               300000 950000
+               //200000 950000
+               //300000 950000
                400000 1000000
-               533000 1200000
+               //533000 1200000
                >;
 
        freq-table = <
                /*status                freq(KHz)*/
                SYS_STATUS_NORMAL       400000
-               SYS_STATUS_SUSPEND      200000
-               SYS_STATUS_VIDEO_1080P  240000
+               SYS_STATUS_SUSPEND      400000
+               SYS_STATUS_VIDEO_1080P  400000
                SYS_STATUS_VIDEO_4K     400000
-               SYS_STATUS_PERFORMANCE  528000
+               SYS_STATUS_PERFORMANCE  400000
                SYS_STATUS_DUALVIEW     400000
-               SYS_STATUS_BOOST        324000
-               SYS_STATUS_ISP          533000
+               SYS_STATUS_BOOST        400000
+               SYS_STATUS_ISP          400000
                >;
        auto-freq-table = <
-               240000
-               324000
+               //240000
+               //324000
                396000
-               528000
+               //528000
                >;
        auto-freq=<0>;
        status="okay";