diff --git a/patch/kernel/archive/rockchip64-5.10/board-firefly-rk3399-04-dts-fix.patch b/patch/kernel/archive/rockchip64-5.10/board-firefly-rk3399-04-dts-fix.patch index a0f0028ca8..a861a556e3 100644 --- a/patch/kernel/archive/rockchip64-5.10/board-firefly-rk3399-04-dts-fix.patch +++ b/patch/kernel/archive/rockchip64-5.10/board-firefly-rk3399-04-dts-fix.patch @@ -473,7 +473,7 @@ &i2c4 { i2c-scl-rising-time-ns = <600>; i2c-scl-falling-time-ns = <20>; -@@ -523,48 +119,6 @@ +@@ -523,49 +119,21 @@ }; }; @@ -520,22 +520,24 @@ -}; - &pinctrl { - bt { - bt_host_wake_l: bt-host-wake-l { -@@ -642,12 +196,6 @@ - }; - }; - -- wifi { -- wifi_host_wake_l: wifi-host-wake-l { -- rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; -- }; -- }; -- - leds { - work_led_pin: work-led-pin { - rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>; -@@ -659,50 +207,6 @@ ++ bt { ++ bt_host_wake_l: bt-host-wake-l { ++ rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ bt_reg_on_h: bt-reg-on-h { ++ rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ bt_wake_l: bt-wake-l { ++ rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++ + buttons { + pwrbtn: pwrbtn { + rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>; +@@ -639,18 +207,6 @@ }; }; @@ -550,43 +552,32 @@ -&saradc { - vref-supply = <&vcca1v8_s3>; - status = "okay"; --}; -- --&sdio0 { -- /* WiFi & BT combo module Ampak AP6356S */ -- bus-width = <4>; -- cap-sdio-irq; -- cap-sd-highspeed; -- keep-power-in-suspend; -- mmc-pwrseq = <&sdio_pwrseq>; -- non-removable; -- pinctrl-names = "default"; -- pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>; -- sd-uhs-sdr104; -- -- /* Power supply */ -- vqmmc-supply = &vcc1v8_s3; /* IO line */ -- vmmc-supply = &vcc_sdio; /* card's power */ -- -- #address-cells = <1>; -- #size-cells = <0>; -- status = "okay"; -- -- brcmf: wifi@1 { -- reg = <1>; -- compatible = "brcm,bcm4329-fmac"; -- interrupt-parent = <&gpio0>; -- interrupts = ; -- interrupt-names = "host-wake"; -- brcm,drive-strength = <5>; -- pinctrl-names = "default"; -- pinctrl-0 = <&wifi_host_wake_l>; -- }; -}; &sdio0 { /* WiFi & BT combo module Ampak AP6356S */ -@@ -734,68 +238,6 @@ +@@ -660,6 +216,7 @@ + keep-power-in-suspend; + mmc-pwrseq = <&sdio_pwrseq>; + non-removable; ++ num-slots = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>; + sd-uhs-sdr104; +@@ -668,12 +225,9 @@ + vqmmc-supply = &vcc1v8_s3; /* IO line */ + vmmc-supply = &vcc_sdio; /* card's power */ + +- #address-cells = <1>; +- #size-cells = <0>; + status = "okay"; + + brcmf: wifi@1 { +- reg = <1>; + compatible = "brcm,bcm4329-fmac"; + interrupt-parent = <&gpio0>; + interrupts = ; +@@ -684,124 +238,22 @@ }; }; @@ -654,11 +645,9 @@ - &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_xfer &uart0_rts &uart0_cts>; -@@ -815,62 +257,3 @@ - vddio-supply = <&vcc_1v8>; - }; - }; +- pinctrl-0 = <&uart0_xfer &uart0_cts>; +- status = "okay"; +-}; - -&uart2 { - status = "okay"; @@ -713,9 +702,21 @@ -&vopl_mmu { - status = "okay"; -}; -- --&gpu { -- mali-supply = <&vdd_gpu>; -- status = "okay"; --}; ++ pinctrl-0 = <&uart0_xfer &uart0_rts &uart0_cts>; ++ status = "okay"; ++ ++ bluetooth { ++ compatible = "brcm,bcm43438-bt"; ++ clocks = <&rk808 1>; ++ clock-names = "lpo"; ++ device-wakeup-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>; ++ host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; ++ shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; ++ max-speed = <4000000>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&bt_reg_on_h &bt_host_wake_l &bt_wake_l>; ++ vbat-supply = <&vcc3v3_sys>; ++ vddio-supply = <&vcc_1v8>; ++ }; ++};