diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts index 6fd008542ba4..eeca9cf54373 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g-avb.dts @@ -8,34 +8,19 @@ / { compatible = "rockchip,rk3399-tve1030g-avb", "rockchip,rk3399"; - chosen { - bootargs = "earlycon=uart8250,mmio32,0xff1a0000 swiotlb=1 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m"; - }; - -}; - -&firmware_android { - compatible = "android,firmware"; - boot_devices = "fe330000.sdhci"; - vbmeta { - compatible = "android,vbmeta"; - parts = "vbmeta,boot,system,vendor,dtbo"; - }; - fstab { - compatible = "android,fstab"; - vendor { - compatible = "android,vendor"; - dev = "/dev/block/by-name/vendor"; - type = "ext4"; - mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; - fsmgr_flags = "wait,avb"; - }; - }; }; &i2c1 { status = "okay"; + vm149c: vm149c@0c { + compatible = "silicon touch,vm149c"; + status = "okay"; + reg = <0x0c>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + }; + ov13850: ov13850@10 { compatible = "ovti,ov13850"; status = "disabled"; @@ -50,6 +35,11 @@ pwdn-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; pinctrl-names = "rockchip,camera_default"; pinctrl-0 = <&cif_clkout>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "CMK-CT0116"; + rockchip,camera-module-lens-name = "Largan-50013A1"; + lens-focus = <&vm149c>; port { ucam_out0: endpoint { remote-endpoint = <&mipi_in_ucam0>; @@ -72,6 +62,10 @@ pwdn-gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>; pinctrl-names = "rockchip,camera_default"; pinctrl-0 = <&cif_clkout>; + rockchip,camera-module-index = <1>; + rockchip,camera-module-facing = "front"; + rockchip,camera-module-name = "CMK-CW2392"; + rockchip,camera-module-lens-name = "M206A-201"; port { ucam_out1: endpoint { //remote-endpoint = <&mipi_in_ucam0>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi index c066349f7b29..691ca3d0777c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1030g.dtsi @@ -11,6 +11,7 @@ #include "rk3399-android.dtsi" #include "rk3399-opp.dtsi" #include "rk3399-vop-clk-set.dtsi" +#include / { backlight: backlight { @@ -68,9 +69,11 @@ "Headphone Jack", "HPOR"; simple-audio-card,cpu { sound-dai = <&i2s0>; + system-clock-frequency = <11289600>; }; simple-audio-card,codec { sound-dai = <&es8316>; + system-clock-frequency = <11289600>; }; }; @@ -82,6 +85,15 @@ io-channels = <&saradc 2>; }; + charge-animation { + compatible = "rockchip,uboot-charge"; + rockchip,uboot-charge-on = <1>; + rockchip,android-charge-on = <0>; + rockchip,uboot-low-power-voltage = <6700>; + rockchip,screen-on-voltage = <6800>; + status = "okay"; + }; + sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&rk808 1>; @@ -98,12 +110,6 @@ reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; }; - uboot-charge { - compatible = "rockchip,uboot-charge"; - rockchip,uboot-charge-on = <0>; - rockchip,android-charge-on = <1>; - }; - vcc_sys: vcc-sys { compatible = "regulator-fixed"; regulator-name = "vcc_sys"; @@ -177,6 +183,23 @@ }; }; +&adc_keys { + compatible = "adc-keys"; + io-channels = <&saradc 1>; + keyup-threshold-microvolt = <1800000>; + vol-up-key { + label = "volume up"; + linux,code = ; + press-threshold-microvolt = <1000>; + }; + + vol-down-key { + label = "volume down"; + linux,code = ; + press-threshold-microvolt = <170000>; + }; +}; + &cdn_dp { status = "okay"; extcon = <&fusb0>; @@ -213,66 +236,88 @@ &dmc { status = "okay"; + center-supply = <&vdd_center>; + upthreshold = <20>; + downdifferential = <10>; system-status-freq = < /*system status freq(KHz)*/ - SYS_STATUS_NORMAL 800000 - SYS_STATUS_REBOOT 400000 - SYS_STATUS_SUSPEND 400000 - SYS_STATUS_VIDEO_1080P 800000 - SYS_STATUS_VIDEO_4K 800000 - SYS_STATUS_VIDEO_4K_10B 800000 - SYS_STATUS_PERFORMANCE 800000 - SYS_STATUS_BOOST 800000 - SYS_STATUS_DUALVIEW 800000 - SYS_STATUS_ISP 800000 + SYS_STATUS_NORMAL 856000 + SYS_STATUS_REBOOT 856000 + SYS_STATUS_SUSPEND 416000 + SYS_STATUS_VIDEO_1080P 416000 + SYS_STATUS_VIDEO_4K 666000 + SYS_STATUS_VIDEO_4K_10B 856000 + SYS_STATUS_PERFORMANCE 856000 + SYS_STATUS_BOOST 856000 + SYS_STATUS_DUALVIEW 856000 + SYS_STATUS_ISP 856000 >; - auto-min-freq = <400000>; - auto-freq-en = <0>; + vop-bw-dmc-freq = < + /* min_bw(MB/s) max_bw(MB/s) freq(KHz) */ + 0 762 328000 + 763 3012 666000 + 3013 99999 856000 + >; + + auto-min-freq = <328000>; + auto-freq-en = <1>; }; &dmc_opp_table { - compatible = "operating-points-v2"; + compatible = "operating-points-v2"; - opp-200000000 { - opp-hz = /bits/ 64 <200000000>; - opp-microvolt = <900000>; - status = "disabled"; - }; - opp-300000000 { - opp-hz = /bits/ 64 <300000000>; - opp-microvolt = <900000>; - status = "disabled"; - }; - opp-400000000 { - opp-hz = /bits/ 64 <400000000>; - opp-microvolt = <900000>; - }; - opp-528000000 { - opp-hz = /bits/ 64 <528000000>; - opp-microvolt = <900000>; - status = "disabled"; - }; - opp-600000000 { - opp-hz = /bits/ 64 <600000000>; - opp-microvolt = <900000>; - status = "disabled"; - }; - opp-800000000 { - opp-hz = /bits/ 64 <800000000>; - opp-microvolt = <900000>; - }; - opp-928000000 { - opp-hz = /bits/ 64 <928000000>; - opp-microvolt = <900000>; - status = "disabled"; - }; - opp-1056000000 { - opp-hz = /bits/ 64 <1056000000>; - opp-microvolt = <900000>; - status = "disabled"; - }; + opp-200000000 { + opp-hz = /bits/ 64 <200000000>; + opp-microvolt = <900000>; + status = "disabled"; + }; + opp-300000000 { + opp-hz = /bits/ 64 <300000000>; + opp-microvolt = <900000>; + status = "disabled"; + }; + opp-328000000 { + opp-hz = /bits/ 64 <328000000>; + opp-microvolt = <900000>; + }; + opp-400000000 { + opp-hz = /bits/ 64 <400000000>; + opp-microvolt = <900000>; + status = "disabled"; + }; + opp-416000000 { + opp-hz = /bits/ 64 <416000000>; + opp-microvolt = <900000>; + }; + opp-528000000 { + opp-hz = /bits/ 64 <528000000>; + opp-microvolt = <900000>; + status = "disabled"; + }; + opp-600000000 { + opp-hz = /bits/ 64 <600000000>; + opp-microvolt = <900000>; + status = "disabled"; + }; + opp-666000000 { + opp-hz = /bits/ 64 <666000000>; + opp-microvolt = <900000>; + }; + opp-800000000 { + opp-hz = /bits/ 64 <800000000>; + opp-microvolt = <900000>; + status = "disabled"; + }; + opp-856000000 { + opp-hz = /bits/ 64 <856000000>; + opp-microvolt = <900000>; + }; + opp-928000000 { + opp-hz = /bits/ 64 <928000000>; + opp-microvolt = <900000>; + status = "disabled"; + }; }; - &dp_in_vopb { status = "disabled"; }; @@ -285,7 +330,6 @@ compatible = "simple-panel-dsi"; reg = <0>; backlight = <&backlight>; - power-supply = <&vcc3v3_s0>; reset-gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&lcd_rst_gpio>; @@ -295,7 +339,7 @@ unprepare-delay-ms = <60>; disable-delay-ms = <60>; dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST | - MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>; + MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>; dsi,format = ; dsi,lanes = <4>; panel-init-sequence = [ @@ -561,6 +605,7 @@ }; vcc3v3_s0: SWITCH_REG2 { regulator-boot-on; + regulator-always-on; regulator-name = "vcc3v3_s0"; regulator-state-mem { regulator-off-in-suspend; @@ -803,32 +848,7 @@ &pwm2 { status = "okay"; pinctrl-names = "active"; - pinctrl-0 = <&pwm2_pin_pull_down>;v -}; - -&rk_key { - status = "okay"; - compatible = "rockchip,key"; - io-channels = <&saradc 1>; - - vol-up-key { - linux,code = <114>; - label = "volume up"; - rockchip,adc_value = <170>; - }; - - vol-down-key { - linux,code = <115>; - label = "volume down"; - rockchip,adc_value = <1>; - }; - - power-key { - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; - linux,code = <116>; - label = "power"; - gpio-key,wakeup; - }; + pinctrl-0 = <&pwm2_pin_pull_down>; }; &rockchip_suspend { @@ -945,7 +965,7 @@ }; &uart2 { - status = "okay"; + status = "disabled"; }; &usb_host0_ehci {