X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=blobdiff_plain;f=arch%2Farm64%2Fboot%2Fdts%2Frockchip%2Frk3399-box.dtsi;h=0ee56dc5b3a286a4ff719c380758686f6097bb25;hp=11443aa598874f49ae12422a3f8ebaf585abdea8;hb=09eb60c10947fae67bb31358e54d958ff3a40c5b;hpb=c9db0eeafd4659d9f38a6222aced8769d8963124 diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi index 11443aa59887..0ee56dc5b3a2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi @@ -43,6 +43,7 @@ #include #include "rk3399.dtsi" #include "rk3399-android.dtsi" +#include "rk3399-opp.dtsi" / { compatible = "rockchip,rk3399-box","rockchip,rk3399"; @@ -86,11 +87,12 @@ pinctrl-names = "default"; pinctrl-0 = <&host_vbus_drv>; regulator-name = "vcc5v0_host"; + regulator-always-on; }; vdd_log: vdd-log { compatible = "pwm-regulator"; - pwms = <&pwm2 0 25000 0>; + pwms = <&pwm2 0 25000 1>; regulator-name = "vdd_log"; regulator-min-microvolt = <800000>; regulator-max-microvolt = <1400000>; @@ -111,23 +113,6 @@ #clock-cells = <0>; }; - io-domains { - compatible = "rockchip,rk3399-io-voltage-domain"; - rockchip,grf = <&grf>; - - bt656-supply = <&vcc1v8_s0>; /* bt656_gpio2ab_ms */ - audio-supply = <&vcc1v8_s0>; /* audio_gpio3d4a_ms */ - sdmmc-supply = <&vcc_sd>; /* sdmmc_gpio4b_ms */ - gpio1830-supply = <&vcc_3v0>; /* gpio1833_gpio4cd_ms */ - }; - - pmu-io-domains { - compatible = "rockchip,rk3399-pmu-io-voltage-domain"; - rockchip,grf = <&pmugrf>; - - pmu1830-supply = <&vcc_1v8>; - }; - spdif-sound { status = "okay"; compatible = "simple-audio-card"; @@ -146,26 +131,6 @@ #sound-dai-cells = <0>; }; - hdmi_sound: hdmi-sound { - status = "disabled"; - compatible = "simple-audio-card"; - simple-audio-card,format = "i2s"; - simple-audio-card,mclk-fs = <256>; - simple-audio-card,name = "rockchip,hdmi"; - simple-audio-card,cpu { - sound-dai = <&i2s2>; - }; - simple-audio-card,codec { - sound-dai = <&dw_hdmi_audio>; - }; - }; - - dw_hdmi_audio: dw-hdmi-audio { - status = "okay"; - compatible = "rockchip,dw-hdmi-audio"; - #sound-dai-cells = <0>; - }; - sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&rk808 1>; @@ -212,6 +177,10 @@ }; }; +&hdmi_dp_sound { + status = "okay"; +}; + &sdmmc { clock-frequency = <100000000>; clock-freq-min-max = <100000 100000000>; @@ -221,10 +190,11 @@ cap-sd-highspeed; disable-wp; num-slots = <1>; - sd-uhs-sdr104; + //sd-uhs-sdr104; vqmmc-supply = <&vcc_sd>; pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; + card-detect-delay = <800>; status = "okay"; }; @@ -247,9 +217,6 @@ }; &emmc_phy { - freq-sel = <200000000>; - dr-sel = <50>; - opdelay = <4>; status = "okay"; }; @@ -280,177 +247,6 @@ #sound-dai-cells = <0>; }; -&cluster0_opp { - opp@408000000 { - opp-hz = /bits/ 64 <408000000>; - opp-microvolt = <800000>; - clock-latency-ns = <40000>; - }; - opp@600000000 { - opp-hz = /bits/ 64 <600000000>; - opp-microvolt = <800000>; - }; - opp@816000000 { - opp-hz = /bits/ 64 <816000000>; - opp-microvolt = <800000>; - }; - opp@1008000000 { - opp-hz = /bits/ 64 <1008000000>; - opp-microvolt = <875000>; - }; - opp@1200000000 { - opp-hz = /bits/ 64 <1200000000>; - opp-microvolt = <925000>; - }; - opp@1416000000 { - opp-hz = /bits/ 64 <1416000000>; - opp-microvolt = <1050000>; - }; - opp@1512000000 { - opp-hz = /bits/ 64 <1512000000>; - opp-microvolt = <1125000>; - }; -}; - -&cluster1_opp { - opp@408000000 { - opp-hz = /bits/ 64 <408000000>; - opp-microvolt = <800000>; - clock-latency-ns = <40000>; - }; - opp@600000000 { - opp-hz = /bits/ 64 <600000000>; - opp-microvolt = <800000>; - }; - opp@816000000 { - opp-hz = /bits/ 64 <816000000>; - opp-microvolt = <825000>; - }; - opp@1008000000 { - opp-hz = /bits/ 64 <1008000000>; - opp-microvolt = <875000>; - }; - opp@1200000000 { - opp-hz = /bits/ 64 <1200000000>; - opp-microvolt = <950000>; - }; - opp@1416000000 { - opp-hz = /bits/ 64 <1416000000>; - opp-microvolt = <1025000>; - }; - opp@1608000000 { - opp-hz = /bits/ 64 <1608000000>; - opp-microvolt = <1100000>; - }; - opp@1800000000 { - opp-hz = /bits/ 64 <1800000000>; - opp-microvolt = <1175000>; - }; - opp@1992000000 { - opp-hz = /bits/ 64 <1992000000>; - opp-microvolt = <1250000>; - }; -}; - -&CPU_COST_A72 { - busy-cost-data = < - 210 129 /* 408MHz */ - 308 184 /* 600MHz */ - 419 246 /* 816MHz */ - 518 335 /* 1008MHz */ - 617 428 /* 1200MHz */ - 728 573 /* 1416MHz */ - 827 724 /* 1608MHz */ - 925 900 /* 1800MHz */ - 1024 1108 /* 1992MHz */ - >; - idle-cost-data = < - 15 - 15 - 0 - >; -}; - -&CPU_COST_A53 { - busy-cost-data = < - 108 46 /* 408M */ - 159 67 /* 600M */ - 216 90 /* 816M */ - 267 120 /* 1008M */ - 318 153 /* 1200M */ - 375 198 /* 1416M */ - 401 222 /* 1512M */ - >; - idle-cost-data = < - 6 - 6 - 0 - >; -}; - -&CLUSTER_COST_A72 { - busy-cost-data = < - 210 129 /* 408MHz */ - 308 184 /* 600MHz */ - 419 246 /* 816MHz */ - 518 335 /* 1008MHz */ - 617 428 /* 1200MHz */ - 728 573 /* 1416MHz */ - 827 724 /* 1608MHz */ - 925 900 /* 1800MHz */ - 1024 1108 /* 1992MHz */ - >; - idle-cost-data = < - 65 - 65 - 65 - >; -}; - -&CLUSTER_COST_A53 { - busy-cost-data = < - 108 46 /* 408M */ - 159 67 /* 600M */ - 216 90 /* 816M */ - 267 120 /* 1008M */ - 318 153 /* 1200M */ - 375 198 /* 1416M */ - 401 222 /* 1512M */ - >; - idle-cost-data = < - 56 - 56 - 56 - >; -}; - -&gpu_opp_table { - opp@200000000 { - opp-hz = /bits/ 64 <200000000>; - opp-microvolt = <800000>; - }; - opp@300000000 { - opp-hz = /bits/ 64 <300000000>; - opp-microvolt = <800000>; - }; - opp@400000000 { - opp-hz = /bits/ 64 <400000000>; - opp-microvolt = <800000>; - }; - opp@500000000 { - opp-hz = /bits/ 64 <500000000>; - opp-microvolt = <900000>; - }; - opp@600000000 { - opp-hz = /bits/ 64 <600000000>; - opp-microvolt = <900000>; - }; - opp@800000000 { - opp-hz = /bits/ 64 <800000000>; - opp-microvolt = <1000000>; - }; -}; - &i2c0 { status = "okay"; i2c-scl-rising-time-ns = <168>; @@ -461,11 +257,13 @@ compatible = "silergy,syr827"; reg = <0x40>; regulator-compatible = "fan53555-reg"; + pinctrl-0 = <&vsel1_gpio>; + vsel-gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>; regulator-name = "vdd_cpu_b"; regulator-min-microvolt = <712500>; regulator-max-microvolt = <1500000>; regulator-ramp-delay = <1000>; - fcs,suspend-voltage-selector = <0>; + fcs,suspend-voltage-selector = <1>; regulator-always-on; regulator-boot-on; vin-supply = <&vcc_sys>; @@ -478,6 +276,8 @@ compatible = "silergy,syr828"; reg = <0x41>; regulator-compatible = "fan53555-reg"; + pinctrl-0 = <&vsel2_gpio>; + vsel-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; regulator-name = "vdd_gpu"; regulator-min-microvolt = <712500>; regulator-max-microvolt = <1500000>; @@ -522,6 +322,7 @@ regulator-name = "vdd_center"; regulator-min-microvolt = <750000>; regulator-max-microvolt = <1350000>; + regulator-ramp-delay = <6001>; regulator-always-on; regulator-boot-on; regulator-state-mem { @@ -533,6 +334,7 @@ regulator-name = "vdd_cpu_l"; regulator-min-microvolt = <750000>; regulator-max-microvolt = <1350000>; + regulator-ramp-delay = <6001>; regulator-always-on; regulator-boot-on; regulator-state-mem { @@ -707,10 +509,6 @@ mali-supply = <&vdd_gpu>; }; -&rga { - status = "okay"; -}; - &threshold { temperature = <85000>; }; @@ -823,7 +621,7 @@ interrupts = ; compatible = "rockchip,remotectl-pwm"; remote_pwm_id = <3>; - handle_cpu_id = <0>; + handle_cpu_id = <1>; ir_key1 { rockchip,usercode = <0x4040>; @@ -874,6 +672,7 @@ <0xa5 KEY_VOLUMEDOWN>, <0xab 183>, <0xb7 388>, + <0xe8 388>, <0xf8 184>, <0xaf 185>, <0xed KEY_VOLUMEDOWN>, @@ -940,40 +739,17 @@ status = "okay"; }; -&rk_screen { - #include -}; - -&disp_timings { - native-mode = <&timing1>; /* 1080p */ -}; - -&vopb_rk_fb { - status = "okay"; -}; - -&fb { - rockchip,disp-mode = ; - rockchip,disp-policy = ; -}; - -&hdmi_rk_fb { - status = "okay"; - rockchip,hdmi_video_source = ; -}; - -&cdn_dp_sound { +&i2s2 { status = "okay"; }; -&cdn_dp_fb { +&io_domains { status = "okay"; - extcon = <&fusb0>; - phys = <&tcphy0 0>; -}; -&i2s2 { - status = "okay"; + bt656-supply = <&vcc1v8_s0>; /* bt656_gpio2ab_ms */ + audio-supply = <&vcc1v8_s0>; /* audio_gpio3d4a_ms */ + sdmmc-supply = <&vcc_sd>; /* sdmmc_gpio4b_ms */ + gpio1830-supply = <&vcc_3v0>; /* gpio1833_gpio4cd_ms */ }; &pinctrl { @@ -1003,6 +779,16 @@ rockchip,pins = <1 21 RK_FUNC_GPIO &pcfg_pull_up>; }; + + vsel1_gpio: vsel1-gpio { + rockchip,pins = + <1 17 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + vsel2_gpio: vsel2-gpio { + rockchip,pins = + <1 14 RK_FUNC_GPIO &pcfg_pull_down>; + }; }; gmac { @@ -1012,3 +798,55 @@ }; }; }; + +&pvtm { + status = "okay"; +}; + +&pmu_pvtm { + status = "okay"; +}; + +&pmu_io_domains { + status = "okay"; + pmu1830-supply = <&vcc_1v8>; +}; + +&rockchip_suspend { + status = "okay"; + rockchip,sleep-debug-en = <0>; + rockchip,sleep-mode-config = < + (0 + | RKPM_SLP_ARMPD + | RKPM_SLP_PERILPPD + | RKPM_SLP_DDR_RET + | RKPM_SLP_PLLPD + | RKPM_SLP_CENTER_PD + | RKPM_SLP_AP_PWROFF + ) + >; + rockchip,wakeup-config = < + (0 + | RKPM_GPIO_WKUP_EN + | RKPM_PWM_WKUP_EN + ) + >; + rockchip,pwm-regulator-config = < + (0 + | PWM2_REGULATOR_EN + ) + >; + rockchip,power-ctrl = + <&gpio1 17 GPIO_ACTIVE_HIGH>, + <&gpio1 14 GPIO_ACTIVE_HIGH>; +}; + +&vopb { + assigned-clocks = <&cru DCLK_VOP0_DIV>; + assigned-clock-parents = <&cru PLL_VPLL>; +}; + +&vopl { + assigned-clocks = <&cru DCLK_VOP1_DIV>; + assigned-clock-parents = <&cru PLL_CPLL>; +};