From 991485694c8af848f3944a5af9fa71365555bac9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Fri, 13 Dec 2013 16:52:39 +0800 Subject: [PATCH] ARM: rockchip: rk_fiq_debugger DT add rockchip prefix --- arch/arm/boot/dts/rk3188.dtsi | 6 +++--- arch/arm/mach-rockchip/rk_fiq_debugger.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi index e2d7fdae238c..b3058e96d028 100755 --- a/arch/arm/boot/dts/rk3188.dtsi +++ b/arch/arm/boot/dts/rk3188.dtsi @@ -230,9 +230,9 @@ fiq-debugger { compatible = "rockchip,fiq-debugger"; - serial-id = <2>; - signal-irq = <112>; - wake-irq = <0>; + rockchip,serial-id = <2>; + rockchip,signal-irq = <112>; + rockchip,wake-irq = <0>; status = "disabled"; }; diff --git a/arch/arm/mach-rockchip/rk_fiq_debugger.c b/arch/arm/mach-rockchip/rk_fiq_debugger.c index f4d0de79d0e9..71b29056eaa2 100644 --- a/arch/arm/mach-rockchip/rk_fiq_debugger.c +++ b/arch/arm/mach-rockchip/rk_fiq_debugger.c @@ -312,15 +312,15 @@ static int __init rk_fiq_debugger_init(void) { return -ENODEV; } - if (of_property_read_u32(np, "serial-id", &serial_id)) { + if (of_property_read_u32(np, "rockchip,serial-id", &serial_id)) { return -EINVAL; } - if (of_property_read_u32(np, "signal-irq", &signal_irq)) { + if (of_property_read_u32(np, "rockchip,signal-irq", &signal_irq)) { signal_irq = -1; } - if (of_property_read_u32(np, "wake-irq", &wake_irq)) { + if (of_property_read_u32(np, "rockchip,wake-irq", &wake_irq)) { wake_irq = -1; } -- 2.34.1