From patchwork Wed Dec 7 15:21:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 9464705 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 B67C260459 for ; Wed, 7 Dec 2016 15:23:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A034F28493 for ; Wed, 7 Dec 2016 15:23:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94F3F284F5; Wed, 7 Dec 2016 15:23:18 +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, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C6A8128493 for ; Wed, 7 Dec 2016 15:23:17 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cEe2W-0003My-3J; Wed, 07 Dec 2016 15:21:48 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cEe2M-0002tg-Ot for linux-arm-kernel@lists.infradead.org; Wed, 07 Dec 2016 15:21:42 +0000 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1cEe1x-0006wF-Jn; Wed, 07 Dec 2016 16:21:13 +0100 Received: from ukl by ptx.hi.pengutronix.de with local (Exim 4.84_2) (envelope-from ) id 1cEe1w-0007zZ-KS; Wed, 07 Dec 2016 16:21:12 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth Subject: [PATCH] ARM: dts: armada-{370, xp}: drop "marvell, orion-spi" from SPI controllers Date: Wed, 7 Dec 2016 16:21:09 +0100 Message-Id: <20161207152109.17545-1-uwe@kleine-koenig.org> X-Mailer: git-send-email 2.10.2 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161207_072139_257354_4AEAD57F X-CRM114-Status: GOOD ( 10.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= 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 From: Uwe Kleine-König The SPI controllers on Armada 370 and XP differ from the original Orion SPI controllers (at least) in the configuration of the baud rate. So it's wrong to claim compatibility which results in bogus baud rates. Signed-off-by: Uwe Kleine-König --- arch/arm/boot/dts/armada-370.dtsi | 4 ++-- arch/arm/boot/dts/armada-xp.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index b4258105e91f..b9377c11b379 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -435,13 +435,13 @@ * board level if a different configuration is used. */ &spi0 { - compatible = "marvell,armada-370-spi", "marvell,orion-spi"; + compatible = "marvell,armada-370-spi"; pinctrl-0 = <&spi0_pins1>; pinctrl-names = "default"; }; &spi1 { - compatible = "marvell,armada-370-spi", "marvell,orion-spi"; + compatible = "marvell,armada-370-spi"; pinctrl-0 = <&spi1_pins>; pinctrl-names = "default"; }; diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index 4a5f99e65b51..3a416834d80b 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi @@ -367,13 +367,13 @@ }; &spi0 { - compatible = "marvell,armada-xp-spi", "marvell,orion-spi"; + compatible = "marvell,armada-xp-spi"; pinctrl-0 = <&spi0_pins>; pinctrl-names = "default"; }; &spi1 { - compatible = "marvell,armada-xp-spi", "marvell,orion-spi"; + compatible = "marvell,armada-xp-spi"; pinctrl-0 = <&spi1_pins>; pinctrl-names = "default"; };