From 2b26ab132d1b33b91c84c6d732456200e8c5ee77 Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Fri, 24 Nov 2023 08:39:05 +0000 Subject: [PATCH] add support 4g -- >ppp --- kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi | 115 +++++++++++++++++++++++++++++++-------------------------- 1 files changed, 62 insertions(+), 53 deletions(-) diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi old mode 100644 new mode 100755 index 86ac12f..e502251 --- a/kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi +++ b/kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi @@ -103,7 +103,7 @@ backlight1: backlight1 { compatible = "pwm-backlight"; - pwms = <&pwm5 0 25000 0>; + pwms = <&pwm6 0 25000 0>; brightness-levels = < 0 20 20 21 21 22 22 23 23 24 24 25 25 26 26 27 @@ -141,6 +141,27 @@ default-brightness-level = <200>; }; + bt_sco: bt-sco { + status = "disabled"; + compatible = "delta,dfbmcs320"; + #sound-dai-cells = <1>; + }; + + bt_sound: bt-sound { + status = "disabled"; + compatible = "simple-audio-card"; + simple-audio-card,format = "dsp_a"; + simple-audio-card,bitclock-inversion = <0>; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,name = "rockchip,bt"; + simple-audio-card,cpu { + sound-dai = <&i2s3_2ch>; + }; + simple-audio-card,codec { + sound-dai = <&bt_sco 1>; + }; + }; + dc_12v: dc-12v { compatible = "regulator-fixed"; regulator-name = "dc_12v"; @@ -161,8 +182,8 @@ leds: leds { compatible = "gpio-leds"; - work_led: work { - gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>; + sys_led: sys_led { + gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>; linux,default-trigger = "heartbeat"; }; }; @@ -187,17 +208,15 @@ rk809_sound: rk809-sound { status = "okay"; - compatible = "simple-audio-card"; - simple-audio-card,format = "i2s"; - simple-audio-card,name = "rockchip,rk809-codec"; - simple-audio-card,mclk-fs = <256>; - - simple-audio-card,cpu { - sound-dai = <&i2s1_8ch>; - }; - simple-audio-card,codec { - sound-dai = <&rk809_codec>; - }; + compatible = "rockchip,multicodecs-card"; + rockchip,card-name = "rockchip-rk809"; + hp-det-gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_LOW>; + rockchip,format = "i2s"; + rockchip,mclk-fs = <256>; + rockchip,cpu = <&i2s1_8ch>; + rockchip,codec = <&rk809_codec>; + pinctrl-names = "default"; + pinctrl-0 = <&hp_det>; }; spdif-sound { @@ -289,7 +308,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; enable-active-high; - gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; + gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3 vin-supply = <&vcc3v3_sys>; regulator-state-mem { @@ -326,29 +345,18 @@ * - PDN (power down when low) */ post-power-on-delay-ms = <200>; - reset-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; }; wireless_wlan: wireless-wlan { compatible = "wlan-platdata"; rockchip,grf = <&grf>; wifi_chip_type = "ap6398s"; - status = "okay"; + status = "disabled"; }; wireless_bluetooth: wireless-bluetooth { - compatible = "bluetooth-platdata"; - clocks = <&rk809 1>; - clock-names = "ext_clock"; - //wifi-bt-power-toggle; - uart_rts_gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; - pinctrl-names = "default", "rts_gpio"; - pinctrl-0 = <&uart8m0_rtsn>; - pinctrl-1 = <&uart8_gpios>; - BT,reset_gpio = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; - status = "okay"; + status = "disabled"; }; test-power { @@ -1103,7 +1111,6 @@ regulator-min-microvolt = <712500>; regulator-max-microvolt = <1390000>; regulator-init-microvolt = <900000>; - regulator-initial-mode = <1>; regulator-ramp-delay = <2300>; fcs,suspend-voltage-selector = <1>; regulator-boot-on; @@ -1265,8 +1272,8 @@ vccio_acodec: LDO_REG4 { regulator-always-on; regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; regulator-name = "vccio_acodec"; regulator-state-mem { regulator-off-in-suspend; @@ -1380,15 +1387,6 @@ &i2c1 { status = "okay"; - - gt1x: gt1x@14 { - compatible = "goodix,gt1x"; - reg = <0x14>; - pinctrl-names = "default"; - pinctrl-0 = <&touch_gpio>; - goodix,rst-gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>; - goodix,irq-gpio = <&gpio0 RK_PB5 IRQ_TYPE_LEVEL_LOW>; - }; }; &i2c5 { @@ -1421,6 +1419,12 @@ &i2s1m0_lrcktx &i2s1m0_sdi0 &i2s1m0_sdo0>; +}; + +&i2s3_2ch { + pinctrl-0 = <&i2s3m0_sclk &i2s3m0_lrck &i2s3m0_sdi &i2s3m0_sdo>; + rockchip,bclk-fs = <32>; + status = "disabled"; }; &iep { @@ -1458,6 +1462,12 @@ }; &pinctrl { + + headphone { + hp_det: hp-det { + rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>; + }; + }; mxc6655xa { mxc6655xa_irq_gpio: mxc6655xa_irq_gpio { @@ -1497,7 +1507,7 @@ sdio-pwrseq { wifi_enable_h: wifi-enable-h { - rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>; + rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; }; }; @@ -1511,11 +1521,6 @@ }; }; - wireless-bluetooth { - uart8_gpios: uart8-gpios { - rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; }; /* @@ -1539,13 +1544,17 @@ pmuio2-supply = <&vcc3v3_pmu>; vccio1-supply = <&vccio_acodec>; vccio3-supply = <&vccio_sd>; - vccio4-supply = <&vcc_3v3>; + vccio4-supply = <&vcc_1v8>; vccio5-supply = <&vcc_3v3>; - vccio6-supply = <&vcc_3v3>; + vccio6-supply = <&vcc_1v8>; vccio7-supply = <&vcc_3v3>; }; &pwm4 { + status = "okay"; +}; + +&pwm6 { status = "okay"; }; @@ -1554,7 +1563,7 @@ }; &pwm7 { - status = "okay"; + status = "disabled"; compatible = "rockchip,remotectl-pwm"; remote_pwm_id = <3>; @@ -1778,7 +1787,7 @@ }; &usbdrd_dwc3 { - dr_mode = "otg"; + dr_mode = "host"; extcon = <&usb2phy0>; status = "okay"; }; @@ -1820,8 +1829,8 @@ &vop { status = "okay"; - assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>; - assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>; + assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>, <&cru DCLK_VOP2>; + assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>, <&cru PLL_GPLL>; }; &vop_mmu { -- Gitblit v1.6.2