X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=blobdiff_plain;f=arch%2Farm%2Fboot%2Fdts%2Frk312x-sdk.dtsi;h=8d042fcee83f8acb141a22fd156c8d4ec1a34e98;hp=99894420a8fff85435d071d2b77000ff79dce780;hb=0ac6417c7fad8dbb9bb17138b05b746766204ca4;hpb=81b6065911b0861d57e4a072cad00312d1aad681 diff --git a/arch/arm/boot/dts/rk312x-sdk.dtsi b/arch/arm/boot/dts/rk312x-sdk.dtsi index 99894420a8ff..8d042fcee83f 100755 --- a/arch/arm/boot/dts/rk312x-sdk.dtsi +++ b/arch/arm/boot/dts/rk312x-sdk.dtsi @@ -1,8 +1,3 @@ -/dts-v1/; - -#include "rk312x.dtsi" -#include "rk3126-cif-sensor.dtsi" -#include "rk3128-cif-sensor.dtsi" / { fiq-debugger { @@ -10,7 +5,7 @@ }; chosen { - bootargs = "vmalloc=496M"; + bootargs = "vmalloc=496M rockchip_jtag"; }; pwm_regulator1:pwm-regulator1 { @@ -74,8 +69,8 @@ }; &emmc { - clock-frequency = <37500000>; - clock-freq-min-max = <400000 37500000>; + clock-frequency = <50000000>; + clock-freq-min-max = <400000 50000000>; supports-highspeed; supports-emmc; bootpart-no-access; @@ -83,7 +78,7 @@ ignore-pm-notify; keep-power-in-suspend; //poll-hw-reset - status = "disabled"; + status = "okay"; }; &sdmmc { @@ -169,14 +164,20 @@ reg = <0x1c>; status = "okay"; }; + act8931: act8931@5b { + reg = <0x5b>; + status = "okay"; + }; rt5025: rt5025@35 { compatible = "rt,rt5025"; reg = <0x35>; - status = "okay"; + status = "disabled"; + }; + rt5036: rt5036@38 { + compatible = "rt,rt5036"; + reg = <0x38>; + status = "disabled"; }; -}; -&i2c1 { - status = "okay"; }; &i2c2 { @@ -308,6 +309,136 @@ }; }; +/include/ "rt5036.dtsi" +&rt5036 { + + rt5036_dcdc1: regulator_0 { + regulator-name = "vdd_arm"; + regulator-min-microvolt = < 800000>; + regulator-max-microvolt = <3300000>; + qcom,comsumer-supplies = "vdd_arm", ""; + regulator-always-on; + regulator-boot-on; + rt,standby_enabled; + rt,standby_vol = <950000>; + }; + + rt5036_dcdc2: regulator_1 { + regulator-name = "vdd_logic"; + regulator-min-microvolt = < 800000>; + regulator-max-microvolt = <3300000>; + qcom,comsumer-supplies = "vdd_logic", ""; + regulator-always-on; + regulator-boot-on; + rt,standby_enabled; + rt,standby_vol = <950000>; + }; + + rt5036_dcdc3: regulator_2 { + regulator-name = "rt5036-dcdc3"; + regulator-min-microvolt = < 800000>; + regulator-max-microvolt = <3300000>; + qcom,comsumer-supplies = "rt5036-dcdc3", ""; + regulator-always-on; + regulator-boot-on; + rt,standby_enabled; + rt,standby_vol = <2800000>; + }; + + rt5036_dcdc4: regulator_3 { + regulator-name = "rt5036-dcdc4"; + regulator-min-microvolt = < 800000>; + regulator-max-microvolt = <3300000>; + qcom,comsumer-supplies = "rt5036-dcdc4", ""; + regulator-always-on; + regulator-boot-on; + rt,standby_enabled; + rt,standby_vol = <1200000>; + }; + + rt5036_ldo1: regulator_4 { + regulator-name = "rt5036-ldo1"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + qcom,comsumer-supplies = "rt5036-ldo1", ""; + regulator-always-on; + regulator-boot-on; + rt,standby_enabled; + rt,standby_vol = <1200000>; + }; + + rt5036_ldo2: regulator_5 { + regulator-name = "rt5036-ldo2"; + regulator-min-microvolt = < 1100000>; + regulator-max-microvolt = <1100000>; + qcom,comsumer-supplies = "rt5036-ldo2", ""; + regulator-always-on; + regulator-boot-on; + rt,standby_enabled; + rt,standby_vol = <1100000>; + }; + + rt5036_ldo3: regulator_6 { + regulator-name = "rt5036-ldo3"; + regulator-min-microvolt = < 1800000>; + regulator-max-microvolt = <1800000>; + qcom,comsumer-supplies = "rt5036-ldo3", ""; + regulator-always-on; + regulator-boot-on; + rt,standby_enabled; + rt,standby_vol = <1800000>; + }; + + rt5036_ldo4: regulator_7 { + regulator-name = "rt5036-ldo4"; + regulator-min-microvolt = < 1800000>; + regulator-max-microvolt = <1800000>; + qcom,comsumer-supplies = "rt5036-ldo4", ""; + regulator-always-on; + regulator-boot-on; + rt,standby_enabled; + rt,standby_vol = <1800000>; + }; + + rt5036_ldo5: regulator_8 { + regulator-name = "rt5036-ldo5"; + qcom,comsumer-supplies = "rt5036-ldo5", ""; + regulator-always-on; + regulator-boot-on; + rt,standby_enabled; + }; + + rt5036_ldo6: regulator_9 { + regulator-name = "rt5036-ldo6"; + qcom,comsumer-supplies = "rt5036-ldo6", ""; + regulator-always-on; + regulator-boot-on; + rt,standby_enabled; + }; + + rt5036-irq { + compatible = "rt,rt5036-irq"; + rt,irq-gpio = <&gpio1 GPIO_B1 GPIO_ACTIVE_HIGH>; + }; + + rt5036-charger { + compatible = "rt,rt5036-charger"; + rt,te_en; + rt,iprec = <0x2>; + rt,ieoc = <0x3>; + rt,vprec = <0xA>; + rt,batlv = <0x4>; + rt,vrechg = <1>; + rt,chg_volt = <4200>; + rt,otg_volt = <5025>; + rt,acchg_icc = <2000>; + rt,usbtachg_icc = <2000>; + rt,usbchg_icc = <900>; + /*rt,acdet_gpio = <&gpio1 GPIO_B1 GPIO_ACTIVE_HIGH>;*/ + /*rt,usbdet_gpio = <&gpio1 GPIO_B1 GPIO_ACTIVE_HIGH>;*/ + }; +}; + /include/ "rk818.dtsi" &rk818 { gpios =<&gpio1 GPIO_B1 GPIO_ACTIVE_HIGH>,<&gpio1 GPIO_A1 GPIO_ACTIVE_LOW>; @@ -477,61 +608,80 @@ design_capacity = <2100>; design_qmax = <2200>; max_overcharge = <100>; - max_charge_currentmA = <1500>; - max_charge_voltagemV = <4260>; + bat_res = <80>; + max_input_currentmA = <2000>; + max_chrg_currentmA = <1800>; + max_charge_voltagemV = <4200>; max_bat_voltagemV = <4200>; + sleep_enter_current = <300>; + sleep_exit_current = <300>; + power_off_thresd = <3400>; + chrg_diff_voltagemV = <0>; + virtual_power = <0>; + support_usb_adp = <0>; + support_dc_adp = <0>; + power_dc2otg = <0>; }; + test-power{ + status = "okay"; + }; }; -&clk_core_dvfs_table { - operating-points = < - /* KHz uV */ - 408000 1250000 - 600000 1250000 - 696000 1250000 - 816000 1250000 - 1008000 1250000 - >; - status="okay"; -}; -&clk_gpu_dvfs_table { - operating-points = < - /* KHz uV */ - 200000 1250000 - 300000 1250000 - >; - status="okay"; -}; +/include/ "act8931.dtsi" +&act8931 { + /* gpio: 0-irq, 1-pwr_hold */ + gpios = <&gpio2 GPIO_B1 GPIO_ACTIVE_HIGH>, <&gpio1 GPIO_A2 GPIO_ACTIVE_HIGH>; + act8931,system-power-controller; + + regulators { + + act8931_dcdc1_reg: regulator@0{ + regulator-name= "vccio"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-initial-mode = <0x2>; + }; + + act8931_dcdc2_reg: regulator@1 { + regulator-name= "act_dcdc2"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + regulator-initial-mode = <0x2>; + }; + + act8931_dcdc3_reg: regulator@2 { + regulator-name= "vdd_arm"; + regulator-min-microvolt = <700000>; + regulator-max-microvolt = <1500000>; + regulator-initial-mode = <0x2>; + }; + + act8931_ldo1_reg:regulator@3 { + regulator-name= "act_ldo1"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + }; + + act8931_ldo2_reg: regulator@4 { + regulator-name= "act_ldo2"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + act8931_ldo3_reg: regulator@5 { + regulator-name= "act_ldo3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + act8931_ldo4_reg: regulator@6 { + regulator-name= "act_ldo4"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + }; -&clk_ddr_dvfs_table { - operating-points = < - /* KHz uV */ - 200000 950000 - 300000 950000 - 400000 1000000 - 533000 1050000 - >; - - freq-table = < - /*status freq(KHz)*/ - SYS_STATUS_NORMAL 400000 - SYS_STATUS_SUSPEND 200000 - SYS_STATUS_VIDEO_1080P 240000 - SYS_STATUS_VIDEO_4K 400000 - SYS_STATUS_PERFORMANCE 528000 - SYS_STATUS_DUALVIEW 400000 - SYS_STATUS_BOOST 324000 - SYS_STATUS_ISP 533000 - >; - auto-freq-table = < - 240000 - 324000 - 396000 - 528000 - >; - auto-freq=<0>; - status="okay"; }; &pwm0 {