arm64: dts: rockchip: enable cdn_dp_fb node for rk3399-mid

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / boot / dts / rockchip / rk3399-mid-818-android.dts

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
index bd39d0c03f44b2b3776a0e4905fafba4d5f0950c..7a9ca12a134434f8e61189cf047964b5a133bb41 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
@@ -50,6 +50,15 @@
 / {
        compatible = "rockchip,rk3399-mid", "rockchip,rk3399";
 
+       hall_sensor: hall-mh248 {
+               compatible = "hall-mh248";
+               pinctrl-names = "default";
+               pinctrl-0 = <&mh248_irq_gpio>;
+               irq-gpio = <&gpio1 2 IRQ_TYPE_EDGE_BOTH>;
+               hall-active = <1>;
+               status = "okay";
+       };
+
        vcc_sys: vcc-sys {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
@@ -93,38 +102,38 @@
                compatible = "pwm-backlight";
                pwms = <&vop0_pwm 0 25000 PWM_POLARITY_INVERTED>;
                brightness-levels = <
-                       0  255  51  51  52  53  53  54
-                       54  55  56  56  57  57  58  59
-                       59  60  60  61  62  62  63  63
-                       64  65  65  66  66  67  68  68
-                       69  69  70  71  71  72  72  73
-                       74  74  75  75  76  77  77  78
-                       78  79  80  80  81  81  82  83
-                       83  84  85  85  86  86  87  88
-                       88  89  89  90  91  91  92  92
-                       93  94  94  95  95  96  97  97
-                       98  98  99  100 100 101 101 102
-                       103 103 104 104 105 106 106 107
-                       107 108 109 109 110 110 111 112
-                       112 113 113 114 114 115 116 116
-                       117 118 118 119 119 120 120 121
-                       122 122 123 123 124 125 125 126
-                       126 127 128 128 129 129 130 131
-                       131 132 132 133 133 134 135 135
-                       136 137 138 138 139 140 140 141
-                       141 142 143 143 144 144 145 146
-                       146 147 148 148 149 149 149 150
-                       150 151 151 151 152 152 152 153
-                       153 153 154 154 155 156 156 157
-                       157 158 159 159 160 160 161 161
-                       162 163 163 164 165 165 166 166
-                       167 168 168 169 169 170 171 171
-                       172 172 173 174 174 175 175 176
-                       176 177 178 178 179 179 180 181
-                       181 182 183 183 184 185 185 186
-                       186 187 188 188 189 189 190 190
-                       191 191 192 193 193 194 194 195
-                       196 197 197 198 199 199 200 200>;
+                       0   1   51  52  52  53  53  54
+                       54  55  55  56  56  57  57  58
+                       58  59  59  60  61  61  62  63
+                       63  64  65  65  66  67  67  68
+                       69  69  70  71  71  72  73  73
+                       74  75  75  76  77  77  78  79
+                       79  80  80  81  81  82  83  83
+                       84  85  86  86  87  88  89  89
+                       90  91  92  92  93  94  95  95
+                       96  97  98  98  99 100 101  101
+                       102 103 104 104 105 106 107 107
+                       108 109 110 110 111 112 113 113
+                       114 115 116 116 117 118 119 119
+                       120 121 122 122 123 124 125 125
+                       126 127 128 128 129 130 131 131
+                       132 133 134 134 135 136 137 137
+                       138 139 140 140 141 142 143 143
+                       144 145 146 146 147 148 149 149
+                       150 151 152 152 153 154 155 155
+                       156 157 158 158 159 160 161 161
+                       162 163 164 164 165 166 167 167
+                       168 169 170 170 171 172 173 173
+                       174 175 176 176 177 178 179 179
+                       180 181 182 182 183 184 185 185
+                       186 187 188 188 189 190 191 191
+                       216 217 218 218 219 220 221 221
+                       222 223 224 224 225 226 227 227
+                       228 229 230 230 231 232 233 233
+                       234 235 236 236 237 238 239 239
+                       240 241 242 242 243 244 245 245
+                       246 247 248 248 249 250 251 251
+                       252 253 254 254 255 255 255 255>;
                default-brightness-level = <200>;
                enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
        };
@@ -236,6 +245,12 @@
                rockchip,uboot-charge-on = <0>;
                rockchip,android-charge-on = <1>;
        };
+
+       vibrator {
+               compatible = "rk-vibrator-gpio";
+               vibrator-gpio = <&gpio4 30 GPIO_ACTIVE_LOW>;
+               status = "okay";
+       };
 };
 
 &dfi {
@@ -302,6 +317,7 @@
        opp@1512000000 {
                opp-hz = /bits/ 64 <1512000000>;
                opp-microvolt = <1100000>;
+               status="disabled";
        };
 };
 
@@ -422,15 +438,15 @@
        opp-shared;
        opp@200000000 {
                opp-hz = /bits/ 64 <200000000>;
-               opp-microvolt = <850000>;
+               opp-microvolt = <825000>;
        };
        opp@300000000 {
                opp-hz = /bits/ 64 <300000000>;
-               opp-microvolt = <900000>;
+               opp-microvolt = <850000>;
        };
        opp@400000000 {
                opp-hz = /bits/ 64 <400000000>;
-               opp-microvolt = <900000>;
+               opp-microvolt = <875000>;
        };
        opp@500000000 {
                opp-hz = /bits/ 64 <500000000>;
@@ -438,11 +454,11 @@
        };
        opp@600000000 {
                opp-hz = /bits/ 64 <600000000>;
-               opp-microvolt = <1000000>;
+               opp-microvolt = <1025000>;
        };
        opp@800000000 {
                opp-hz = /bits/ 64 <800000000>;
-               opp-microvolt = <1050000>;
+               opp-microvolt = <1125000>;
        };
 };
 
@@ -531,9 +547,6 @@
 };
 
 &emmc_phy {
-       freq-sel = <200000000>;
-       dr-sel = <50>;
-       opdelay = <4>;
        status = "okay";
 };
 
@@ -542,6 +555,7 @@
        mmc-hs400-1_8v;
        supports-emmc;
        non-removable;
+       keep-power-in-suspend;
        mmc-hs400-enhanced-strobe;
        status = "okay";
 };
@@ -601,7 +615,6 @@
                regulator-max-microvolt = <1400000>;
                regulator-ramp-delay = <1000>;
                fcs,suspend-voltage-selector = <1>;
-               regulator-always-on;
                regulator-boot-on;
                regulator-state-mem {
                        regulator-off-in-suspend;
@@ -1098,6 +1111,12 @@
                };
        };
 
+       hallsensor {
+               mh248_irq_gpio: mh248-irq-gpio {
+                       rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+       };
+
        headphone {
                hp_det: hp-det {
                        rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_up>;
@@ -1159,6 +1178,17 @@
        #include <dt-bindings/display/screen-timing/lcd-LP097Qx2.dtsi>
 };
 
+&cdn_dp_sound {
+       status = "okay";
+};
+
+&cdn_dp_fb {
+       status = "okay";
+       extcon = <&fusb0>;
+       phys = <&tcphy0 0>;
+       dp_vop_sel = <DISPLAY_SOURCE_LCDC1>;
+};
+
 &vopb_rk_fb {
        status = "okay";
        rockchip,cabc_mode = <1>;