From patchwork Tue Nov 8 16:31:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 9417737 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 19D4260512 for ; Tue, 8 Nov 2016 16:32:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A49C28B61 for ; Tue, 8 Nov 2016 16:32:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F24D028F23; Tue, 8 Nov 2016 16:32:27 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 814F028B61 for ; Tue, 8 Nov 2016 16:32:27 +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 1c49Iq-0002lY-0A; Tue, 08 Nov 2016 16:31:16 +0000 Received: from mail-lf0-x230.google.com ([2a00:1450:4010:c07::230]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c49Id-0002ax-NI for linux-arm-kernel@lists.infradead.org; Tue, 08 Nov 2016 16:31:05 +0000 Received: by mail-lf0-x230.google.com with SMTP id t196so144140337lff.3 for ; Tue, 08 Nov 2016 08:30:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=oAtz7Py2ZIRXpjX9nlasutmR+YlQMFpQErwR0C8yJYY=; b=1M/vVbCgFz764ykXJ+CsLgO940tipCiGVch7ikjgIUjKcQc1WkS96qn9ayJHifKL1e 5lWIEOZED1Y5OlpRr4x/VJ1q6ZwL+BqXQ6PJTOLgKwgIUiE3vtRPzgAdjHG9KBy5Uf3q K4prGpcUUCc5qy5wFB1Qd6C6dsVA8MzmA64Uiwts3LGqvnK3Roesb06iRF8JhNOcFv3a qrjU40MJBYKEY6bBVvJfXIsB0S7sfyFXZxSFi4Tfi5KExzKdL2Tp6xEsz2q19vliws4E k1aQZOEXanKxBytOgBLW8L68wKD8adl4tzaCnj5JXkP+pKIT6i9TJqnThtUjNUpfuk4D iYiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=oAtz7Py2ZIRXpjX9nlasutmR+YlQMFpQErwR0C8yJYY=; b=Hr8V2jyT/uzp4/5OymlPnJjSv09GcC3/w9uvHlOaSeQk89XoHd9XizXvyWXHbcx2/D LuuDhLW2GsQplLIiWIVxzssCW56n9APfPlANA54aCEZoN2AJ09WjK1MRLP9xWryLS1/1 jjDTfaNlw4aQa1QWpK9sCUcCSjYX+IqyoUF4TEmI2hDxh3biZuCB10ByhXpaHYICfJWu ijfigsCpQnwb4K21Y9gteVgzXnulG4MRJQmG8JiC1ccxF8j8sMqXiUT//Ly765zkPrDd kwpfCE7mg9TniI1UwRBP8O1Mx0rqksIRlGWD8u4vES+Nq5t0J1o9MsH9FgkUiVv21cHz QYqA== X-Gm-Message-State: ABUngvdT/bDZtH4xz+DjqjdW23LM8ZX64GUEy3VuEbMA7gmBoqrNmcOnvfL4sDx1TgGBGQ== X-Received: by 10.25.89.137 with SMTP id n131mr3729632lfb.75.1478622641182; Tue, 08 Nov 2016 08:30:41 -0800 (PST) Received: from enkidu.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id u12sm298808lja.4.2016.11.08.08.30.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Nov 2016 08:30:40 -0800 (PST) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm64: dts: marvell: add unique identifiers for Armada A8k SPI controllers Date: Tue, 8 Nov 2016 17:31:32 +0100 Message-Id: <1478622692-18441-1-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 1.8.3.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161108_083104_135257_D2CD4FA7 X-CRM114-Status: GOOD ( 12.22 ) 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: thomas.petazzoni@free-electrons.com, andrew@lunn.ch, jason@lakedaemon.net, jaz@semihalf.com, will.deacon@arm.com, nadavh@marvell.com, alior@marvell.com, robh+dt@kernel.org, tn@semihalf.com, gregory.clement@free-electrons.com, mark.rutland@arm.com, mw@semihalf.com, sebastian.hesselbarth@gmail.com 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 Enabling SPI controllers, which are attached to different busses inside an SoC, may result in overlapping enumeration and cause sysfs registration failure. Example log after enabling two controllers on Armada 8040 SoC with same identifiers: [ 3.740415] sysfs: cannot create duplicate filename '/class/spi_master/spi0' [ 3.747510] ------------[ cut here ]------------ [ 3.752145] WARNING: at fs/sysfs/dir.c:31 [...] [ 4.002299] orion_spi: probe of f4700600.spi failed with error -17 spi-orion driver offers dedicated DT property ('cell-index'), that allow setting unique identifiers. Recently added support for CP110-slave HW block introduced two new SPI controllers' nodes with same ID as ones from CP110-master. This commit fixes the issue by assigning different 'cell-index' values for CP110-slave SPI controllers. Fixes: 4eef78a0091b ("arm64: dts: marvell: add description for the slave CP110 in Armada 8K") Signed-off-by: Marcin Wojtas Acked-by: Thomas Petazzoni --- arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi index abb3fa2..d94d592 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi @@ -132,7 +132,7 @@ reg = <0x700600 0x50>; #address-cells = <0x1>; #size-cells = <0x0>; - cell-index = <1>; + cell-index = <3>; clocks = <&cps_syscon0 1 21>; status = "disabled"; }; @@ -142,7 +142,7 @@ reg = <0x700680 0x50>; #address-cells = <1>; #size-cells = <0>; - cell-index = <2>; + cell-index = <4>; clocks = <&cps_syscon0 1 21>; status = "disabled"; };