From patchwork Sat Apr 21 11:28:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 10354075 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 CCCF16019C for ; Sat, 21 Apr 2018 11:30:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA86628909 for ; Sat, 21 Apr 2018 11:30:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF0B828917; Sat, 21 Apr 2018 11:30:50 +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 2C21F28909 for ; Sat, 21 Apr 2018 11:30:49 +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=/e5lL03g1LpaL0GXjyBgbW70G3U3X1CTi9Xl8EgSRpg=; b=fSV5wui5hOqcfj4oq73M5xxWwE HU6k7EvF8GYjvX/FvsAsiZkGauVlm3haRnawKX9AlE836mN6pdPI8/RvxG5g51UH49e4/pdF9EdSx rWjGANjtchEMgJm08uLTECFatXr4CGSgrK6LPeWqucSP+/v+OLwhEqlDtKSCxbL0HtbnDkEjF3Vd1 pve8hF8SGGUouEkWAztlhexNEzmGw9i6EMVN19fYvjutpvC7TRqII3uV2NTQvweEiN9JnGMvRhZUF Tmf0H1qknafGOPw5zC8+3cqjhVkmnSyYHwKGFOvFEi1pxpDL5CM+urHJ8/0d+4b+bCwvzXgh281RS ZqklN99g==; 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 1f9qj2-00034h-Gz; Sat, 21 Apr 2018 11:30:40 +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 1f9qi4-0001Pf-9g; Sat, 21 Apr 2018 11:29:42 +0000 Received: from localhost.localdomain ([95.90.209.130]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MCdN8-1fI4BL13wI-009TFH; Sat, 21 Apr 2018 13:29:17 +0200 From: Stefan Wahren To: Rob Herring , Mark Rutland , Eric Anholt , Catalin Marinas , Will Deacon Subject: [PATCH V2 4/9] ARM: dts: bcm2837: Add Raspberry Pi 3 B+ Date: Sat, 21 Apr 2018 13:28:37 +0200 Message-Id: <1524310122-9439-5-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524310122-9439-1-git-send-email-stefan.wahren@i2se.com> References: <1524310122-9439-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K1:WSMWHg4bGFQ8eDPF2SGPfZvW8Uk3y+xunOuQ98q5S4KNoKmQc/A JNAkzu4hhnT7o8Alqh7eMuGQ43/a4gfFcW51AYCZ6bxUpZUHXPvUuNV0ac/932qt8gtEBDa OBe6ZmcugFxsg057b5/5/4dBkhixZJ9cYUjst7e7zyp5JqJ00EWxT6MKv0JfluAkzK2jSwP bn8keUPm4yWfLCnWC87uw== X-UI-Out-Filterresults: notjunk:1; V01:K0:SM5HwhxuEpU=:RpFQBqaXb6/qhNjTVD4Uh8 l4oVTnD58L8LLbVwhMlfLA+iA5ygl+4eJLlOdnu8mPDiYPnO+KQY9yEGwiCAkgovJ2NF9S1M0 0kudCFw82f4VrTi3rBc9zrS9VkYylc3Qw/i2UiEc+udYob4d4g0kdQ/i7dXkCaLlHmHHbNTfM tLJyF6FVOl7dmG4r8Fw//TQVRtOXbC0HHYmyPHwn6TfhBjfzRNfKFy+1evxpfklP8uxsU6i1N Bdkj/RrNgvdg4X1xvD5n4mQXSJfBWIMqJ0phV2SOk6S0GJGbJ2P5LqvxsTNIdCe1o0jV9HoRO M9t3ERJ6z+8xG7JRT96L3VcZ/xvY5JfF0iTV0R93TE84C594KnE4HLHxk26flgnmOxdfqaz1s j6b+Ot8XssbtXrwcGYKNnAKkUTd1con0BunwspkYw/4nxIL9Pr9+yi82ovHDxfFhZtMDBgQGG uKXK071ME3Xmkh+Z+qAu5giA7R7lm2BneOc+qlvIgRJd0Sw7KAib35GPBiD+n178XjLDTk56F lzdCr8gqtYwFI6uY/YBCppBAX9pZzi94wm3JTzXS/zHdmV9pHjzKnmYP5kIgKFIs1D+AZRf+Z lVhjMrn2FQM+wPHsUGSlut4B4HTE9kzf7ThFR+EJNi7MtyIZ5kmRQPDv0ErmBMsDEdrULBEsm +DCrqLAtsoTLHyYdlZjlG/DTBmm+xyfgWgrrU83YzPLO/psy8RNr6Du7olaiOgpICxMIZ2uVD 0vK1h+Ed/74M9hJ9XrMZna0BAuemRX5jRxwMwg== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180421_042940_676411_C5D18B7C X-CRM114-Status: GOOD ( 20.42 ) 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 with integrated USB 2.0 HUB) * 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 an EEPROM or a valid OTP. Signed-off-by: Phil Elwell Signed-off-by: Stefan Wahren Reviewed-by: Eric Anholt --- 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..9403da0 --- /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 { + usb-port@1 { + compatible = "usb424,2514"; + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + usb-port@1 { + compatible = "usb424,2514"; + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + ethernet: ethernet@1 { + compatible = "usb424,7800"; + reg = <1>; + }; + }; + }; +};