diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi index 5b9eaf4c5..821edc6c6 100644 --- a/kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi +++ b/kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi @@ -87,27 +87,6 @@ backlight: backlight { default-brightness-level = <200>; }; - rk817-sound { - compatible = "rockchip,multicodecs-card"; - rockchip,card-name = "rockchip-rk817"; - hp-det-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; - io-channels = <&saradc 1>; - io-channel-names = "adc-detect"; - keyup-threshold-microvolt = <1800000>; - poll-interval = <100>; - rockchip,format = "i2s"; - rockchip,mclk-fs = <256>; - rockchip,cpu = <&i2s1_2ch>; - rockchip,codec = <&rk817_codec>; - pinctrl-names = "default"; - pinctrl-0 = <&hp_det>; - play-pause-key { - label = "playpause"; - linux,code = ; - press-threshold-microvolt = <2000>; - }; - }; - sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; /*clocks = <&rk817 1>;*/ @@ -128,13 +107,13 @@ test-power { status = "okay"; }; - vccsys: vccsys { + vcc5v0_sys: vccsys { compatible = "regulator-fixed"; - regulator-name = "vcc3v8_sys"; + regulator-name = "vcc5v0_sys"; regulator-always-on; regulator-boot-on; - regulator-min-microvolt = <3800000>; - regulator-max-microvolt = <3800000>; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; }; wireless-wlan { @@ -147,7 +126,7 @@ wireless-wlan { wireless-bluetooth { compatible = "bluetooth-platdata"; - clocks = <&rk817 1>; + clocks = <&rk809 1>; clock-names = "ext_clock"; uart_rts_gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_LOW>; pinctrl-names = "default","rts_gpio"; @@ -342,8 +321,8 @@ &i2c0 { i2c-scl-rising-time-ns = <280>; i2c-scl-falling-time-ns = <16>; - rk817: pmic@20 { - compatible = "rockchip,rk817"; + rk809: pmic@20 { + compatible = "rockchip,rk809"; reg = <0x20>; interrupt-parent = <&gpio0>; interrupts = <7 IRQ_TYPE_LEVEL_LOW>; @@ -361,15 +340,15 @@ rk817: pmic@20 { /* 1: rst regs (default in codes), 0: rst the pmic */ pmic-reset-func = <1>; - vcc1-supply = <&vccsys>; - vcc2-supply = <&vccsys>; - vcc3-supply = <&vccsys>; - vcc4-supply = <&vccsys>; - vcc5-supply = <&vccsys>; - vcc6-supply = <&vccsys>; - vcc7-supply = <&vcc_3v0>; - vcc8-supply = <&vccsys>; - vcc9-supply = <&dcdc_boost>; + vcc1-supply = <&vcc5v0_sys>; + vcc2-supply = <&vcc5v0_sys>; + vcc3-supply = <&vcc5v0_sys>; + vcc4-supply = <&vcc5v0_sys>; + vcc5-supply = <&vcc3v3_sys>; + vcc6-supply = <&vcc3v3_sys>; + vcc7-supply = <&vcc3v3_sys>; + vcc8-supply = <&vcc3v3_sys>; + vcc9-supply = <&vcc5v0_sys>; pwrkey { status = "okay"; @@ -474,6 +453,18 @@ regulator-state-mem { }; }; + vcc3v3_sys: DCDC_REG5 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc3v3_sys"; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <3300000>; + }; + }; + vcc_1v0: LDO_REG1 { regulator-always-on; regulator-boot-on; @@ -603,49 +594,6 @@ otg_switch: OTG_SWITCH { }; }; - battery { - compatible = "rk817,battery"; - ocv_table = <3500 3625 3685 3697 3718 3735 3748 - 3760 3774 3788 3802 3816 3834 3853 - 3877 3908 3946 3975 4018 4071 4106>; - design_capacity = <2500>; - design_qmax = <2750>; - bat_res = <100>; - sleep_enter_current = <300>; - sleep_exit_current = <300>; - sleep_filter_current = <100>; - power_off_thresd = <3500>; - zero_algorithm_vol = <3850>; - max_soc_offset = <60>; - monitor_sec = <5>; - sample_res = <10>; - virtual_power = <1>; - }; - - charger { - compatible = "rk817,charger"; - min_input_voltage = <4500>; - max_input_current = <1500>; - max_chrg_current = <2000>; - max_chrg_voltage = <4200>; - chrg_term_mode = <0>; - chrg_finish_cur = <300>; - virtual_power = <0>; - dc_det_adc = <0>; - extcon = <&u2phy>; - }; - - rk817_codec: codec { - #sound-dai-cells = <0>; - compatible = "rockchip,rk817-codec"; - clocks = <&cru SCLK_I2S1_OUT>; - clock-names = "mclk"; - pinctrl-names = "default"; - pinctrl-0 = <&i2s1_2ch_mclk>; - hp-volume = <20>; - spk-volume = <3>; - status = "okay"; - }; }; }; diff --git a/myburn b/myburn new file mode 120000 index 000000000..3cb500623 --- /dev/null +++ b/myburn @@ -0,0 +1 @@ +/home/hyx/work/linuxOS_AP06/tools/linux/Linux_Upgrade_Tool/Linux_Upgrade_Tool \ No newline at end of file diff --git a/tools/linux/Linux_Upgrade_Tool/Linux_Upgrade_Tool/myburn.sh b/tools/linux/Linux_Upgrade_Tool/Linux_Upgrade_Tool/myburn.sh new file mode 100755 index 000000000..feb537759 --- /dev/null +++ b/tools/linux/Linux_Upgrade_Tool/Linux_Upgrade_Tool/myburn.sh @@ -0,0 +1 @@ +sudo ./upgrade_tool uf /home/hyx/work/linuxOS_AP06/rockdev/update.img