JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed rockchip64 current compilation - broken since c67b70aa3d

Browse Source
This commit is contained in:
Piotr Szczepanik
2021-11-20 22:38:34 +01:00
parent c67b70aa3d
commit 3b1812c002
1 changed files with 12 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
patch/kernel/archive/rockchip64-5.10/board-firefly-rk3399-04-dts-fix.patch
View File

@@ -473,7 +473,7 @@
&i2c4 {
i2c-scl-rising-time-ns = <600>;
i2c-scl-falling-time-ns = <20>;
@@ -523,49 +119,21 @@
@@ -523,48 +119,6 @@
};
};
@@ -520,23 +520,8 @@
-};
-
&pinctrl {
+ 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>;
bt {
bt_host_wake_l: bt-host-wake-l {
@@ -639,18 +207,6 @@
};
};
@@ -577,7 +562,7 @@
compatible = "brcm,bcm4329-fmac";
interrupt-parent = <&gpio0>;
interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
@@ -684,124 +238,22 @@
@@ -684,68 +238,6 @@
};
};
@@ -645,9 +630,11 @@
-
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_xfer &uart0_cts>;
- status = "okay";
-};
pinctrl-0 = <&uart0_xfer &uart0_rts &uart0_cts>;
@@ -815,60 +257,6 @@
vddio-supply = <&vcc_1v8>;
};
};
-
-&uart2 {
- status = "okay";
@@ -702,21 +689,6 @@
-&vopl_mmu {
- 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>;
+ };
+};
&gpu {
mali-supply = <&vdd_gpu>;