From patchwork Fri Mar 20 17:41:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 203034 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD037C43333 for ; Fri, 20 Mar 2020 17:41:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A1F8C20773 for ; Fri, 20 Mar 2020 17:41:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727226AbgCTRl0 (ORCPT ); Fri, 20 Mar 2020 13:41:26 -0400 Received: from v6.sk ([167.172.42.174]:51786 "EHLO v6.sk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726814AbgCTRlZ (ORCPT ); Fri, 20 Mar 2020 13:41:25 -0400 Received: from localhost (v6.sk [IPv6:::1]) by v6.sk (Postfix) with ESMTP id D68E160F22; Fri, 20 Mar 2020 17:41:23 +0000 (UTC) From: Lubomir Rintel To: Greg Kroah-Hartman Cc: Rob Herring , Mark Rutland , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Marc Gonzalez , Mans Rullgard , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , linuxppc-dev@lists.ozlabs.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Lubomir Rintel Subject: [PATCH 03/10] ARM: dts: pxa*: Make the serial ports compatible with xscale-uart Date: Fri, 20 Mar 2020 18:41:00 +0100 Message-Id: <20200320174107.29406-4-lkundrak@v3.sk> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200320174107.29406-1-lkundrak@v3.sk> References: <20200320174107.29406-1-lkundrak@v3.sk> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 --- 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>; From patchwork Fri Mar 20 17:41:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 203033 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 643EAC4332B for ; Fri, 20 Mar 2020 17:41:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4B9C120767 for ; Fri, 20 Mar 2020 17:41:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727325AbgCTRlf (ORCPT ); Fri, 20 Mar 2020 13:41:35 -0400 Received: from v6.sk ([167.172.42.174]:51868 "EHLO v6.sk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727192AbgCTRlf (ORCPT ); Fri, 20 Mar 2020 13:41:35 -0400 Received: from localhost (v6.sk [IPv6:::1]) by v6.sk (Postfix) with ESMTP id BC7E86108C; Fri, 20 Mar 2020 17:41:33 +0000 (UTC) From: Lubomir Rintel To: Greg Kroah-Hartman Cc: Rob Herring , Mark Rutland , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Marc Gonzalez , Mans Rullgard , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , linuxppc-dev@lists.ozlabs.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Lubomir Rintel Subject: [PATCH 06/10] ARM: dts: mmp*: Make the serial ports compatible with xscale-uart Date: Fri, 20 Mar 2020 18:41:03 +0100 Message-Id: <20200320174107.29406-7-lkundrak@v3.sk> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200320174107.29406-1-lkundrak@v3.sk> References: <20200320174107.29406-1-lkundrak@v3.sk> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org XScale serial port driver is perfectly capable of supporting this hardware. A separate compatible string is probably a historical mess. Signed-off-by: Lubomir Rintel --- arch/arm/boot/dts/mmp2.dtsi | 8 ++++---- arch/arm/boot/dts/mmp3.dtsi | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi index 45372df0ec2ad..da10567b5aca6 100644 --- a/arch/arm/boot/dts/mmp2.dtsi +++ b/arch/arm/boot/dts/mmp2.dtsi @@ -209,7 +209,7 @@ timer0: timer@d4014000 { }; uart1: serial@d4030000 { - compatible = "mrvl,mmp-uart"; + compatible = "mrvl,mmp-uart", "intel,xscale-uart"; reg = <0xd4030000 0x1000>; interrupts = <27>; clocks = <&soc_clocks MMP2_CLK_UART0>; @@ -219,7 +219,7 @@ uart1: serial@d4030000 { }; uart2: serial@d4017000 { - compatible = "mrvl,mmp-uart"; + compatible = "mrvl,mmp-uart", "intel,xscale-uart"; reg = <0xd4017000 0x1000>; interrupts = <28>; clocks = <&soc_clocks MMP2_CLK_UART1>; @@ -229,7 +229,7 @@ uart2: serial@d4017000 { }; uart3: serial@d4018000 { - compatible = "mrvl,mmp-uart"; + compatible = "mrvl,mmp-uart", "intel,xscale-uart"; reg = <0xd4018000 0x1000>; interrupts = <24>; clocks = <&soc_clocks MMP2_CLK_UART2>; @@ -239,7 +239,7 @@ uart3: serial@d4018000 { }; uart4: serial@d4016000 { - compatible = "mrvl,mmp-uart"; + compatible = "mrvl,mmp-uart", "intel,xscale-uart"; reg = <0xd4016000 0x1000>; interrupts = <46>; clocks = <&soc_clocks MMP2_CLK_UART3>; diff --git a/arch/arm/boot/dts/mmp3.dtsi b/arch/arm/boot/dts/mmp3.dtsi index 7a5b9962497e4..9b5087a95e736 100644 --- a/arch/arm/boot/dts/mmp3.dtsi +++ b/arch/arm/boot/dts/mmp3.dtsi @@ -319,7 +319,7 @@ timer: timer@d4014000 { }; uart1: serial@d4030000 { - compatible = "mrvl,mmp-uart"; + compatible = "mrvl,mmp-uart", "intel,xscale-uart"; reg = <0xd4030000 0x1000>; interrupts = ; clocks = <&soc_clocks MMP2_CLK_UART0>; @@ -329,7 +329,7 @@ uart1: serial@d4030000 { }; uart2: serial@d4017000 { - compatible = "mrvl,mmp-uart"; + compatible = "mrvl,mmp-uart", "intel,xscale-uart"; reg = <0xd4017000 0x1000>; interrupts = ; clocks = <&soc_clocks MMP2_CLK_UART1>; @@ -339,7 +339,7 @@ uart2: serial@d4017000 { }; uart3: serial@d4018000 { - compatible = "mrvl,mmp-uart"; + compatible = "mrvl,mmp-uart", "intel,xscale-uart"; reg = <0xd4018000 0x1000>; interrupts = ; clocks = <&soc_clocks MMP2_CLK_UART2>; @@ -349,7 +349,7 @@ uart3: serial@d4018000 { }; uart4: serial@d4016000 { - compatible = "mrvl,mmp-uart"; + compatible = "mrvl,mmp-uart", "intel,xscale-uart"; reg = <0xd4016000 0x1000>; interrupts = ; clocks = <&soc_clocks MMP2_CLK_UART3>; From patchwork Fri Mar 20 17:41:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 203032 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2234C4332B for ; Fri, 20 Mar 2020 17:41:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 79BCE20767 for ; Fri, 20 Mar 2020 17:41:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727393AbgCTRlo (ORCPT ); Fri, 20 Mar 2020 13:41:44 -0400 Received: from v6.sk ([167.172.42.174]:51914 "EHLO v6.sk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727389AbgCTRln (ORCPT ); Fri, 20 Mar 2020 13:41:43 -0400 Received: from localhost (v6.sk [IPv6:::1]) by v6.sk (Postfix) with ESMTP id 6128A61090; Fri, 20 Mar 2020 17:41:40 +0000 (UTC) From: Lubomir Rintel To: Greg Kroah-Hartman Cc: Rob Herring , Mark Rutland , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Marc Gonzalez , Mans Rullgard , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , linuxppc-dev@lists.ozlabs.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Lubomir Rintel Subject: [PATCH 08/10] powerpc/fsl: Make serial ports compatible with ns16550a Date: Fri, 20 Mar 2020 18:41:05 +0100 Message-Id: <20200320174107.29406-9-lkundrak@v3.sk> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200320174107.29406-1-lkundrak@v3.sk> References: <20200320174107.29406-1-lkundrak@v3.sk> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org There are separate compatible strings for ns16550 and ns16550a and the Freescale serial port is compatible with the latter one, with working FIFO. Use the appropriate compatible string that is also consistent with ARM64 Freescale boards and thus avoiding one special case in the binding schema. Signed-off-by: Lubomir Rintel --- arch/powerpc/boot/dts/asp834x-redboot.dts | 4 ++-- arch/powerpc/boot/dts/kmeter1.dts | 2 +- arch/powerpc/boot/dts/kuroboxHD.dts | 4 ++-- arch/powerpc/boot/dts/kuroboxHG.dts | 4 ++-- arch/powerpc/boot/dts/mpc8308_p1m.dts | 4 ++-- arch/powerpc/boot/dts/mpc8308rdb.dts | 4 ++-- arch/powerpc/boot/dts/mpc8313erdb.dts | 4 ++-- arch/powerpc/boot/dts/mpc8315erdb.dts | 4 ++-- arch/powerpc/boot/dts/mpc832x_mds.dts | 4 ++-- arch/powerpc/boot/dts/mpc832x_rdb.dts | 4 ++-- arch/powerpc/boot/dts/mpc8349emitx.dts | 4 ++-- arch/powerpc/boot/dts/mpc8349emitxgp.dts | 4 ++-- arch/powerpc/boot/dts/mpc834x_mds.dts | 4 ++-- arch/powerpc/boot/dts/mpc836x_mds.dts | 4 ++-- arch/powerpc/boot/dts/mpc836x_rdk.dts | 4 ++-- arch/powerpc/boot/dts/mpc8377_mds.dts | 4 ++-- arch/powerpc/boot/dts/mpc8377_rdb.dts | 4 ++-- arch/powerpc/boot/dts/mpc8377_wlan.dts | 4 ++-- arch/powerpc/boot/dts/mpc8378_mds.dts | 4 ++-- arch/powerpc/boot/dts/mpc8378_rdb.dts | 4 ++-- arch/powerpc/boot/dts/mpc8379_mds.dts | 4 ++-- arch/powerpc/boot/dts/mpc8379_rdb.dts | 4 ++-- arch/powerpc/boot/dts/mpc8610_hpcd.dts | 4 ++-- arch/powerpc/boot/dts/socrates.dts | 4 ++-- arch/powerpc/boot/dts/storcenter.dts | 4 ++-- arch/powerpc/boot/dts/stxssa8555.dts | 4 ++-- arch/powerpc/boot/dts/tqm8540.dts | 4 ++-- arch/powerpc/boot/dts/tqm8541.dts | 4 ++-- arch/powerpc/boot/dts/tqm8548-bigflash.dts | 4 ++-- arch/powerpc/boot/dts/tqm8548.dts | 4 ++-- arch/powerpc/boot/dts/tqm8555.dts | 4 ++-- arch/powerpc/boot/dts/xcalibur1501.dts | 4 ++-- arch/powerpc/boot/dts/xpedite5200.dts | 4 ++-- arch/powerpc/boot/dts/xpedite5200_xmon.dts | 4 ++-- arch/powerpc/boot/dts/xpedite5301.dts | 4 ++-- arch/powerpc/boot/dts/xpedite5330.dts | 4 ++-- arch/powerpc/boot/dts/xpedite5370.dts | 4 ++-- 37 files changed, 73 insertions(+), 73 deletions(-) diff --git a/arch/powerpc/boot/dts/asp834x-redboot.dts b/arch/powerpc/boot/dts/asp834x-redboot.dts index 52a84561c4f07..fea08278e4ce0 100644 --- a/arch/powerpc/boot/dts/asp834x-redboot.dts +++ b/arch/powerpc/boot/dts/asp834x-redboot.dts @@ -250,7 +250,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <400000000>; interrupts = <9 0x8>; @@ -260,7 +260,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <400000000>; interrupts = <10 0x8>; diff --git a/arch/powerpc/boot/dts/kmeter1.dts b/arch/powerpc/boot/dts/kmeter1.dts index 154f5d293fd3b..376720d15e572 100644 --- a/arch/powerpc/boot/dts/kmeter1.dts +++ b/arch/powerpc/boot/dts/kmeter1.dts @@ -76,7 +76,7 @@ i2c@3000 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <264000000>; interrupts = <9 0x8>; diff --git a/arch/powerpc/boot/dts/kuroboxHD.dts b/arch/powerpc/boot/dts/kuroboxHD.dts index 0a4545159e800..a487f242d919f 100644 --- a/arch/powerpc/boot/dts/kuroboxHD.dts +++ b/arch/powerpc/boot/dts/kuroboxHD.dts @@ -84,7 +84,7 @@ rtc@32 { serial0: serial@80004500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x80004500 0x8>; clock-frequency = <97553800>; current-speed = <9600>; @@ -95,7 +95,7 @@ serial0: serial@80004500 { serial1: serial@80004600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x80004600 0x8>; clock-frequency = <97553800>; current-speed = <57600>; diff --git a/arch/powerpc/boot/dts/kuroboxHG.dts b/arch/powerpc/boot/dts/kuroboxHG.dts index 0e758b347cdb7..11c650cd1af35 100644 --- a/arch/powerpc/boot/dts/kuroboxHG.dts +++ b/arch/powerpc/boot/dts/kuroboxHG.dts @@ -84,7 +84,7 @@ rtc@32 { serial0: serial@80004500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x80004500 0x8>; clock-frequency = <130041000>; current-speed = <9600>; @@ -95,7 +95,7 @@ serial0: serial@80004500 { serial1: serial@80004600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x80004600 0x8>; clock-frequency = <130041000>; current-speed = <57600>; diff --git a/arch/powerpc/boot/dts/mpc8308_p1m.dts b/arch/powerpc/boot/dts/mpc8308_p1m.dts index 2638555afcc45..8578dbf1f31b5 100644 --- a/arch/powerpc/boot/dts/mpc8308_p1m.dts +++ b/arch/powerpc/boot/dts/mpc8308_p1m.dts @@ -227,7 +227,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <133333333>; interrupts = <9 0x8>; @@ -237,7 +237,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <133333333>; interrupts = <10 0x8>; diff --git a/arch/powerpc/boot/dts/mpc8308rdb.dts b/arch/powerpc/boot/dts/mpc8308rdb.dts index af2ed8380a867..3b42eede80bc6 100644 --- a/arch/powerpc/boot/dts/mpc8308rdb.dts +++ b/arch/powerpc/boot/dts/mpc8308rdb.dts @@ -203,7 +203,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <133333333>; interrupts = <9 0x8>; @@ -213,7 +213,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <133333333>; interrupts = <10 0x8>; diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts index a8315795b2c95..d09db72277527 100644 --- a/arch/powerpc/boot/dts/mpc8313erdb.dts +++ b/arch/powerpc/boot/dts/mpc8313erdb.dts @@ -256,7 +256,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; interrupts = <9 0x8>; @@ -266,7 +266,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; interrupts = <10 0x8>; diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts index e09b37d7489d0..4fc0d3fbe39f3 100644 --- a/arch/powerpc/boot/dts/mpc8315erdb.dts +++ b/arch/powerpc/boot/dts/mpc8315erdb.dts @@ -259,7 +259,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <133333333>; interrupts = <9 0x8>; @@ -269,7 +269,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <133333333>; interrupts = <10 0x8>; diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts index 3af073f01e71f..a9f95df92e694 100644 --- a/arch/powerpc/boot/dts/mpc832x_mds.dts +++ b/arch/powerpc/boot/dts/mpc832x_mds.dts @@ -102,7 +102,7 @@ rtc@68 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; interrupts = <9 0x8>; @@ -112,7 +112,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; interrupts = <10 0x8>; diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts index ecebc27a28987..435efd2f748fd 100644 --- a/arch/powerpc/boot/dts/mpc832x_rdb.dts +++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts @@ -79,7 +79,7 @@ i2c@3000 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; interrupts = <9 0x8>; @@ -89,7 +89,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; interrupts = <10 0x8>; diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts index d4ebbb93de0b3..48b14d1d1f3a0 100644 --- a/arch/powerpc/boot/dts/mpc8349emitx.dts +++ b/arch/powerpc/boot/dts/mpc8349emitx.dts @@ -278,7 +278,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; // from bootloader interrupts = <9 0x8>; @@ -288,7 +288,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; // from bootloader interrupts = <10 0x8>; diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts index bcf68a0a7b557..5a460275cb93b 100644 --- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts +++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts @@ -184,7 +184,7 @@ tbi0: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; // from bootloader interrupts = <9 0x8>; @@ -194,7 +194,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; // from bootloader interrupts = <10 0x8>; diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts index 6c8cb859c55f8..386baac9c5a86 100644 --- a/arch/powerpc/boot/dts/mpc834x_mds.dts +++ b/arch/powerpc/boot/dts/mpc834x_mds.dts @@ -236,7 +236,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; interrupts = <9 0x8>; @@ -246,7 +246,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; interrupts = <10 0x8>; diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts index f4ca12ec57f18..38ca10da4e2d2 100644 --- a/arch/powerpc/boot/dts/mpc836x_mds.dts +++ b/arch/powerpc/boot/dts/mpc836x_mds.dts @@ -132,7 +132,7 @@ i2c@3100 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <264000000>; interrupts = <9 0x8>; @@ -142,7 +142,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <264000000>; interrupts = <10 0x8>; diff --git a/arch/powerpc/boot/dts/mpc836x_rdk.dts b/arch/powerpc/boot/dts/mpc836x_rdk.dts index a0cc1953484d7..51e0b6754748f 100644 --- a/arch/powerpc/boot/dts/mpc836x_rdk.dts +++ b/arch/powerpc/boot/dts/mpc836x_rdk.dts @@ -98,7 +98,7 @@ i2c@3100 { serial0: serial@4500 { device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; interrupts = <9 8>; interrupt-parent = <&ipic>; @@ -108,7 +108,7 @@ serial0: serial@4500 { serial1: serial@4600 { device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; interrupts = <10 8>; interrupt-parent = <&ipic>; diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts index 9227bce0e2f56..11c522d4fffaa 100644 --- a/arch/powerpc/boot/dts/mpc8377_mds.dts +++ b/arch/powerpc/boot/dts/mpc8377_mds.dts @@ -270,7 +270,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; interrupts = <9 0x8>; @@ -280,7 +280,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; interrupts = <10 0x8>; diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts index 7df452efa9579..dba5e7e1bc16a 100644 --- a/arch/powerpc/boot/dts/mpc8377_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts @@ -316,7 +316,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; interrupts = <9 0x8>; @@ -326,7 +326,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; interrupts = <10 0x8>; diff --git a/arch/powerpc/boot/dts/mpc8377_wlan.dts b/arch/powerpc/boot/dts/mpc8377_wlan.dts index d8e7d40aeae44..82d4517261597 100644 --- a/arch/powerpc/boot/dts/mpc8377_wlan.dts +++ b/arch/powerpc/boot/dts/mpc8377_wlan.dts @@ -298,7 +298,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; interrupts = <9 0x8>; @@ -308,7 +308,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; interrupts = <10 0x8>; diff --git a/arch/powerpc/boot/dts/mpc8378_mds.dts b/arch/powerpc/boot/dts/mpc8378_mds.dts index e45b25554e8c7..aa1cd44284005 100644 --- a/arch/powerpc/boot/dts/mpc8378_mds.dts +++ b/arch/powerpc/boot/dts/mpc8378_mds.dts @@ -309,7 +309,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; interrupts = <9 0x8>; @@ -319,7 +319,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; interrupts = <10 0x8>; diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts index bdcfe83a561e1..af53d5f47719c 100644 --- a/arch/powerpc/boot/dts/mpc8378_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts @@ -316,7 +316,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; interrupts = <9 0x8>; @@ -326,7 +326,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; interrupts = <10 0x8>; diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts index f7379a1cbb6c7..c11bc5cdaa954 100644 --- a/arch/powerpc/boot/dts/mpc8379_mds.dts +++ b/arch/powerpc/boot/dts/mpc8379_mds.dts @@ -307,7 +307,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; interrupts = <9 0x8>; @@ -317,7 +317,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; interrupts = <10 0x8>; diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts index a5f702304a353..9f58b82ce3d8d 100644 --- a/arch/powerpc/boot/dts/mpc8379_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts @@ -314,7 +314,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; interrupts = <9 0x8>; @@ -324,7 +324,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; interrupts = <10 0x8>; diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts index 33bbe58c1ad08..6b197f460e5cb 100644 --- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts +++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts @@ -172,7 +172,7 @@ i2c@3100 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; interrupts = <42 2>; @@ -183,7 +183,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; interrupts = <42 2>; diff --git a/arch/powerpc/boot/dts/socrates.dts b/arch/powerpc/boot/dts/socrates.dts index 00a56e8e367cd..2915af26be21a 100644 --- a/arch/powerpc/boot/dts/socrates.dts +++ b/arch/powerpc/boot/dts/socrates.dts @@ -195,7 +195,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; interrupts = <42 2>; @@ -205,7 +205,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; interrupts = <42 2>; diff --git a/arch/powerpc/boot/dts/storcenter.dts b/arch/powerpc/boot/dts/storcenter.dts index 99f6f544dc5f8..5fed642164627 100644 --- a/arch/powerpc/boot/dts/storcenter.dts +++ b/arch/powerpc/boot/dts/storcenter.dts @@ -74,7 +74,7 @@ rtc@68 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x20>; clock-frequency = <97553800>; /* Hz */ current-speed = <115200>; @@ -85,7 +85,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x20>; clock-frequency = <97553800>; /* Hz */ current-speed = <9600>; diff --git a/arch/powerpc/boot/dts/stxssa8555.dts b/arch/powerpc/boot/dts/stxssa8555.dts index 5dca2a91c41f6..59ea659d7d6d6 100644 --- a/arch/powerpc/boot/dts/stxssa8555.dts +++ b/arch/powerpc/boot/dts/stxssa8555.dts @@ -204,7 +204,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; // reg base, size clock-frequency = <0>; // should we fill in in uboot? interrupts = <42 2>; @@ -214,7 +214,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; // reg base, size clock-frequency = <0>; // should we fill in in uboot? interrupts = <42 2>; diff --git a/arch/powerpc/boot/dts/tqm8540.dts b/arch/powerpc/boot/dts/tqm8540.dts index 9c1eb9779108c..11e855217a5c8 100644 --- a/arch/powerpc/boot/dts/tqm8540.dts +++ b/arch/powerpc/boot/dts/tqm8540.dts @@ -243,7 +243,7 @@ tbi2: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; // reg base, size clock-frequency = <0>; // should we fill in in uboot? interrupts = <42 2>; @@ -253,7 +253,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; // reg base, size clock-frequency = <0>; // should we fill in in uboot? interrupts = <42 2>; diff --git a/arch/powerpc/boot/dts/tqm8541.dts b/arch/powerpc/boot/dts/tqm8541.dts index 44595cf675d01..60f9be355857f 100644 --- a/arch/powerpc/boot/dts/tqm8541.dts +++ b/arch/powerpc/boot/dts/tqm8541.dts @@ -217,7 +217,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; // reg base, size clock-frequency = <0>; // should we fill in in uboot? interrupts = <42 2>; @@ -227,7 +227,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; // reg base, size clock-frequency = <0>; // should we fill in in uboot? interrupts = <42 2>; diff --git a/arch/powerpc/boot/dts/tqm8548-bigflash.dts b/arch/powerpc/boot/dts/tqm8548-bigflash.dts index caa36c5ef1155..0139b40263758 100644 --- a/arch/powerpc/boot/dts/tqm8548-bigflash.dts +++ b/arch/powerpc/boot/dts/tqm8548-bigflash.dts @@ -296,7 +296,7 @@ tbi3: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; // reg base, size clock-frequency = <0>; // should we fill in in uboot? current-speed = <115200>; @@ -307,7 +307,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; // reg base, size clock-frequency = <0>; // should we fill in in uboot? current-speed = <115200>; diff --git a/arch/powerpc/boot/dts/tqm8548.dts b/arch/powerpc/boot/dts/tqm8548.dts index 12a64410f349c..3f0579f6cbcd5 100644 --- a/arch/powerpc/boot/dts/tqm8548.dts +++ b/arch/powerpc/boot/dts/tqm8548.dts @@ -296,7 +296,7 @@ tbi3: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; // reg base, size clock-frequency = <0>; // should we fill in in uboot? current-speed = <115200>; @@ -307,7 +307,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; // reg base, size clock-frequency = <0>; // should we fill in in uboot? current-speed = <115200>; diff --git a/arch/powerpc/boot/dts/tqm8555.dts b/arch/powerpc/boot/dts/tqm8555.dts index 54f3e82907d69..90e5d007033a0 100644 --- a/arch/powerpc/boot/dts/tqm8555.dts +++ b/arch/powerpc/boot/dts/tqm8555.dts @@ -217,7 +217,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; // reg base, size clock-frequency = <0>; // should we fill in in uboot? interrupts = <42 2>; @@ -227,7 +227,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; // reg base, size clock-frequency = <0>; // should we fill in in uboot? interrupts = <42 2>; diff --git a/arch/powerpc/boot/dts/xcalibur1501.dts b/arch/powerpc/boot/dts/xcalibur1501.dts index 46c25bda9515d..00dd0b65f9483 100644 --- a/arch/powerpc/boot/dts/xcalibur1501.dts +++ b/arch/powerpc/boot/dts/xcalibur1501.dts @@ -528,7 +528,7 @@ tbi3: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; interrupts = <42 2>; @@ -539,7 +539,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; interrupts = <42 2>; diff --git a/arch/powerpc/boot/dts/xpedite5200.dts b/arch/powerpc/boot/dts/xpedite5200.dts index 840ea84bbb595..730ca82efa567 100644 --- a/arch/powerpc/boot/dts/xpedite5200.dts +++ b/arch/powerpc/boot/dts/xpedite5200.dts @@ -330,7 +330,7 @@ tbi3: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; current-speed = <115200>; @@ -341,7 +341,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; current-speed = <115200>; diff --git a/arch/powerpc/boot/dts/xpedite5200_xmon.dts b/arch/powerpc/boot/dts/xpedite5200_xmon.dts index 449fc1b5dc230..e123e3eb858c2 100644 --- a/arch/powerpc/boot/dts/xpedite5200_xmon.dts +++ b/arch/powerpc/boot/dts/xpedite5200_xmon.dts @@ -334,7 +334,7 @@ tbi3: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; current-speed = <9600>; @@ -345,7 +345,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; current-speed = <9600>; diff --git a/arch/powerpc/boot/dts/xpedite5301.dts b/arch/powerpc/boot/dts/xpedite5301.dts index 12184e1796381..4afac7c0693e0 100644 --- a/arch/powerpc/boot/dts/xpedite5301.dts +++ b/arch/powerpc/boot/dts/xpedite5301.dts @@ -438,7 +438,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; interrupts = <42 2>; @@ -449,7 +449,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; interrupts = <42 2>; diff --git a/arch/powerpc/boot/dts/xpedite5330.dts b/arch/powerpc/boot/dts/xpedite5330.dts index e8fc90c52ad6b..013002a16bdda 100644 --- a/arch/powerpc/boot/dts/xpedite5330.dts +++ b/arch/powerpc/boot/dts/xpedite5330.dts @@ -474,7 +474,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; interrupts = <42 2>; @@ -485,7 +485,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; interrupts = <42 2>; diff --git a/arch/powerpc/boot/dts/xpedite5370.dts b/arch/powerpc/boot/dts/xpedite5370.dts index 2b5aa2f3a7098..6b3f1cada6326 100644 --- a/arch/powerpc/boot/dts/xpedite5370.dts +++ b/arch/powerpc/boot/dts/xpedite5370.dts @@ -436,7 +436,7 @@ tbi1: tbi-phy@11 { serial0: serial@4500 { cell-index = <0>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4500 0x100>; clock-frequency = <0>; interrupts = <42 2>; @@ -447,7 +447,7 @@ serial0: serial@4500 { serial1: serial@4600 { cell-index = <1>; device_type = "serial"; - compatible = "fsl,ns16550", "ns16550"; + compatible = "fsl,ns16550", "ns16550a"; reg = <0x4600 0x100>; clock-frequency = <0>; interrupts = <42 2>; From patchwork Fri Mar 20 17:41:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 203031 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7BBD4C4332E for ; Fri, 20 Mar 2020 17:41:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4513920767 for ; Fri, 20 Mar 2020 17:41:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726866AbgCTRlv (ORCPT ); Fri, 20 Mar 2020 13:41:51 -0400 Received: from v6.sk ([167.172.42.174]:51980 "EHLO v6.sk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726976AbgCTRlu (ORCPT ); Fri, 20 Mar 2020 13:41:50 -0400 Received: from localhost (v6.sk [IPv6:::1]) by v6.sk (Postfix) with ESMTP id 87B5C61094; Fri, 20 Mar 2020 17:41:47 +0000 (UTC) From: Lubomir Rintel To: Greg Kroah-Hartman Cc: Rob Herring , Mark Rutland , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Marc Gonzalez , Mans Rullgard , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , linuxppc-dev@lists.ozlabs.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Lubomir Rintel Subject: [PATCH 10/10] dt-bindings: serial: Convert 8250 to json-schema Date: Fri, 20 Mar 2020 18:41:07 +0100 Message-Id: <20200320174107.29406-11-lkundrak@v3.sk> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200320174107.29406-1-lkundrak@v3.sk> References: <20200320174107.29406-1-lkundrak@v3.sk> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Some fixes were done during the conversion: Slightly better examples. The original example was for an OMAP serial port, which is not even described by this binding, but by omap_serial.txt instead. Added compatible strings, that were used, byt not documented: andestech,uart16550, cavium,octeon-3860-uart, fsl,16550-FIFO64, nvidia,tegra186-uart, nvidia,tegra194-uart, nxp,lpc1850-uart, opencores,uart16550-rtlsvn105, ralink,mt7620a-uart, ralink,rt3052-uart, ralink,rt3883-uart and xlnx,xps-uart16550-2.00.b. Removed "serial" compatible string. It's redundant with the node name (which, in OFW, serves the same purpose as the compatible string). Signed-off-by: Lubomir Rintel --- .../devicetree/bindings/serial/8250.txt | 102 -------- .../devicetree/bindings/serial/8250.yaml | 246 ++++++++++++++++++ 2 files changed, 246 insertions(+), 102 deletions(-) delete mode 100644 Documentation/devicetree/bindings/serial/8250.txt create mode 100644 Documentation/devicetree/bindings/serial/8250.yaml diff --git a/Documentation/devicetree/bindings/serial/8250.txt b/Documentation/devicetree/bindings/serial/8250.txt deleted file mode 100644 index a543702859e2f..0000000000000 --- a/Documentation/devicetree/bindings/serial/8250.txt +++ /dev/null @@ -1,102 +0,0 @@ -* UART (Universal Asynchronous Receiver/Transmitter) - -Required properties: -- compatible : one of: - - "ns8250" - - "ns16450" - - "ns16550a" - - "ns16550" - - "ns16750" - - "ns16850" - - For Tegra20, must contain "nvidia,tegra20-uart" - - For other Tegra, must contain '"nvidia,-uart", - "nvidia,tegra20-uart"' where is tegra30, tegra114, tegra124, - tegra132, or tegra210. - - "nxp,lpc3220-uart" - - "ralink,rt2880-uart" - - For MediaTek BTIF, must contain '"mediatek,-btif", - "mediatek,mtk-btif"' where is mt7622, mt7623. - - "altr,16550-FIFO32" - - "altr,16550-FIFO64" - - "altr,16550-FIFO128" - - "fsl,16550-FIFO64" - - "fsl,ns16550" - - "intel,xscale-uart" - - "ti,da830-uart" - - "aspeed,ast2400-vuart" - - "aspeed,ast2500-vuart" - - "nuvoton,npcm750-uart" - - "mrvl,mmp-uart" - - "mrvl,pxa-uart" - - "serial" if the port type is unknown. -- reg : offset and length of the register set for the device. -- interrupts : should contain uart interrupt. -- clock-frequency : the input clock frequency for the UART - or - clocks phandle to refer to the clk used as per Documentation/devicetree - /bindings/clock/clock-bindings.txt - -Optional properties: -- current-speed : the current active speed of the UART. -- reg-offset : offset to apply to the mapbase from the start of the registers. -- reg-shift : quantity to shift the register offsets by. -- reg-io-width : the size (in bytes) of the IO accesses that should be - performed on the device. There are some systems that require 32-bit - accesses to the UART (e.g. TI davinci). -- used-by-rtas : set to indicate that the port is in use by the OpenFirmware - RTAS and should not be registered. -- no-loopback-test: set to indicate that the port does not implements loopback - test mode -- fifo-size: the fifo size of the UART. -- auto-flow-control: one way to enable automatic flow control support. The - driver is allowed to detect support for the capability even without this - property. -- tx-threshold: Specify the TX FIFO low water indication for parts with - programmable TX FIFO thresholds. -- resets : phandle + reset specifier pairs -- overrun-throttle-ms : how long to pause uart rx when input overrun is encountered. -- {rts,cts,dtr,dsr,rng,dcd}-gpios: specify a GPIO for RTS/CTS/DTR/DSR/RI/DCD - line respectively. It will use specified GPIO instead of the peripheral - function pin for the UART feature. If unsure, don't specify this property. -- aspeed,sirq-polarity-sense: Only applicable to aspeed,ast2500-vuart. - phandle to aspeed,ast2500-scu compatible syscon alongside register offset - and bit number to identify how the SIRQ polarity should be configured. - One possible data source is the LPC/eSPI mode bit. - Example: aspeed,sirq-polarity-sense = <&syscon 0x70 25> - -Note: -* fsl,ns16550: - ------------ - Freescale DUART is very similar to the PC16552D (and to a - pair of NS16550A), albeit with some nonstandard behavior such as - erratum A-004737 (relating to incorrect BRK handling). - - Represents a single port that is compatible with the DUART found - on many Freescale chips (examples include mpc8349, mpc8548, - mpc8641d, p4080 and ls2085a). - -Example: - - uart@80230000 { - compatible = "ns8250"; - reg = <0x80230000 0x100>; - clock-frequency = <3686400>; - interrupts = <10>; - reg-shift = <2>; - }; - -Example for OMAP UART using GPIO-based modem control signals: - - uart4: serial@49042000 { - compatible = "ti,omap3-uart"; - reg = <0x49042000 0x400>; - interrupts = <80>; - ti,hwmods = "uart4"; - clock-frequency = <48000000>; - cts-gpios = <&gpio3 5 GPIO_ACTIVE_LOW>; - rts-gpios = <&gpio3 6 GPIO_ACTIVE_LOW>; - dtr-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; - dsr-gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; - dcd-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; - rng-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; - }; diff --git a/Documentation/devicetree/bindings/serial/8250.yaml b/Documentation/devicetree/bindings/serial/8250.yaml new file mode 100644 index 0000000000000..88192f94385b0 --- /dev/null +++ b/Documentation/devicetree/bindings/serial/8250.yaml @@ -0,0 +1,246 @@ +# Copyright 2020 Lubomir Rintel +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/serial/8250.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: UART (Universal Asynchronous Receiver/Transmitter) bindings + +maintainers: + - devicetree@vger.kernel.org + +allOf: + - $ref: /schemas/serial.yaml# + - if: + not: + required: + - clock-frequency + then: + required: + - clocks + - if: + not: + required: + - clocks + then: + required: + - clock-frequency + - if: + required: + - aspeed,sirq-polarity-sense + then: + properties: + compatible: + const: aspeed,ast2500-vuart + - if: + properties: + compatible: + const: mrvl,mmp-uart + then: + properties: + reg-shift: + const: 2 + required: + - reg-shift + +properties: + compatible: + oneOf: + - const: ns8250 + - const: ns16450 + - const: ns16550 + - const: ns16550a + - const: ns16850 + - const: aspeed,ast2400-vuart + - const: aspeed,ast2500-vuart + - const: intel,xscale-uart + - const: mrvl,pxa-uart + - const: nuvoton,npcm750-uart + - const: nvidia,tegra20-uart + - const: nxp,lpc3220-uart + - items: + - enum: + - altr,16550-FIFO32 + - altr,16550-FIFO64 + - altr,16550-FIFO128 + - fsl,16550-FIFO64 + - fsl,ns16550 + - andestech,uart16550 + - nxp,lpc1850-uart + - opencores,uart16550-rtlsvn105 + - ti,da830-uart + - const: ns16550a + - items: + - enum: + - ns16750 + - cavium,octeon-3860-uart + - xlnx,xps-uart16550-2.00.b + - ralink,rt2880-uart + - const: ns16550 + - items: + - enum: + - ralink,mt7620a-uart + - ralink,rt3052-uart + - ralink,rt3883-uart + - const: ralink,rt2880-uart + - const: ns16550 + - items: + - enum: + - mediatek,mt7622-btif + - mediatek,mt7623-btif + - const: mediatek,mtk-btif + - items: + - enum: + - mediatek,mt7622-btif + - mediatek,mt7623-btif + - const: mediatek,mtk-btif + - items: + - const: mrvl,mmp-uart + - const: intel,xscale-uart + - items: + - enum: + - nvidia,tegra30-uart + - nvidia,tegra114-uart + - nvidia,tegra124-uart + - nvidia,tegra186-uart + - nvidia,tegra194-uart + - nvidia,tegra210-uart + - const: nvidia,tegra20-uart + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clock-frequency: true + + clocks: + maxItems: 1 + + current-speed: + description: The current active speed of the UART. + + reg-offset: + description: | + Offset to apply to the mapbase from the start of the registers. + + reg-shift: + description: Quantity to shift the register offsets by. + + reg-io-width: + description: | + The size (in bytes) of the IO accesses that should be performed on the + device. There are some systems that require 32-bit accesses to the + UART (e.g. TI davinci). + + used-by-rtas: + description: | + Set to indicate that the port is in use by the OpenFirmware RTAS and + should not be registered. + + no-loopback-test: + description: | + Set to indicate that the port does not implements loopback test mode. + + fifo-size: + description: The fifo size of the UART. + + auto-flow-control: + description: | + One way to enable automatic flow control support. The driver is + allowed to detect support for the capability even without this + property. + + tx-threshold: + description: | + Specify the TX FIFO low water indication for parts with programmable + TX FIFO thresholds. + + resets: + description: Phandle + reset specifier pairs + + overrun-throttle-ms: + description: | + How long to pause uart rx when input overrun is encountered. + + rts-gpios: + description: | + Specify a GPIO for RTS line to be used instead of the peripheral + function pin for the UART feature. + + cts-gpios: + description: | + Specify a GPIO for CTS line to be used instead of the peripheral + function pin for the UART feature. + + dtr-gpios: + description: | + Specify a GPIO for DTR line to be used instead of the peripheral + function pin for the UART feature. + + dsr-gpios: + description: | + Specify a GPIO for DSR line to be used instead of the peripheral + function pin for the UART feature. + + rng-gpios: + description: | + Specify a GPIO for RNG line to be used instead of the peripheral + function pin for the UART feature. + + dcd-gpios: + description: | + Specify a GPIO for DCD line to be used instead of the peripheral + function pin for the UART feature. + + aspeed,sirq-polarity-sense: + $ref: '/schemas/types.yaml#/definitions/phandle-array' + description: | + Phandle to aspeed,ast2500-scu compatible syscon alongside register + offset and bit number to identify how the SIRQ polarity should be + configured. One possible data source is the LPC/eSPI mode bit. Only + applicable to aspeed,ast2500-vuart. + +required: + - reg + - interrupts + +additionalProperties: false + +examples: + - | + serial@80230000 { + compatible = "ns8250"; + reg = <0x80230000 0x100>; + interrupts = <10>; + reg-shift = <2>; + clock-frequency = <48000000>; + }; + - | + #include + serial@49042000 { + compatible = "andestech,uart16550", "ns16550a"; + reg = <0x49042000 0x400>; + interrupts = <80>; + clock-frequency = <48000000>; + cts-gpios = <&gpio3 5 GPIO_ACTIVE_LOW>; + rts-gpios = <&gpio3 6 GPIO_ACTIVE_LOW>; + dtr-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + dsr-gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; + dcd-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; + rng-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; + }; + - | + #include + serial@1e787000 { + compatible = "aspeed,ast2500-vuart"; + reg = <0x1e787000 0x40>; + reg-shift = <2>; + interrupts = <8>; + clocks = <&syscon ASPEED_CLK_APB>; + no-loopback-test; + aspeed,sirq-polarity-sense = <&syscon 0x70 25>; + }; + +...