From patchwork Wed Feb 8 20:45:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 9563389 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 B5E7C60146 for ; Wed, 8 Feb 2017 21:00:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 980B22852C for ; Wed, 8 Feb 2017 21:00:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8BAEF28530; Wed, 8 Feb 2017 21:00:29 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_SORBS_SPAM,T_DKIM_INVALID autolearn=no 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 360402852C for ; Wed, 8 Feb 2017 21:00:29 +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 1cbZLm-00022H-KA; Wed, 08 Feb 2017 21:00:26 +0000 Received: from mail-qk0-f181.google.com ([209.85.220.181]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cbZ8b-0003PD-Re for linux-arm-kernel@lists.infradead.org; Wed, 08 Feb 2017 20:46:53 +0000 Received: by mail-qk0-f181.google.com with SMTP id s140so135945345qke.0 for ; Wed, 08 Feb 2017 12:46:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ncJ7zmCvvx0pJ95a/NTXLEG+ss3UoYaAxnRxL1fYFpA=; b=huQ5WIBP54/7P+t6k9sxaFoRheNceYW9rFt0zpEwT4cOwvYu52aADSrj2AWq7tRwZ4 E7fwQ+m07lkaToR+zqXolAtXVlJgu/Wp3CGgERA41Pxboo5ZVUVCbTL4e4WvJu7mYMMe 6sGgGfGIJ7i2uxE1PPW7L6311kh9CE4f9opM4= 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:in-reply-to :references; bh=ncJ7zmCvvx0pJ95a/NTXLEG+ss3UoYaAxnRxL1fYFpA=; b=iBlTEm1XXrCGDzxpVUYaQzUd6/zKJFtQZn0i8k7CCo7HLsjbmNscck8COQbx19TD7F ARnh65U9qzPRjc+SOEK+Ekv5uBPKPi/Vnxcqk3pIKFphlGa4uZLJacOhXDEFfZjx6LIU EQZqhpQQJZ/z+yUQHaiNsA3rCD95KGpOQZHZT8uP8g1iEyW4NsvYxS3zYIhA0F38985u FwLIq3QStlwiT/SrE8pPzr7k9Vr+NFLsoDK4us+gaVD2e2FLIchVVYfZUnW3280o1U85 xNqPSY2yCucK0/E4sEDH9WUIvC9AMtpIo83se2QgLZUPKGosqpMXobUHaltTnYQdfka4 VKsQ== X-Gm-Message-State: AMke39nBoLJAAw+s1ojHrLUtcCbT3q7QRGrbGGVTy/7hrMF5oR+kEXwMK37/mK1RFhzaJ5CY X-Received: by 10.55.3.67 with SMTP id 64mr13206258qkd.244.1486586728806; Wed, 08 Feb 2017 12:45:28 -0800 (PST) Received: from venom.dhcp.broadcom.net ([192.19.218.250]) by smtp.gmail.com with ESMTPSA id u29sm7181032qki.4.2017.02.08.12.45.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Feb 2017 12:45:28 -0800 (PST) From: Jon Mason To: Hauke Mehrtens , zajec5@gmail.com Subject: [PATCH 2/2] ARM: dts: BCM5301X: convert to iProc QSPI Date: Wed, 8 Feb 2017 15:45:16 -0500 Message-Id: <1486586716-6781-3-git-send-email-jon.mason@broadcom.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1486586716-6781-1-git-send-email-jon.mason@broadcom.com> References: <1486586716-6781-1-git-send-email-jon.mason@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170208_124650_061614_72DE37EE X-CRM114-Status: GOOD ( 12.26 ) 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: Mark Rutland , devicetree@vger.kernel.org, Florian Fainelli , linux-kernel@vger.kernel.org, Rob Herring , bcm-kernel-feedback-list@broadcom.com, 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 The iproc-qspi driver is the SPI driver that should be used going forward. Modify the SPI DT entry to use this driver, and add an entry in the bcm953012k DTS file to enable the SPI. Tested on the bcm953012k board. Signed-off-by: Jon Mason --- arch/arm/boot/dts/bcm5301x.dtsi | 50 +++++++++++++++++++++++++++++----------- arch/arm/boot/dts/bcm953012k.dts | 26 +++++++++++++++++++++ 2 files changed, 62 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi index a4614c9..0acc02f 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -290,20 +290,6 @@ }; }; - spi@29000 { - reg = <0x00029000 0x1000>; - #address-cells = <1>; - #size-cells = <0>; - - spi_nor: spi-nor@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <20000000>; - linux,part-probe = "ofpart", "bcm47xxpart"; - status = "disabled"; - }; - }; - gmac0: ethernet@24000 { reg = <0x24000 0x800>; }; @@ -367,4 +353,40 @@ brcm,nand-has-wp; }; + + spi@18029200 { + compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi"; + reg = <0x18029200 0x184>, + <0x18029000 0x124>, + <0x1811b408 0x004>, + <0x180293a0 0x01c>; + reg-names = "mspi", "bspi", "intr_regs", "intr_status_reg"; + interrupts = , + , + , + , + , + , + ; + interrupt-names = "spi_lr_fullness_reached", + "spi_lr_session_aborted", + "spi_lr_impatient", + "spi_lr_session_done", + "spi_lr_overhead", + "mspi_done", + "mspi_halted"; + clocks = <&iprocmed>; + clock-names = "iprocmed"; + num-cs = <2>; + #address-cells = <1>; + #size-cells = <0>; + + spi_nor: spi-nor@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <20000000>; + linux,part-probe = "ofpart", "bcm47xxpart"; + status = "disabled"; + }; + }; }; diff --git a/arch/arm/boot/dts/bcm953012k.dts b/arch/arm/boot/dts/bcm953012k.dts index cb673c7..34a7f52 100644 --- a/arch/arm/boot/dts/bcm953012k.dts +++ b/arch/arm/boot/dts/bcm953012k.dts @@ -84,6 +84,32 @@ }; }; +&spi_nor { + status = "okay"; + spi-max-frequency = <62500000>; + m25p,default-addr-width = <3>; + + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "boot"; + reg = <0x00000000 0x000d0000>; + }; + partition@d000 { + label = "env"; + reg = <0x000d0000 0x00030000>; + }; + partition@100000 { + label = "system"; + reg = <0x00100000 0x00600000>; + }; + partition@700000 { + label = "rootfs"; + reg = <0x00700000 0x00900000>; + }; +}; + &uart0 { status = "okay"; };