Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752631AbdIFJp5 (ORCPT ); Wed, 6 Sep 2017 05:45:57 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:37929 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752257AbdIFJpz (ORCPT ); Wed, 6 Sep 2017 05:45:55 -0400 X-Google-Smtp-Source: ADKCNb56M7LAaIG0ORpKjMQT2Eg3ImwBijB2xW9ulPtDwGl/l1vKSUl558Vm9Y5j0P2EHDltIE6IBh9QDvrL5OEpVSI= MIME-Version: 1.0 In-Reply-To: <1504277584-37794-1-git-send-email-harvey.hunt@imgtec.com> References: <1504277584-37794-1-git-send-email-harvey.hunt@imgtec.com> From: Geert Uytterhoeven Date: Wed, 6 Sep 2017 11:45:54 +0200 X-Google-Sender-Auth: FtlZfyucwZ6OrNWiA6Es6NvwEBM Message-ID: Subject: Re: [PATCH] MIPS: mt7620: Rename uartlite to serial To: Harvey Hunt Cc: Rob Herring , Mark Rutland , Ralf Baechle , John Crispin , Matt Redfearn , "devicetree@vger.kernel.org" , Linux MIPS Mailing List , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4365 Lines: 115 On Fri, Sep 1, 2017 at 4:53 PM, Harvey Hunt wrote: > Previously, mt7620.c defined the clocks for uarts with the names > uartlite, uart1 and uart2. Rename them to serial{0,1,2} and update > the devicetree node names. > > Signed-off-by: Harvey Hunt > Cc: devicetree@vger.kernel.org > Cc: linux-mips@linux-mips.org > Cc: linux-kernel@vger.kernel.org > --- > arch/mips/boot/dts/ralink/mt7620a.dtsi | 2 +- > arch/mips/boot/dts/ralink/mt7628a.dtsi | 6 +++--- > arch/mips/ralink/mt7620.c | 14 +++++++------- > 3 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/arch/mips/boot/dts/ralink/mt7620a.dtsi b/arch/mips/boot/dts/ralink/mt7620a.dtsi > index 793c0c7..58bd002 100644 > --- a/arch/mips/boot/dts/ralink/mt7620a.dtsi > +++ b/arch/mips/boot/dts/ralink/mt7620a.dtsi > @@ -45,7 +45,7 @@ > reg = <0x300 0x100>; > }; > > - uartlite@c00 { > + serial0@c00 { Device node names should use generic names and no numerical suffix => "serial@c00" > compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a"; > reg = <0xc00 0x100>; > > diff --git a/arch/mips/boot/dts/ralink/mt7628a.dtsi b/arch/mips/boot/dts/ralink/mt7628a.dtsi > index 9ff7e8f..fe3fe9a 100644 > --- a/arch/mips/boot/dts/ralink/mt7628a.dtsi > +++ b/arch/mips/boot/dts/ralink/mt7628a.dtsi > @@ -62,7 +62,7 @@ > reg = <0x300 0x100>; > }; > > - uart0: uartlite@c00 { > + uart0: serial0@c00 { uart0: serial@c00 > compatible = "ns16550a"; > reg = <0xc00 0x100>; > > @@ -75,7 +75,7 @@ > reg-shift = <2>; > }; > > - uart1: uart1@d00 { > + uart1: serial1@d00 { uart1: serial@d00 > compatible = "ns16550a"; > reg = <0xd00 0x100>; > > @@ -88,7 +88,7 @@ > reg-shift = <2>; > }; > > - uart2: uart2@e00 { > + uart2: serial2@e00 { uart2: serial@e00 > compatible = "ns16550a"; > reg = <0xe00 0x100>; > > diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c > index 9be8b08..f623ceb 100644 > --- a/arch/mips/ralink/mt7620.c > +++ b/arch/mips/ralink/mt7620.c > @@ -54,7 +54,7 @@ static int dram_type; > > static struct rt2880_pmx_func i2c_grp[] = { FUNC("i2c", 0, 1, 2) }; > static struct rt2880_pmx_func spi_grp[] = { FUNC("spi", 0, 3, 4) }; > -static struct rt2880_pmx_func uartlite_grp[] = { FUNC("uartlite", 0, 15, 2) }; > +static struct rt2880_pmx_func serial_grp[] = { FUNC("serial", 0, 15, 2) }; > static struct rt2880_pmx_func mdio_grp[] = { > FUNC("mdio", MT7620_GPIO_MODE_MDIO, 22, 2), > FUNC("refclk", MT7620_GPIO_MODE_MDIO_REFCLK, 22, 2), > @@ -92,7 +92,7 @@ static struct rt2880_pmx_group mt7620a_pinmux_data[] = { > GRP("uartf", uartf_grp, MT7620_GPIO_MODE_UART0_MASK, > MT7620_GPIO_MODE_UART0_SHIFT), > GRP("spi", spi_grp, 1, MT7620_GPIO_MODE_SPI), > - GRP("uartlite", uartlite_grp, 1, MT7620_GPIO_MODE_UART1), > + GRP("serial", serial_grp, 1, MT7620_GPIO_MODE_UART1), > GRP_G("wdt", wdt_grp, MT7620_GPIO_MODE_WDT_MASK, > MT7620_GPIO_MODE_WDT_GPIO, MT7620_GPIO_MODE_WDT_SHIFT), > GRP_G("mdio", mdio_grp, MT7620_GPIO_MODE_MDIO_MASK, > @@ -530,8 +530,8 @@ void __init ralink_clk_init(void) > periph_rate = MHZ(40); > pcmi2s_rate = MHZ(480); > > - ralink_clk_add("10000d00.uartlite", periph_rate); > - ralink_clk_add("10000e00.uartlite", periph_rate); > + ralink_clk_add("10000d00.serial0", periph_rate); > + ralink_clk_add("10000e00.serial0", periph_rate); Ugh, you're relying on the actual node names in DT? Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds