From patchwork Sun Nov 13 18:12:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 9424889 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 5921360233 for ; Sun, 13 Nov 2016 18:16:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EA3F28917 for ; Sun, 13 Nov 2016 18:16:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 41BF22891D; Sun, 13 Nov 2016 18:16:37 +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=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=unavailable 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 B7D4E28917 for ; Sun, 13 Nov 2016 18:16:34 +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 1c5zHn-0004sK-HR; Sun, 13 Nov 2016 18:13:47 +0000 Received: from mout.kundenserver.de ([212.227.126.130]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c5zH8-0004nM-CF; Sun, 13 Nov 2016 18:13:10 +0000 Received: from localhost.localdomain ([95.91.4.8]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.167]) with ESMTPSA (Nemesis) id 0M323z-1cydaK2KhT-00swzB; Sun, 13 Nov 2016 19:12:31 +0100 From: Stefan Wahren To: Stephen Warren , Eric Anholt , Lee Jones , Linus Walleij Subject: [PATCH 2/2] ARM: bcm2835: Add names for the Raspberry Pi Zero GPIO lines Date: Sun, 13 Nov 2016 18:12:09 +0000 Message-Id: <1479060729-25769-3-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1479060729-25769-1-git-send-email-stefan.wahren@i2se.com> References: <1479060729-25769-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:3KuBPU/nS0mkPuccRj7zZRHKUJtw42oIHuAd5PcaaVOdL0ENpaa bTen/t9qN781rrVaO58Qgwms1KYlB/4tDFJjHfRk/5qj9X4ko+C18e3dMnraRyrAEX6H5T9 H5N7ZS3yXA08YwuTHFMq5v9YoF1e42Oo0cHj+6oQB06QXDPNOueubm3GFAlFnEP1oTfh+el tUlPWpBmbSaFPEJBwei7w== X-UI-Out-Filterresults: notjunk:1; V01:K0:Vjo0Q8vm9jM=:/lfBDKFPkl7AhgGboltj3f 5FPEgmnYLAJDghRi/EFNUs8Lo/iZNQsGb58qdX95vFDOQEAFBk3cuggSP5IWRR05rtQ0v11mc R/1KwIKM/1gUPOML+ZABvvwm19O7Q2hwTvcS2tvFK8NDdhdpsv9fRVOpEnQRY+R7kP28rSv4d 4IwGIr2TKbVImdzpnSPkfmTQi+bnJCVP1QIofwsjgRhTG4Hd+F4qVNLzI/O4y4it0K/xPTo1F txiHmAMsn2RC6a0CqRq+CtvUX7qaa4xoqsHrYlPcDCZUSsFudHXuqemrcjh36oPUzPG4Ytur1 X18RmGb0d0MR63wjfha9RMj2+/5iy+M1i2pPT6R8ApEs49z5rgW4OJy0wgfyLhJcvrsiRI4Ro N5erO42CTJSyplfIKBRm1f0JV5nLEsOHbMsXTytJcJtVHhFZTqjRrSX6/59V1poaEh87po58y K2B0skMJ5m72fe5pjBOsQmGyozq+u5gAuyLotLvdtLVB7/EYId5xeUYFybqkiY9mPPYcG41hN vCIg8EAhqu7mg1rVXumE64Al1nXHXfNZNOYFRJIIF2NajUodTSBRR3GbwHIWMxwYu5BeXMZtY UsaGnTszE55ycmLV/uM6KDRyxTbqFg6++k9cXYUik8UttvqspKu6iy5/S7FROfwti2Dw7z/JY jVGY7I1DY/vrHYNThuBQHq/t9zoteTChlqgKqZgjiQFY6xXNKKtRl6MO+fJ6avluMxAU= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161113_101306_825242_EFB6A0EE X-CRM114-Status: GOOD ( 13.80 ) 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: Gottfried Haider , Stefan Wahren , linux-kernel@vger.kernel.org, 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 This adds the GPIO names for the Raspberry Pi Zero. Since there are no schematics for the RPi Zero use the same as the Model A+. Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm2835-rpi-a-plus-gpio.dtsi | 75 +++++++++++++++++++++++ arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 76 +----------------------- arch/arm/boot/dts/bcm2835-rpi-zero.dts | 11 +--- 3 files changed, 77 insertions(+), 85 deletions(-) create mode 100644 arch/arm/boot/dts/bcm2835-rpi-a-plus-gpio.dtsi diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus-gpio.dtsi b/arch/arm/boot/dts/bcm2835-rpi-a-plus-gpio.dtsi new file mode 100644 index 0000000..741d64d --- /dev/null +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus-gpio.dtsi @@ -0,0 +1,75 @@ +&gpio { + /* + * This is based on the unreleased schematic for the Model A+. + * + * Legend: + * "NC" = not connected (no rail from the SoC) + * "FOO" = GPIO line named "FOO" on the schematic + * "FOO_N" = GPIO line named "FOO" on schematic, active low + */ + gpio-line-names = "SDA0", + "SCL0", + "SDA1", + "SCL1", + "GPIO_GCLK", + "GPIO5", + "GPIO6", + "SPI_CE1_N", + "SPI_CE0_N", + "SPI_MISO", + "SPI_MOSI", + "SPI_SCLK", + "GPIO12", + "GPIO13", + /* Serial port */ + "TXD0", + "RXD0", + "GPIO16", + "GPIO17", + "GPIO18", + "GPIO19", + "GPIO20", + "GPIO21", + "GPIO22", + "GPIO23", + "GPIO24", + "GPIO25", + "GPIO26", + "GPIO27", + "SDA0", + "SCL0", + "NC", /* GPIO30 */ + "NC", /* GPIO31 */ + "CAM_GPIO1", /* GPIO32 */ + "NC", /* GPIO33 */ + "NC", /* GPIO34 */ + "PWR_LOW_N", /* GPIO35 */ + "NC", /* GPIO36 */ + "NC", /* GPIO37 */ + "USB_LIMIT", /* GPIO38 */ + "NC", /* GPIO39 */ + "PWM0_OUT", /* GPIO40 */ + "CAM_GPIO0", /* GPIO41 */ + "NC", /* GPIO42 */ + "NC", /* GPIO43 */ + "NC", /* GPIO44 */ + "PWM1_OUT", /* GPIO45 */ + "HDMI_HPD_N", + "STATUS_LED", + /* Used by SD Card */ + "SD_CLK_R", + "SD_CMD_R", + "SD_DATA0_R", + "SD_DATA1_R", + "SD_DATA2_R", + "SD_DATA3_R"; + + pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; + + /* I2S interface */ + i2s_alt0: i2s_alt0 { + brcm,pins = <18 19 20 21>; + brcm,function = ; + }; +}; + diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts index d070454..9b665da 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts @@ -2,6 +2,7 @@ #include "bcm2835.dtsi" #include "bcm2835-rpi.dtsi" #include "bcm283x-rpi-usb-host.dtsi" +#include "bcm2835-rpi-a-plus-gpio.dtsi" / { compatible = "raspberrypi,model-a-plus", "brcm,bcm2835"; @@ -21,81 +22,6 @@ }; }; -&gpio { - /* - * This is based on the unreleased schematic for the Model A+. - * - * Legend: - * "NC" = not connected (no rail from the SoC) - * "FOO" = GPIO line named "FOO" on the schematic - * "FOO_N" = GPIO line named "FOO" on schematic, active low - */ - gpio-line-names = "SDA0", - "SCL0", - "SDA1", - "SCL1", - "GPIO_GCLK", - "GPIO5", - "GPIO6", - "SPI_CE1_N", - "SPI_CE0_N", - "SPI_MISO", - "SPI_MOSI", - "SPI_SCLK", - "GPIO12", - "GPIO13", - /* Serial port */ - "TXD0", - "RXD0", - "GPIO16", - "GPIO17", - "GPIO18", - "GPIO19", - "GPIO20", - "GPIO21", - "GPIO22", - "GPIO23", - "GPIO24", - "GPIO25", - "GPIO26", - "GPIO27", - "SDA0", - "SCL0", - "NC", /* GPIO30 */ - "NC", /* GPIO31 */ - "CAM_GPIO1", /* GPIO32 */ - "NC", /* GPIO33 */ - "NC", /* GPIO34 */ - "PWR_LOW_N", /* GPIO35 */ - "NC", /* GPIO36 */ - "NC", /* GPIO37 */ - "USB_LIMIT", /* GPIO38 */ - "NC", /* GPIO39 */ - "PWM0_OUT", /* GPIO40 */ - "CAM_GPIO0", /* GPIO41 */ - "NC", /* GPIO42 */ - "NC", /* GPIO43 */ - "NC", /* GPIO44 */ - "PWM1_OUT", /* GPIO45 */ - "HDMI_HPD_N", - "STATUS_LED", - /* Used by SD Card */ - "SD_CLK_R", - "SD_CMD_R", - "SD_DATA0_R", - "SD_DATA1_R", - "SD_DATA2_R", - "SD_DATA3_R"; - - pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; - - /* I2S interface */ - i2s_alt0: i2s_alt0 { - brcm,pins = <18 19 20 21>; - brcm,function = ; - }; -}; - &hdmi { hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts index 7c1c180..0154ae0 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts @@ -13,6 +13,7 @@ #include "bcm2835.dtsi" #include "bcm2835-rpi.dtsi" #include "bcm283x-rpi-usb-host.dtsi" +#include "bcm2835-rpi-a-plus-gpio.dtsi" / { compatible = "raspberrypi,model-zero", "brcm,bcm2835"; @@ -25,16 +26,6 @@ }; }; -&gpio { - pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; - - /* I2S interface */ - i2s_alt0: i2s_alt0 { - brcm,pins = <18 19 20 21>; - brcm,function = ; - }; -}; - &hdmi { hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; };