From fab92cadf87847d11b257a4f1c7b16e889c9699a Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Thu, 28 Jun 2012 11:45:05 +0800 Subject: [PATCH] --- yaml --- r: 313242 b: refs/heads/master c: f98c990c18fb6df88bfd8f3131215604a87d26b1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/imx23.dtsi | 3 ++- trunk/arch/arm/boot/dts/imx28.dtsi | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 65adf99ff67a..a4445c1adc32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a600e3335bad7d666eaebd2b18abd1bb7585a28a +refs/heads/master: f98c990c18fb6df88bfd8f3131215604a87d26b1 diff --git a/trunk/arch/arm/boot/dts/imx23.dtsi b/trunk/arch/arm/boot/dts/imx23.dtsi index e78c1f4c2837..a94ba1d48c0e 100644 --- a/trunk/arch/arm/boot/dts/imx23.dtsi +++ b/trunk/arch/arm/boot/dts/imx23.dtsi @@ -289,8 +289,9 @@ }; rtc@8005c000 { + compatible = "fsl,imx23-rtc", "fsl,stmp3xxx-rtc"; reg = <0x8005c000 2000>; - status = "disabled"; + interrupts = <22>; }; pwm@80064000 { diff --git a/trunk/arch/arm/boot/dts/imx28.dtsi b/trunk/arch/arm/boot/dts/imx28.dtsi index 42d607825512..669c1d02b0aa 100644 --- a/trunk/arch/arm/boot/dts/imx28.dtsi +++ b/trunk/arch/arm/boot/dts/imx28.dtsi @@ -503,9 +503,9 @@ }; rtc@80056000 { + compatible = "fsl,imx28-rtc", "fsl,stmp3xxx-rtc"; reg = <0x80056000 2000>; - interrupts = <28 29>; - status = "disabled"; + interrupts = <29>; }; i2c0: i2c@80058000 {