Skip to content

Commit

Permalink
fix: correctly disable FIQ debugger
Browse files Browse the repository at this point in the history
3 overlays are preserved to maintain compatibility.

Signed-off-by: ZHANG Yuntian <[email protected]>
  • Loading branch information
RadxaYuntian committed Sep 6, 2024
1 parent c62ed93 commit 0032c7c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 75 deletions.
Original file line number Diff line number Diff line change
@@ -1,33 +1,17 @@
/dts-v1/;
/plugin/;

#include <dt-bindings/pinctrl/rockchip.h>

/ {
metadata {
title = "Disable FIQ Debugger";
compatible = "rockchip,rk3399";
category = "misc";
exclusive = "GPIO4_C3", "GPIO4_C4", "fiq_debugger";
exclusive = "fiq_debugger";
description = "Disable FIQ Debugger.";
};
};

&fiq_debugger {
status = "disabled";
};

&pinctrl {
pinctrl-0 = <&gpio4_c3_c4>;
pinctrl-names = "default";

gpio_func {
gpio4_c3_c4: gpio4-c3-c4 {
rockchip,pins =
/* GPIO4_C3 */
<4 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,
/* GPIO4_C4 */
<4 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
status = "okay";
rockchip,serial-id = <0xffffffff>;
};
Original file line number Diff line number Diff line change
@@ -1,33 +1,7 @@
/dts-v1/;
/plugin/;

#include <dt-bindings/pinctrl/rockchip.h>
#include "rk3399-disable-fiq-debugger.dts"

/ {
metadata {
title = "Disable FIQ Debugger";
compatible = "radxa,rock-3a", "radxa,rock-3b", "radxa,rock-3c", "radxa,cm3-io", "radxa,cm3-rpi-cm4-io", "radxa,cm3s-io", "radxa,radxa-cm3-sodimm-io", "radxa,e23", "radxa,zero3";
category = "misc";
exclusive = "GPIO0_D0", "GPIO0_D1", "fiq_debugger";
description = "Disable FIQ Debugger.";
};
};

&fiq_debugger {
status = "disabled";
};

&pinctrl {
pinctrl-0 = <&gpio0_d0_d1>;
pinctrl-names = "default";

gpio_func {
gpio0_d0_d1: gpio0-d0-d1 {
rockchip,pins =
/* GPIO0_D0 */
<0 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>,
/* GPIO0_D1 */
<0 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
};
compatible = "rockchip,rk3566", "rockchip,rk3568";
};
};
Original file line number Diff line number Diff line change
@@ -1,33 +1,7 @@
/dts-v1/;
/plugin/;

#include <dt-bindings/pinctrl/rockchip.h>
#include "rk3399-disable-fiq-debugger.dts"

/ {
metadata {
title = "Disable FIQ Debugger";
compatible = "radxa,rock-5a", "radxa,rock-5b", "radxa,rock-5b-plus", "radxa,rock-5c", "radxa,rock-5d", "radxa,rock-5t", "radxa,nx5-io", "radxa,cm5-io", "radxa,cm5-rpi-cm4-io";
category = "misc";
exclusive = "GPIO0_B5", "GPIO0_B6", "fiq_debugger";
description = "Disable FIQ Debugger.";
};
};

&fiq_debugger {
status = "disabled";
};

&pinctrl {
pinctrl-0 = <&gpio0_b5_b6>;
pinctrl-names = "default";

gpio_func {
gpio0_b5_b6: gpio0-b5-b6 {
rockchip,pins =
/* GPIO0_B5 */
<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
/* GPIO0_B6 */
<0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
};
compatible = "rockchip,rk3588";
};
};

0 comments on commit 0032c7c

Please sign in to comment.