From patchwork Sun Oct 12 19:20:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlo Caione X-Patchwork-Id: 5071471 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 123E8C11AC for ; Sun, 12 Oct 2014 19:26:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2E7F3201EC for ; Sun, 12 Oct 2014 19:26:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5C924201BB for ; Sun, 12 Oct 2014 19:26:06 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XdOjl-0005cD-Pd; Sun, 12 Oct 2014 19:23:25 +0000 Received: from mail-wg0-x22d.google.com ([2a00:1450:400c:c00::22d]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XdOhF-0003bN-Hh for linux-arm-kernel@lists.infradead.org; Sun, 12 Oct 2014 19:20:51 +0000 Received: by mail-wg0-f45.google.com with SMTP id m15so7194682wgh.4 for ; Sun, 12 Oct 2014 12:20:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=S1zlhk8bi5M5IzW0S7Ha2qvCgVDva7ulM84yqpXgM94=; b=xyRHHzh6/lV2is6Ok5VGIRxDXVm6xMW5KzieIqj9KoZnsc2GCdq78cS01GUWLk79Ud PfV6he0+K55dZDOyi0ZAyd2MehGNfMDGL9KHRwFYzw36WGV7D6tljd5ohxGDusqQmLhI B8YPgDAC2OPE3VgcUdtWzmy6oOLt5XmeWePkeNybp0qfGmLxJ7CFHgWv+BawQCW7uBSw Z+XKMaUdB7tHbI40uc6GV+nRRQ7ngj+2XNYogqAnXG7+9aZpxsdecneUItHpS52I31lG Dircb3LWk/i66eqjkqk74R48+wUw1IOtR/5nfZKq6to0+LZCJYBRImjGqtDOEmqdAC0y 514g== X-Received: by 10.195.13.114 with SMTP id ex18mr3231149wjd.89.1413141625718; Sun, 12 Oct 2014 12:20:25 -0700 (PDT) Received: from nuc.fastwebnet.it (2-238-57-164.ip242.fastwebnet.it. [2.238.57.164]) by mx.google.com with ESMTPSA id lf1sm14206953wjb.24.2014.10.12.12.20.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 12 Oct 2014 12:20:25 -0700 (PDT) From: Carlo Caione To: robh+dt@kernel.org, gregkh@linuxfoundation.org, linux-arm-kernel@lists.infradead.org, mark.rutland@arm.com, devicetree@vger.kernel.org, b.galvani@gmail.com, arnd@arndb.de Subject: [PATCH] ARM: meson: Fix UART compatible Date: Sun, 12 Oct 2014 21:20:24 +0200 Message-Id: <1413141624-8949-1-git-send-email-carlo@caione.org> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141012_122049_811191_56172868 X-CRM114-Status: GOOD ( 12.66 ) X-Spam-Score: -0.7 (/) Cc: Carlo Caione X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fix the compatible for the UART to make it consistent with the other compatibles for Meson6 and Meson8 and to avoid problems when the meson8b will be introduced with a different UART driver. Signed-off-by: Carlo Caione --- arch/arm/boot/dts/meson.dtsi | 8 ++++---- drivers/tty/serial/meson_uart.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index e6539ea..a0d34ee 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -76,7 +76,7 @@ }; uart_AO: serial@c81004c0 { - compatible = "amlogic,meson-uart"; + compatible = "amlogic,meson6-uart"; reg = <0xc81004c0 0x14>; interrupts = <0 90 1>; clocks = <&clk81>; @@ -84,7 +84,7 @@ }; uart_A: serial@c81084c0 { - compatible = "amlogic,meson-uart"; + compatible = "amlogic,meson6-uart"; reg = <0xc81084c0 0x14>; interrupts = <0 90 1>; clocks = <&clk81>; @@ -92,7 +92,7 @@ }; uart_B: serial@c81084dc { - compatible = "amlogic,meson-uart"; + compatible = "amlogic,meson6-uart"; reg = <0xc81084dc 0x14>; interrupts = <0 90 1>; clocks = <&clk81>; @@ -100,7 +100,7 @@ }; uart_C: serial@c8108700 { - compatible = "amlogic,meson-uart"; + compatible = "amlogic,meson6-uart"; reg = <0xc8108700 0x14>; interrupts = <0 90 1>; clocks = <&clk81>; diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c index 15c7497..4c3de09 100644 --- a/drivers/tty/serial/meson_uart.c +++ b/drivers/tty/serial/meson_uart.c @@ -590,7 +590,7 @@ static int meson_uart_remove(struct platform_device *pdev) static const struct of_device_id meson_uart_dt_match[] = { - { .compatible = "amlogic,meson-uart" }, + { .compatible = "amlogic,meson6-uart" }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, meson_uart_dt_match); @@ -600,7 +600,7 @@ static struct platform_driver meson_uart_platform_driver = { .remove = meson_uart_remove, .driver = { .owner = THIS_MODULE, - .name = "meson_uart", + .name = "meson6_uart", .of_match_table = meson_uart_dt_match, }, };