From: Lubomir Rintel <lkundrak@v3.sk>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Daniel Mack <daniel@zonque.org>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Robert Jarzmik <robert.jarzmik@free.fr>,
Marc Gonzalez <marc.w.gonzalez@free.fr>,
Mans Rullgard <mans@mansr.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
linuxppc-dev@lists.ozlabs.org, linux-serial@vger.kernel.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
Lubomir Rintel <lkundrak@v3.sk>
Subject: [PATCH 03/10] ARM: dts: pxa*: Make the serial ports compatible with xscale-uart
Date: Fri, 20 Mar 2020 18:41:00 +0100 [thread overview]
Message-ID: <20200320174107.29406-4-lkundrak@v3.sk> (raw)
In-Reply-To: <20200320174107.29406-1-lkundrak@v3.sk>
Some drivers that claim to support mrvl,mmp-uart default to a reg-shift
of two, some don't. Be explicit to be on a safe side.
With that in place, a XScale serial port driver is perfectly capable of
supporting the MMP serial port. Add a compatible string.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
arch/arm/boot/dts/pxa168.dtsi | 9 ++++++---
arch/arm/boot/dts/pxa910.dtsi | 9 ++++++---
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/pxa168.dtsi b/arch/arm/boot/dts/pxa168.dtsi
index 41dc79c9f6320..9a9e38245e88c 100644
--- a/arch/arm/boot/dts/pxa168.dtsi
+++ b/arch/arm/boot/dts/pxa168.dtsi
@@ -56,8 +56,9 @@ timer0: timer@d4014000 {
};
uart1: serial@d4017000 {
- compatible = "mrvl,mmp-uart";
+ compatible = "mrvl,mmp-uart", "intel,xscale-uart";
reg = <0xd4017000 0x1000>;
+ reg-shift = <2>;
interrupts = <27>;
clocks = <&soc_clocks PXA168_CLK_UART0>;
resets = <&soc_clocks PXA168_CLK_UART0>;
@@ -65,8 +66,9 @@ uart1: serial@d4017000 {
};
uart2: serial@d4018000 {
- compatible = "mrvl,mmp-uart";
+ compatible = "mrvl,mmp-uart", "intel,xscale-uart";
reg = <0xd4018000 0x1000>;
+ reg-shift = <2>;
interrupts = <28>;
clocks = <&soc_clocks PXA168_CLK_UART1>;
resets = <&soc_clocks PXA168_CLK_UART1>;
@@ -74,8 +76,9 @@ uart2: serial@d4018000 {
};
uart3: serial@d4026000 {
- compatible = "mrvl,mmp-uart";
+ compatible = "mrvl,mmp-uart", "intel,xscale-uart";
reg = <0xd4026000 0x1000>;
+ reg-shift = <2>;
interrupts = <29>;
clocks = <&soc_clocks PXA168_CLK_UART2>;
resets = <&soc_clocks PXA168_CLK_UART2>;
diff --git a/arch/arm/boot/dts/pxa910.dtsi b/arch/arm/boot/dts/pxa910.dtsi
index 209b1f0ea67b2..587a5e7f0702f 100644
--- a/arch/arm/boot/dts/pxa910.dtsi
+++ b/arch/arm/boot/dts/pxa910.dtsi
@@ -68,8 +68,9 @@ timer1: timer@d4016000 {
};
uart1: serial@d4017000 {
- compatible = "mrvl,mmp-uart";
+ compatible = "mrvl,mmp-uart", "intel,xscale-uart";
reg = <0xd4017000 0x1000>;
+ reg-shift = <2>;
interrupts = <27>;
clocks = <&soc_clocks PXA910_CLK_UART0>;
resets = <&soc_clocks PXA910_CLK_UART0>;
@@ -77,8 +78,9 @@ uart1: serial@d4017000 {
};
uart2: serial@d4018000 {
- compatible = "mrvl,mmp-uart";
+ compatible = "mrvl,mmp-uart", "intel,xscale-uart";
reg = <0xd4018000 0x1000>;
+ reg-shift = <2>;
interrupts = <28>;
clocks = <&soc_clocks PXA910_CLK_UART1>;
resets = <&soc_clocks PXA910_CLK_UART1>;
@@ -86,8 +88,9 @@ uart2: serial@d4018000 {
};
uart3: serial@d4036000 {
- compatible = "mrvl,mmp-uart";
+ compatible = "mrvl,mmp-uart", "intel,xscale-uart";
reg = <0xd4036000 0x1000>;
+ reg-shift = <2>;
interrupts = <59>;
clocks = <&soc_clocks PXA910_CLK_UART2>;
resets = <&soc_clocks PXA910_CLK_UART2>;
--
2.25.1
next prev parent reply other threads:[~2020-03-20 17:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-20 17:40 [PATCH 0/10] NS 8250 UART Device Tree improvements Lubomir Rintel
2020-03-20 17:40 ` [PATCH 01/10] ARM: dts: pxa*: Don't redeclare phandle references Lubomir Rintel
2020-03-20 17:40 ` [PATCH 02/10] ARM: dts: pxa*: Fix serial port names Lubomir Rintel
2020-03-20 17:41 ` Lubomir Rintel [this message]
2020-03-20 17:41 ` [PATCH 04/10] ARM: dts: mmp2-brownstone: Don't redeclare phandle references Lubomir Rintel
2020-03-20 17:41 ` [PATCH 05/10] ARM: dts: mmp*: Fix serial port names Lubomir Rintel
2020-03-20 17:41 ` [PATCH 06/10] ARM: dts: mmp*: Make the serial ports compatible with xscale-uart Lubomir Rintel
2020-03-20 17:41 ` [PATCH 07/10] ARM: dts: tango4: Make /serial compatible with ns16550a Lubomir Rintel
2020-03-21 11:11 ` Måns Rullgård
2020-03-20 17:41 ` [PATCH 08/10] powerpc/fsl: Make serial ports " Lubomir Rintel
2020-03-23 17:59 ` Rob Herring
2020-03-20 17:41 ` [PATCH 09/10] dt-bindings: serial: Move Marvell compatible string to 8250 binding doc Lubomir Rintel
2020-03-20 17:41 ` [PATCH 10/10] dt-bindings: serial: Convert 8250 to json-schema Lubomir Rintel
2020-03-23 19:00 ` Rob Herring
2020-03-23 19:01 ` [PATCH 0/10] NS 8250 UART Device Tree improvements Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200320174107.29406-4-lkundrak@v3.sk \
--to=lkundrak@v3.sk \
--cc=benh@kernel.crashing.org \
--cc=daniel@zonque.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=haojian.zhuang@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mans@mansr.com \
--cc=marc.w.gonzalez@free.fr \
--cc=mark.rutland@arm.com \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=robert.jarzmik@free.fr \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).