You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
6 years ago
|
From c737abc193d16e62e23e2fb585b8b7398ab380d8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: allen yan <yanwei@marvell.com>
|
||
|
|
Date: Thu, 7 Sep 2017 15:04:53 +0200
|
||
|
|
Subject: arm64: dts: marvell: Fix A37xx UART0 register size
|
||
|
|
|
||
|
|
Armada-37xx UART0 registers are 0x200 bytes wide. Right next to them are
|
||
|
|
the UART1 registers that should not be declared in this node.
|
||
|
|
|
||
|
|
Update the example in DT bindings document accordingly.
|
||
|
|
|
||
|
|
Signed-off-by: allen yan <yanwei@marvell.com>
|
||
|
|
Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons.com>
|
||
|
|
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
|
||
|
|
---
|
||
|
|
Documentation/devicetree/bindings/serial/mvebu-uart.txt | 2 +-
|
||
|
|
arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/Documentation/devicetree/bindings/serial/mvebu-uart.txt
|
||
|
|
+++ b/Documentation/devicetree/bindings/serial/mvebu-uart.txt
|
||
|
|
@@ -8,6 +8,6 @@ Required properties:
|
||
|
|
Example:
|
||
|
|
serial@12000 {
|
||
|
|
compatible = "marvell,armada-3700-uart";
|
||
|
|
- reg = <0x12000 0x400>;
|
||
|
|
+ reg = <0x12000 0x200>;
|
||
|
|
interrupts = <43>;
|
||
|
|
};
|
||
|
|
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
|
||
|
|
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
|
||
|
|
@@ -134,7 +134,7 @@
|
||
|
|
|
||
|
|
uart0: serial@12000 {
|
||
|
|
compatible = "marvell,armada-3700-uart";
|
||
|
|
- reg = <0x12000 0x400>;
|
||
|
|
+ reg = <0x12000 0x200>;
|
||
|
|
interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
|
||
|
|
status = "disabled";
|
||
|
|
};
|