From patchwork Thu Jan 19 08:21:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9525299 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1E53C60113 for ; Thu, 19 Jan 2017 08:45:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 094042818B for ; Thu, 19 Jan 2017 08:45:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F08402842F; Thu, 19 Jan 2017 08:45:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, RDNS_NONE,T_DKIM_INVALID autolearn=no version=3.3.1 Received: from bombadil.infradead.org (unknown [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 46ABA2818B for ; Thu, 19 Jan 2017 08:45:00 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cU8FV-0007Lt-R2; Thu, 19 Jan 2017 08:39:13 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cU8DD-0004iC-W4 for linux-arm-kernel@bombadil.infradead.org; Thu, 19 Jan 2017 08:36:52 +0000 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cU81C-0002rb-Kz for linux-arm-kernel@lists.infradead.org; Thu, 19 Jan 2017 08:24:28 +0000 Received: by mail-wm0-x22d.google.com with SMTP id c85so278400519wmi.1 for ; Thu, 19 Jan 2017 00:24:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6ORYUP8qs67iInXPznJaRCfJWyGXlo/REwRTq3XDqK0=; b=lMhJSypfuNMta2C9olHh3qUEZ0Wx5qPlms8gU2Klp1Yq6+TVfBW/JI8XCpnPlOi1vN uKRGRY8vq1b8DdSknVrvvz8nJ1ysKMnhodndJENe/JjMgip6AGIvuzEvyE2DjfiZjVMv gPU1FHWcqYwBFk0KvfrVqpVTTSBpi6N8Ui0cI+wQa4vs8R94HVUTI5y27Bd449itLAhC Ppnk/wfqOBQspncZKrc2TYZpduDfRGga5EegoFHQF7vb4mhUHzxpdh2Z5ZGrBQhsFJQZ PllpnayK60/Fsar15cLxBBzfn7zLsXydJ3TQSpsr2T1q1nAiXJwvP14W9D4xn1oxkyZY wjDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6ORYUP8qs67iInXPznJaRCfJWyGXlo/REwRTq3XDqK0=; b=PzOiJqwsSnXhn9uoEgAORwq7xFaYNhPbh8CcKVNesh0X6Ah32Am0zMdhIWDOPxSaEH ghM3xWXGcypDmir2eGSeZmY3qZT0UghjWuXm2hLeTBoUH8vPF3lrII6zK8dBnaYDMwfU X2r1gMWV8Sx35r0TT0N5nqDjbXJUDuELGYJDaSp0HddBrBqV2mc2USisZCevPb9KfOU7 KgoAM7q9sRF2ivph2OTAcskt5fRrMJnnIxq4BYNlXi7cQqWdcOLhM4pZVc52+EfhQFQE 3vSAgO90CiQa2fkmZ+6cWBkFmE6/GvNw9rd3QUNq1QxQEB2BaiuKb4Hhci2G5zJnnok7 DyUg== X-Gm-Message-State: AIkVDXKnd71lKeIR7dYPFDaoI1cfyyOFuZQqUEyz8hwVaLm5kv9qXYhI5S7VrFVWNSj1rcCj X-Received: by 10.28.232.90 with SMTP id f87mr22431726wmh.35.1484814125866; Thu, 19 Jan 2017 00:22:05 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id e5sm51646451wma.12.2017.01.19.00.22.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Jan 2017 00:22:05 -0800 (PST) From: Neil Armstrong To: khilman@baylibre.com, carlo@caione.org, afaerber@suse.de Subject: [PATCH] ARM64: dts: meson-gxm: Rename q200 and q201 DT files for consistency Date: Thu, 19 Jan 2017 09:21:57 +0100 Message-Id: <1484814117-7593-1-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170119_082426_725760_F551CD17 X-CRM114-Status: GOOD ( 10.48 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In order to keep consistency naming with the Nexbox A1 DTS file, remove the S912 SoC name in the GXM DT files. Suggested-by: Andreas Färber Signed-off-by: Neil Armstrong Reviewed-by: Andreas Färber --- arch/arm64/boot/dts/amlogic/Makefile | 4 ++-- .../boot/dts/amlogic/{meson-gxm-s912-q200.dts => meson-gxm-q200.dts} | 0 .../boot/dts/amlogic/{meson-gxm-s912-q201.dts => meson-gxm-q201.dts} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm64/boot/dts/amlogic/{meson-gxm-s912-q200.dts => meson-gxm-q200.dts} (100%) rename arch/arm64/boot/dts/amlogic/{meson-gxm-s912-q201.dts => meson-gxm-q201.dts} (100%) Kevin, is this patch format correct for you to apply ? diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile index 0d7bfbf..1aca8e5 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile @@ -9,8 +9,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-nexbox-a95x.dtb -dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-q200.dtb -dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-q201.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb always := $(dtb-y) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-s912-q200.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts similarity index 100% rename from arch/arm64/boot/dts/amlogic/meson-gxm-s912-q200.dts rename to arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-s912-q201.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts similarity index 100% rename from arch/arm64/boot/dts/amlogic/meson-gxm-s912-q201.dts rename to arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts