From patchwork Tue Jan 2 14:55:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 10140747 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 436A0601A1 for ; Tue, 2 Jan 2018 15:00:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B1C728BF5 for ; Tue, 2 Jan 2018 15:00:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 49E0128BFF; Tue, 2 Jan 2018 15:00:01 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [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 CC49728BF5 for ; Tue, 2 Jan 2018 15:00:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=lMr5HAw11pbBF4aoW4WfuuR5l/Jxdv44M8PVifPSx2g=; b=ihr0KfG7H9j6JOI7c8QlkJcWzY RhM2fnPGELSh0yR7fyjVJy/aNTPKib+dMqFz7PBd1P0zh4pXQaMXJesUOtfw9LOP5A6BY9FyBFGRE B8UOvqKDcqWfW1BlYcfyK0Wki0I7mAJQpYBWO80X7TTfUbpEQEWMHEjn3ewEKBSW4KK628r+qEv/A fru0LAewJiVNA6XPdeB02zTYGlm5wRmEghYA6wWWnmxi6ds86z5PDZ0W9l8BnZGRcJ7TCcTiHwqmd QCcMOZVShdnxTyZkvvymZ97hDwqWU4B0r0FjmgMSQpIZCgVUW3PLfWhzHQKhwZub5GR5HNdUcpkMY O2m2Jk2A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eWO2m-00010b-23; Tue, 02 Jan 2018 14:59:56 +0000 Received: from mail.free-electrons.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eWO0K-0007Tj-54 for linux-arm-kernel@lists.infradead.org; Tue, 02 Jan 2018 14:57:32 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 30B6F207A3; Tue, 2 Jan 2018 15:56:59 +0100 (CET) Received: from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 0CE8520377; Tue, 2 Jan 2018 15:56:59 +0100 (CET) From: Thomas Petazzoni To: Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement Subject: [PATCH v2 5/8] arm64: dts: marvell: use mvebu-icu.h where possible Date: Tue, 2 Jan 2018 15:55:55 +0100 Message-Id: <20180102145558.9773-6-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180102145558.9773-1-thomas.petazzoni@free-electrons.com> References: <20180102145558.9773-1-thomas.petazzoni@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180102_065724_845725_C7342EE6 X-CRM114-Status: GOOD ( 11.08 ) 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: Thomas Petazzoni , Hanna Hawa , Nadav Haklai , =?UTF-8?q?Miqu=C3=A8l=20Raynal?= , Antoine Tenart , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 Back when the ICU Device Tree binding was introduced, we could not use mvebu-icu.h from the Device Tree files, because the DT files and mvebu-icu.h were following different merge routes towards Linus tree. Now that both have been merged, we can switch the Marvell Armada CP110 Device Tree files to use the mvebu-icu.h header instead of duplicating the ICU_GRP_NSR definition. Signed-off-by: Thomas Petazzoni --- arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 2 +- arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi index a0b2cec2823f..f89053577bcc 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi @@ -44,7 +44,7 @@ * Device Tree file for Marvell Armada CP110 Master. */ -#define ICU_GRP_NSR 0x0 +#include / { cp110-master { diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi index 3eda62d482fc..a658b72b0229 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi @@ -44,7 +44,7 @@ * Device Tree file for Marvell Armada CP110 Slave. */ -#define ICU_GRP_NSR 0x0 +#include / { cp110-slave {