X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=arch%2Farm64%2Fboot%2Fdts%2Frockchip%2Frk3399-vr-android.dts;h=25e1b06924741ff6353ad12a6ab4a7e800dc5eca;hb=8ab24059e3b656c88403085494948a192e43f84b;hp=995280834fc3c5c0ad780211be52827b94359cce;hpb=51dc5b3de70d0c69afae46fb28fc70efab8b9609;p=firefly-linux-kernel-4.4.55.git diff --git a/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts index 995280834fc3..25e1b0692474 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts @@ -233,6 +233,70 @@ rockchip,uboot-charge-on = <0>; rockchip,android-charge-on = <1>; }; + + rk_vr_key: rockchip-vr-key { + compatible = "rockchip,key"; + status = "okay"; + + io-channels = <&saradc 1>; + + vol-down-key { + linux,code = <114>; + label = "volume down"; + rockchip,adc_value = <170>; + }; + + vol-up-key { + linux,code = <115>; + label = "volume up"; + rockchip,adc_value = <340>; + }; + + home-key { + linux,code = <102>; + label = "home"; + rockchip,adc_value = <420>; + }; + + camera-key { + linux,code = <212>; + label = "camera"; + rockchip,adc_value = <520>; + }; + + power-key { + gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; + linux,code = <116>; + label = "power"; + gpio-key,wakeup; + }; + + back-key { + linux,code = <158>; + label = "back"; + rockchip,adc_value = <620>; + }; + + n-key { + linux,code = <102>; + label = "n"; + rockchip,adc_value = <700>; + }; + + menu-key { + linux,code = <59>; + label = "menu"; + rockchip,adc_value = <780>; + }; + }; + + rk_headset { + compatible = "rockchip_headset"; + headset_gpio = <&gpio4 28 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&hp_det>; + io-channels = <&saradc 2>; + }; }; &cluster0_opp { @@ -244,26 +308,33 @@ opp@600000000 { opp-hz = /bits/ 64 <600000000>; opp-microvolt = <800000>; + clock-latency-ns = <40000>; }; opp@816000000 { opp-hz = /bits/ 64 <816000000>; opp-microvolt = <800000>; + clock-latency-ns = <40000>; }; opp@1008000000 { opp-hz = /bits/ 64 <1008000000>; - opp-microvolt = <875000>; + opp-microvolt = <850000>; + clock-latency-ns = <40000>; }; opp@1200000000 { opp-hz = /bits/ 64 <1200000000>; opp-microvolt = <925000>; + clock-latency-ns = <40000>; }; opp@1416000000 { opp-hz = /bits/ 64 <1416000000>; - opp-microvolt = <1050000>; + opp-microvolt = <1075000>; + clock-latency-ns = <40000>; }; opp@1512000000 { opp-hz = /bits/ 64 <1512000000>; - opp-microvolt = <1075000>; + opp-microvolt = <1100000>; + clock-latency-ns = <40000>; + status="disabled"; }; }; @@ -276,34 +347,42 @@ opp@600000000 { opp-hz = /bits/ 64 <600000000>; opp-microvolt = <800000>; + clock-latency-ns = <40000>; }; opp@816000000 { opp-hz = /bits/ 64 <816000000>; opp-microvolt = <825000>; + clock-latency-ns = <40000>; }; opp@1008000000 { opp-hz = /bits/ 64 <1008000000>; - opp-microvolt = <875000>; + opp-microvolt = <850000>; + clock-latency-ns = <40000>; }; opp@1200000000 { opp-hz = /bits/ 64 <1200000000>; - opp-microvolt = <950000>; + opp-microvolt = <900000>; + clock-latency-ns = <40000>; }; opp@1416000000 { opp-hz = /bits/ 64 <1416000000>; - opp-microvolt = <1025000>; + opp-microvolt = <1000000>; + clock-latency-ns = <40000>; }; opp@1608000000 { opp-hz = /bits/ 64 <1608000000>; - opp-microvolt = <1100000>; + opp-microvolt = <1050000>; + clock-latency-ns = <40000>; }; opp@1800000000 { opp-hz = /bits/ 64 <1800000000>; - opp-microvolt = <1175000>; + opp-microvolt = <1150000>; + clock-latency-ns = <40000>; }; opp@1992000000 { opp-hz = /bits/ 64 <1992000000>; - opp-microvolt = <1250000>; + opp-microvolt = <1225000>; + clock-latency-ns = <40000>; }; }; @@ -385,8 +464,8 @@ opp@200000000 { opp-hz = /bits/ 64 <200000000>; opp-microvolt = <825000>; + status = "disabled"; }; - opp@300000000 { opp-hz = /bits/ 64 <300000000>; opp-microvolt = <850000>; @@ -395,20 +474,17 @@ opp-hz = /bits/ 64 <400000000>; opp-microvolt = <875000>; }; - opp@500000000 { opp-hz = /bits/ 64 <500000000>; - opp-microvolt = <925000>; + opp-microvolt = <950000>; }; - opp@600000000 { opp-hz = /bits/ 64 <600000000>; - opp-microvolt = <975000>; + opp-microvolt = <1025000>; }; - opp@800000000 { opp-hz = /bits/ 64 <800000000>; - opp-microvolt = <1025000>; + opp-microvolt = <1125000>; }; }; @@ -447,9 +523,6 @@ }; &emmc_phy { - freq-sel = <200000000>; - dr-sel = <50>; - opdelay = <4>; status = "okay"; }; @@ -458,6 +531,7 @@ mmc-hs400-1_8v; supports-emmc; non-removable; + keep-power-in-suspend; mmc-hs400-enhanced-strobe; status = "okay"; }; @@ -518,6 +592,7 @@ fcs,suspend-voltage-selector = <1>; regulator-boot-on; regulator-initial-state = <3>; + regulator-initial-mode = <1>;/*1:pwm 2: auto mode*/ regulator-state-mem { regulator-off-in-suspend; }; @@ -567,8 +642,7 @@ regulator-max-microvolt = <1350000>; regulator-ramp-delay = <6001>; regulator-state-mem { - regulator-on-in-suspend; - regulator-suspend-microvolt = <1000000>; + regulator-off-in-suspend; }; }; @@ -747,7 +821,6 @@ clocks = <&cru SCLK_I2S_8CH_OUT>; clock-names = "mclk"; spk-con-gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>; - hp-det-gpio = <&gpio4 28 GPIO_ACTIVE_LOW>; }; }; @@ -815,13 +888,27 @@ orientation-x= <1>; orientation-y= <0>; orientation-z= <1>; + support-hw-poweroff = <1>; mpu-debug = <1>; }; }; +&threshold { + temperature = <70000>; /* millicelsius */ +}; + +&target { + temperature = <85000>; /* millicelsius */ +}; + +&soc_crit { + temperature = <100000>; /* millicelsius */ +}; + &tsadc { rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */ rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */ + rockchip,hw-tshut-temp = <110000>; status = "okay"; }; @@ -829,43 +916,6 @@ status = "okay"; }; -&rk_key { - compatible = "rockchip,key"; - status = "okay"; - io-channels = <&saradc 1>; - - vol-up-key { - linux,code = <115>; - label = "volume up"; - rockchip,adc_value = <340>; - }; - - vol-down-key { - linux,code = <114>; - label = "volume down"; - rockchip,adc_value = <170>; - }; - - power-key { - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; - linux,code = <116>; - label = "power"; - gpio-key,wakeup; - }; - - back-key { - linux,code = <158>; - label = "back"; - rockchip,adc_value = <620>; - }; - - home-key { - linux,code = <102>; - label = "home"; - rockchip,adc_value = <700>; - }; -}; - &u2phy0 { extcon = <&fusb0>; status = "okay"; @@ -954,6 +1004,10 @@ rockchip,pwm_voltage = <900000>; }; +&rk_key { + status = "disabled"; +}; + &rk_screen { assigned-clocks = <&cru PLL_VPLL>; assigned-clock-rates = <245000000>; @@ -1091,4 +1145,18 @@ rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_up>; }; }; + + headphone { + hp_det: hp-det { + rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; +}; + +&pvtm { + status = "okay"; +}; + +&pmu_pvtm { + status = "okay"; };