From patchwork Fri Apr 13 17:27:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 10340683 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 056E960329 for ; Fri, 13 Apr 2018 17:35:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E714A28975 for ; Fri, 13 Apr 2018 17:35:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DB96628979; Fri, 13 Apr 2018 17:35:45 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 2EEE028975 for ; Fri, 13 Apr 2018 17:35:45 +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=6HCba2o10wNTeDBloowGBk1/w0RUcPVvZvhZ2J80Rgg=; b=R0yJHKgJAMgykAHc7XmUMVRsL7 IMTTa3RYUZSvJhR1hlKp7HYMeueT5DaWVMfqC5U3iqY8n/0dRqHFpWjCqT0pC4eIysQMRCu91dBgu svjmALkLrVqXPNjqvTbOokG5c4NQAAQNh6y0wNeYaL2aN9FdjKp5LzuPyejPaDVppxSOhDYbyHVsZ /0lijB1GG+iQwyXt82aLdAiv3iO8cyIYm/EH8+qcadZtWhW6/tlDSL998fRovxJ6rPwyWTwW35Wb4 WNvLBDw7bWJfHUMnXUwxv2dCYJ3PoOAXECPHyPTVcCxeL1rM1vDLB+0Xydshjv61Ght5Uyk79ulE3 ONO03vsQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f72bn-0001Qb-HK; Fri, 13 Apr 2018 17:35:35 +0000 Received: from mout.kundenserver.de ([212.227.126.130]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f72VF-0003t6-Ug; Fri, 13 Apr 2018 17:29:00 +0000 Received: from localhost.localdomain ([95.90.209.130]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LiGlL-1ecujJ30z5-00nTBR; Fri, 13 Apr 2018 19:28:26 +0200 From: Stefan Wahren To: Rob Herring , Mark Rutland , Eric Anholt , Catalin Marinas , Will Deacon Subject: [PATCH 4/9] ARM: dts: bcm2837: Add Raspberry Pi 3 B+ Date: Fri, 13 Apr 2018 19:27:53 +0200 Message-Id: <1523640478-4448-5-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523640478-4448-1-git-send-email-stefan.wahren@i2se.com> References: <1523640478-4448-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K1:limK/CIR1LtdIgC7OWkbjr55YwxTYw2Q/2flyETB1Odw/jd3cz3 wkGCsusmK32IHvsc+dUDT8U8aEJ1QFqbhDbM0bfegVU0xfW7nTHst3RbFvbhMA07UKTgfZg EiwDdt393u2NEmN5cFmRchxNAD5HedHFtcJkNHTmKXpIe59zPUN3O6AYJD4UgVwgj9G4HAw RkeD3hqBBr1VrftBHtz8A== X-UI-Out-Filterresults: notjunk:1; V01:K0:rlJuD4GJ3OA=:IifmtaXpABLQ9ufCJO49Zn VPpm3poB51dcZyYsGut+qo9FagnYEuNV8UNMZFPXFmJXisIdykHNixh3tLKsxho6dwla0XNtG mtAh90v7BCy86rX1FYQBehuXhqe9vy7wTDxOlyAdWYllFOXS0uBxb1dFt95hlZBzETUNxgxEu v+ZzlRca1CCgNNKW9TWLGCfI2e/dNdSqDeZD8ywctEllTZ/8EenX7xeXdq+e8k1FjGmpCWd4z wEOmVvr3zvcH2kDHTO8jGW3atA4X19rziDVHINV0QMqlUgycA2ZlABZgUVV2Xe3Jj55a7Ud6g VDevPXj+jprMVd09Jex9Kh8VcItKeHenbHyEdMRXGsiLlSppf5rRQ2lkKhn1avVZdos18lkd8 Avv3nBfhuze/0+4aMHAJmI6tLVFKb8l/Y80sGec/YialM5wL+KRI4zzt41IpcXNwLMh9z0Hc8 eat2ZGU50bcdQaM3Ak2KrPIovKK7mHAOfgNkgzAe21P72RYr7uen1e8LTWbbFkVU6ob4fe8KS qCTSr2MfUthHpT99MH2XsXw1aOkdbMOEoLE98+OsjwOtALy/6EEUYcGek7dXELrhds1P7PMnw cT/39W0S5xjRJ1Q8VEHajEsJIxMHUv1pqbzKRFtAMKB1A2QNAFHktC3hXshMrRh5oaHKdt1Bd oUUgnyJM6yh/hhf1LITxA8yf7BcwTGJun4Bt45FCvEp+a3yNRwRPzux554IIQw5JBkb7hndcX cGe1lfBQ252hz9qFuPZ0RqABAssobRkW1gMfVQ== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180413_102850_324712_10CDEA1C X-CRM114-Status: GOOD ( 19.60 ) 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: Stefan Wahren , devicetree@vger.kernel.org, Florian Fainelli , Arnd Bergmann , Scott Branden , Ray Jui , Phil Elwell , Alexander Graf , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, 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 Raspberry Pi 3 B+ has the following major differences compared to the model 3 B: * Microchip LAN7515 (Gigabit Ethernet) * Cypress CYW43455 (802.11n/ac and BT 4.2) We need to add the USB LAN chip so the bootloader can add the MAC address. This is necessary because there ain't a EEPROM or a valid OTP. Signed-off-by: Phil Elwell Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 108 +++++++++++++++++++++++++++++ arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi | 27 ++++++++ 3 files changed, 136 insertions(+) create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts create mode 100644 arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 7e24249..a300a35 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -75,6 +75,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ bcm2835-rpi-a-plus.dtb \ bcm2836-rpi-2-b.dtb \ bcm2837-rpi-3-b.dtb \ + bcm2837-rpi-3-b-plus.dtb \ bcm2835-rpi-zero.dtb \ bcm2835-rpi-zero-w.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += \ diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts new file mode 100644 index 0000000..4adb85e --- /dev/null +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts @@ -0,0 +1,108 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +#include "bcm2837.dtsi" +#include "bcm2835-rpi.dtsi" +#include "bcm283x-rpi-lan7515.dtsi" +#include "bcm283x-rpi-usb-host.dtsi" + +/ { + compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837"; + model = "Raspberry Pi 3 Model B+"; + + chosen { + /* 8250 auxiliary UART instead of pl011 */ + stdout-path = "serial1:115200n8"; + }; + + memory { + reg = <0 0x40000000>; + }; + + leds { + act { + gpios = <&gpio 29 GPIO_ACTIVE_HIGH>; + }; + + pwr { + label = "PWR"; + gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; + }; + }; + + wifi_pwrseq: wifi-pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&expgpio 1 GPIO_ACTIVE_HIGH>; + }; +}; + +&firmware { + expgpio: gpio { + compatible = "raspberrypi,firmware-gpio"; + gpio-controller; + #gpio-cells = <2>; + gpio-line-names = "BT_ON", + "WL_ON", + "STATUS_LED", + "LAN_RUN", + "", + "CAM_GPIO0", + "CAM_GPIO1", + ""; + status = "okay"; + }; +}; + +&hdmi { + hpd-gpios = <&gpio 28 GPIO_ACTIVE_LOW>; +}; + +&pwm { + pinctrl-names = "default"; + pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio41>; + status = "okay"; +}; + +/* SDHCI is used to control the SDIO for wireless */ +&sdhci { + #address-cells = <1>; + #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_gpio34>; + status = "okay"; + bus-width = <4>; + non-removable; + mmc-pwrseq = <&wifi_pwrseq>; + + brcmf: wifi@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + }; +}; + +/* SDHOST is used to drive the SD card */ +&sdhost { + pinctrl-names = "default"; + pinctrl-0 = <&sdhost_gpio48>; + status = "okay"; + bus-width = <4>; +}; + +/* uart0 communicates with the BT module */ +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_ctsrts_gpio30 &uart0_gpio32 &gpclk2_gpio43>; + status = "okay"; + + bluetooth { + compatible = "brcm,bcm43438-bt"; + max-speed = <2000000>; + shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>; + }; +}; + +/* uart1 is mapped to the pin header */ +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&uart1_gpio14>; + status = "okay"; +}; diff --git a/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi new file mode 100644 index 0000000..169203c --- /dev/null +++ b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0 +/ { + aliases { + ethernet0 = ðernet; + }; +}; + +&usb { + usb1@1 { + compatible = "usb424,2514"; + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + usb1_1@1 { + compatible = "usb424,2514"; + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + ethernet: usbether@1 { + compatible = "usb424,7800"; + reg = <1>; + }; + }; + }; +};