diff mbox

arm64: dts: rockchip: fix the address map for WDT0 and WDT1

Message ID 1472192551-16754-1-git-send-email-zhengxing@rock-chips.com (mailing list archive)
State New, archived
Headers show

Commit Message

zhengxing Aug. 26, 2016, 6:22 a.m. UTC
Dues to incorrect description in the TRM, the WDTs base address
should be fixed and swap them like this:
WDT0 - 0xff848000
WDT1 - 0xff840000

And, it is right that only WDT0 can generate global software reset.
We will update the TRM to fix it.

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
---

 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Shawn Lin Aug. 26, 2016, 9:41 a.m. UTC | #1
On 2016/8/26 14:22, Xing Zheng wrote:
> Dues to incorrect description in the TRM, the WDTs base address
> should be fixed and swap them like this:
> WDT0 - 0xff848000
> WDT1 - 0xff840000
>
> And, it is right that only WDT0 can generate global software reset.
> We will update the TRM to fix it.
>
> Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
> ---
>
>  arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> index bc86e8c..f0f52c1 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> @@ -1002,9 +1002,9 @@
>  		};
>  	};
>
> -	watchdog@ff840000 {
> +	watchdog@ff848000 {

Just a nit, should we mark this explicitly as "watchdog0" ?
I still need to look up for which wdt you are using.:)

>  		compatible = "snps,dw-wdt";
> -		reg = <0x0 0xff840000 0x0 0x100>;
> +		reg = <0x0 0xff848000 0x0 0x100>;
>  		clocks = <&cru PCLK_WDT>;
>  		interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
>  	};
>
zhengxing Aug. 26, 2016, 10:49 a.m. UTC | #2
Hi Shawn,

On 2016年08月26日 17:41, Shawn Lin wrote:
> On 2016/8/26 14:22, Xing Zheng wrote:
>> Dues to incorrect description in the TRM, the WDTs base address
>> should be fixed and swap them like this:
>> WDT0 - 0xff848000
>> WDT1 - 0xff840000
>>
>> And, it is right that only WDT0 can generate global software reset.
>> We will update the TRM to fix it.
>>
>> Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
>> ---
>>
>> arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi 
>> b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
>> index bc86e8c..f0f52c1 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
>> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
>> @@ -1002,9 +1002,9 @@
>> };
>> };
>>
>> - watchdog@ff840000 {
>> + watchdog@ff848000 {
>
> Just a nit, should we mark this explicitly as "watchdog0" ?
> I still need to look up for which wdt you are using.:)
Done.

Thanks.
>
>> compatible = "snps,dw-wdt";
>> - reg = <0x0 0xff840000 0x0 0x100>;
>> + reg = <0x0 0xff848000 0x0 0x100>;
>> clocks = <&cru PCLK_WDT>;
>> interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
>> };
>>
>
>
diff mbox

Patch

diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index bc86e8c..f0f52c1 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1002,9 +1002,9 @@ 
 		};
 	};
 
-	watchdog@ff840000 {
+	watchdog@ff848000 {
 		compatible = "snps,dw-wdt";
-		reg = <0x0 0xff840000 0x0 0x100>;
+		reg = <0x0 0xff848000 0x0 0x100>;
 		clocks = <&cru PCLK_WDT>;
 		interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
 	};