From patchwork Mon Jul 22 05:54:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 1134709 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="OFZ7iXgO"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45sW7T2z7cz9sBZ for ; Mon, 22 Jul 2019 15:56:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727364AbfGVF4C (ORCPT ); Mon, 22 Jul 2019 01:56:02 -0400 Received: from mout.gmx.net ([212.227.17.20]:59807 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727336AbfGVF4C (ORCPT ); Mon, 22 Jul 2019 01:56:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563774935; bh=QSYvua6cFBBgHcG13EjnKxqnh2n/IRF+zYxZbCTi1YM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=OFZ7iXgOrXm+fm0HqfkHaTwKPyQmfRGaas2f7x5QNYuF8Ezqo+zlZFgNnTEeAuZ5m DkatNLGVUO/TWiymdyiXwEmEMALRubzvELTvKHarx0DMNJUCubn0D5DqxbA2Odr83l +EgjLO0pzvsx0HOEBaCRpjmir8ZWZa5G8Zd7EYGw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.98]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Mb31L-1i9Qr608PT-00Kklu; Mon, 22 Jul 2019 07:55:35 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Matthias Brugger , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter Cc: bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-mmc@vger.kernel.org, Stefan Wahren Subject: [PATCH 01/18] ARM: bcm283x: Reduce register ranges for UART, SPI and I2C Date: Mon, 22 Jul 2019 07:54:32 +0200 Message-Id: <1563774880-8061-2-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563774880-8061-1-git-send-email-wahrenst@gmx.net> References: <1563774880-8061-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:tBeg4e+PRnl9rhRHHJIkca6IIEKDr2SDF7z8y6MNYTuSjVA/knb usgo3t6iV7x8lOIxnZ7j6rH9vvkQBBcpfLffwvUxYVycAJiML//sV6K0/6P7gh2mXfXS06c qfbDA2NiInjIkpm4z6XPnOSq7rTYOVmyFmZA8nxY/aB1xlS/MKDzA1HMRNw3UD4+lB3h8oq NBYi4DmOejYZhNJVjgHvA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:2ATciYaqYyA=:EVrpHXvoNnbFWY+imnXVTk J4iXTc9ih4iKjlhbix48xG0/Ld61JMJnTO3aIOyLuwlTr+Q4ZAPck5xtaivuPDDMdG8Fx83af I7F6hwQavYO5o1Vs0/gaMtJ/R0Pox35t/OGq7TTFEQZTQC4iEyj/m/zwGJW+4UCQULC44wdkc U2hxIdtAinz0nwS3fdoEPRTS74v5NrJsHHzS5HNxuiIPQfwKVBwQvYlE49DA9E7PjgbunniSj gvdMZj63FPH+2gVjDfQL4FrjyMm/A9Bv5jJrmV2y1sfwb3haJYNlALN0hwu16EOr4r2FG9M2W ce2r4KcN370Q3+FO2mZluQwa9V/p0JAN4SXCkH5sf/d4EpEbXeSBETmvdpiwR7DKGRdlgVVl7 HkJkW4VsAEZIL/SeX+noy5u412a7ZGizJsokxc4wdq6cNW2c6GBjHY/h/POwHbWvBuR4ibN5d XX9eGLEj8C35oimb2/wgbEcN231iyyb888R4FxQiY44B3mIzS6fnA+NWe58AdKeY/d96itpIx H6TjGcuMYn/ijhThLsZDvCU/J7hrWgw+Bw9IZLBhTBNZuTeLSFL4QqqnQ9L0YpWsIpZuFVwwe fHiDMqlSqWHvyaK3F5DbONfZis5Z1UNK8MUrOV6YSOI86CcbMkSZ5bmQ1L5Wf/1rjvT9jtC0N 7GAnyEkFqOuixRWhYa0QrlqgCSeKB0QGZG7Ru5fAO6YAgOkXFF7wJUFZEzL6qbtclcXQBBAec nXd3SKSjFqysGLrmzSXLre8BQIROtIEXinSwdg/RL9tN2Gy0LdH0cwQ+xfkHfoCFWquwIF89w GoM3l2MVzF5cNkR+YDrbHV0TkcJC9AO7bbWbPT5iCwvJ/myOUSZppFr+HgoVsXIhI86oqaIDl IgukA7nkwH2FH7xTrSrSe69aaLLN+BcjN3CHGjrnW0K73SQCBlk0otssjZZcaJCOGYqE06vbh 3+5xzMmkqi+Hhg7qQNP087J0u119KNtiEXxT7Z24jBr6sivX6QUcExmvHMP14KfVMBR4n/2/b sjBRAbmpPv4lIEuK2TDQGaR57wzOkuX5c2CJDGSst5kGXF/gAU5tKIptAxE7Ip9CCTVQs61S2 y+2kdLlBAbfcjg= Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The assigned register ranges for UART, SPI and I2C were too wasteful. In order to avoid overlapping with the new functions on BCM2711 reduce the ranges. Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm283x.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index 4b21ddb..2d191fc 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -397,7 +397,7 @@ uart0: serial@7e201000 { compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; - reg = <0x7e201000 0x1000>; + reg = <0x7e201000 0x200>; interrupts = <2 25>; clocks = <&clocks BCM2835_CLOCK_UART>, <&clocks BCM2835_CLOCK_VPU>; @@ -428,7 +428,7 @@ spi: spi@7e204000 { compatible = "brcm,bcm2835-spi"; - reg = <0x7e204000 0x1000>; + reg = <0x7e204000 0x200>; interrupts = <2 22>; clocks = <&clocks BCM2835_CLOCK_VPU>; dmas = <&dma 6>, <&dma 7>; @@ -440,7 +440,7 @@ i2c0: i2c@7e205000 { compatible = "brcm,bcm2835-i2c"; - reg = <0x7e205000 0x1000>; + reg = <0x7e205000 0x200>; interrupts = <2 21>; clocks = <&clocks BCM2835_CLOCK_VPU>; #address-cells = <1>; From patchwork Mon Jul 22 05:54:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 1134713 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="Zoy6CrDz"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45sW7Y51p7z9sBZ for ; Mon, 22 Jul 2019 15:56:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727360AbfGVF4E (ORCPT ); Mon, 22 Jul 2019 01:56:04 -0400 Received: from mout.gmx.net ([212.227.17.20]:43361 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725811AbfGVF4E (ORCPT ); Mon, 22 Jul 2019 01:56:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563774936; bh=dzdr53EkDfSZtFiMzw7a6OARSi94GiDFaqLyZtNfIl4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Zoy6CrDzGb0Z257hg8xs0g4en5VEPmyESBYKfH+Cj+CsdxJYV1SqQsXjLJa0wxSaS KWIIcthQ96sN/IK/kUtssbyxRPfANK2ZQxlGtSK3QTuJOM5gRO89c/WF4mP5VcMOG0 ootWrmBjktFZLjczcpg/AJTA78QFdckNAQ9k4fZM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.98]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MFz0E-1hbjeY0XRe-00Eqxb; Mon, 22 Jul 2019 07:55:36 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Matthias Brugger , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter Cc: bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-mmc@vger.kernel.org, Phil Elwell , Stefan Wahren Subject: [PATCH 02/18] ARM: bcm2835: DMA can only address 1GB Date: Mon, 22 Jul 2019 07:54:33 +0200 Message-Id: <1563774880-8061-3-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563774880-8061-1-git-send-email-wahrenst@gmx.net> References: <1563774880-8061-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:3KYnU+KY93ySQbXoN6a7vr1jZuSLg8oR5n1EsXsNkt36rd20DMS VBwjTacicgyaL4favnKV7k4PUTLCz84tq75/L+aTV3VtqhtKZBCLf/tqnwY7FPBwUWhLzBa 6eSsLC+RleLIhpzKaVqw1B/UE7GF8EVGriMPREiCsX69eLwypHAnQpaiIJsA6YsG44K3Yv+ Pm4jcJw9o3l0kKerr3tqA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:P4wBPLw9+NM=:GFs+lWv7RZDpBlDQGOMwSf Hl30jJQScoNLQ6Ir/S88NdNWLIdXPDdkwQdv9dc2oFCKRJmet6i6ksHMc2S9dRbKniQF4bI1t yVcUfXwKZsNXTjPUMhEvj2eIoXUIO7IPRnOjuHflFhmRtiot04fdXW/9MzD9T3Cjnu8w/QyFf AvTNO8F4JVS8y46dtCYJGZGpAZno1kWv/Fz/9mfCioH3XvkxSKvhz2L0/CsMyVWcFTRyPwvBz 1BFLG3YLUX6P8DiJHjMy66AyWSOjANq/ojzkF4LVdLGUNKxAOnGZn0941kYtkyF2V0bkIW0J3 aSUpU79SbqN3KLczP7ceacUt5ZsmDH6WGWhHKvP4cM5HRgdRT5fn4gBtEbyq2wyK1uLi/EOyp 7NC5ijRHALHKZwKR5Wq5Ao5+AK5CTPlkKeR7+JEEkCrwTrWxTnOW+VhY8jUNAtdlkZ3yZSuhK X1t8ZjrXVybxl907t1/GkBb5EjkC6Sj62kkPfx9nKq8Ra2TVAZo+0ww4XHNVFvDfWxxSW2j9z L9nbbMBrpN6WslJAtCf2aBX0ii4sT1629K5qbP6nfPbjKOJqW5pJdHGIGUpivkRfOmE/ft6Se EDZQDNGNBznpsIfat5aNE9EZi4J4ivGs4fspOf51lWBwLFLkCA0f+P5Qn1ZtFhR+sZNc8K80x CHmpq1jnxNDs/RzXga1OoqM5lb/Urn845rccq1D1WY6o9EiuywVa9nCTZUES8ETXkW45F3tCQ ZyKndUdnPXu254beD7lyVSBkQeO6DodhR1nbtmSR4d8HMbrsIHfN3pnD7uYRgu92Zwm5r2xnD HL3CLpqeHJtyH6v4gA67BErm9t/zhGg25IxsH03iT6l0/xUWwUE0LGtM3vPj03vLATI1naGrh pdNOcDPXgI6MtJ8brbApn61dNqNjluyy+Jlr8ICZEoGa2biKBS5Wp2jaElaPBdp2Jy6Pk9mKh ueBYlJnX7YwYwmAoFTQvDIgcn077DIejGFeTJzhYQrZfsO7TSDhgR2ayen/ofMuyd5fNc4Fln Htbmm6rfIHFIr8ZjvOuFoaVvgKXKT76vD1M667L6/zkcHHhTZwbOUm0l/h+h59zuJzF8ThEzN LOSgChzoqBan3c= Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Phil Elwell The legacy peripherals on BCM2711 & BCM2835 can only address the first gigabyte of RAM, so ensure that DMA allocations are restricted to that region. Signed-off-by: Phil Elwell Signed-off-by: Stefan Wahren --- arch/arm/mach-bcm/board_bcm2835.c | 1 + 1 file changed, 1 insertion(+) -- 2.7.4 diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c index bfc556f..d2b31a9 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c @@ -24,6 +24,7 @@ static const char * const bcm2835_compat[] = { }; DT_MACHINE_START(BCM2835, "BCM2835") + .dma_zone_size = SZ_1G, .dt_compat = bcm2835_compat, .smp = smp_ops(bcm2836_smp_ops), MACHINE_END From patchwork Mon Jul 22 05:54:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 1134710 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="Az3Zwkzf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45sW7V36zjz9s7T for ; Mon, 22 Jul 2019 15:56:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727379AbfGVF4D (ORCPT ); Mon, 22 Jul 2019 01:56:03 -0400 Received: from mout.gmx.net ([212.227.17.22]:47885 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725811AbfGVF4C (ORCPT ); Mon, 22 Jul 2019 01:56:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563774937; bh=+7xibqiOrfqzdG9I/qPfuNDq74fZDnvGQXxeXOUPkdM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Az3ZwkzfFi3un3t2CJhzaY0nE23b84+gU6aAbzOmGkF4HUUS1I/1AbF24Bc4Cs6yV x3H68oDXs4h8r3H3q086A6/ErlivVw8KfTrBACQKRJGvTbtsdWnXh7nBKFuRehBPRQ zfD77YN+clMO/e6JgKVRIYjRFpSI/gEcJcv9HoUQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.98]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LcVOE-1iFS7q4570-00jnzz; Mon, 22 Jul 2019 07:55:37 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Matthias Brugger , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter Cc: bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-mmc@vger.kernel.org, Stefan Wahren Subject: [PATCH 03/18] ARM: dts: bcm283x: Move BCM2835/6/7 specific to bcm2835-common.dtsi Date: Mon, 22 Jul 2019 07:54:34 +0200 Message-Id: <1563774880-8061-4-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563774880-8061-1-git-send-email-wahrenst@gmx.net> References: <1563774880-8061-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:pFGS43b3bYWxRkUHpdBBKHiYIa0SVUbBG41rLoR+cerMQ39kW6Y K/wGbtv6KHncc370WPwvB3XLMjjybkRhIH6T24lye0Fc8WHZ0QuBjkQGg/NdCjUxibhFxfN O+2/0zTcxLVpot7gZkzLSpsMXe1ADWpMGEVkJF6fFdzt/pT06e2nT3A+afQXnqfvWKYu888 vcCLg55WZkSI1g3qFTL2g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:Rm/DzJpZPxw=:BJF4b72kTUQTefH3w0NYBN CkDKug/zSQ4qwNyAaMsNvw2OZK3n8EFRMP72o0J5qrofQ1Wd8xlvSQ7TYXCOTZXsB93X8sCL7 KtQKeOJDGQTJk+bWJ5LWjU095EuNviP8BRt05a+NZYE1fuDskA+HMtGw4+AiKjrc/zdv7eh5r GtQ/oz5XCjDeYg2U8S2BnqLkiuNo6eTKj2cAT51/+GdvGMV7ez6SjAiYsXiclnS/n9xgQH7pE wqtB6eqdOnVjeqO5+7O0zBjo7I/ClRaF9Xd+ZvzPVwDex/jbzZ6icgzulMMnmUGuY+xG6ZFKR b/FBk5xPvZK78fv/onWcvTDAe0L1JxFF/NiSacxhf/MWtLq3XIoI/+K/4qHyjeKEA0E8y51iv JgTj9SQh7jHFQTvuLMFCV8p66B94I07QSrWklQqrWVHjscSQ9TJkF5X9zI5U+9TklBmlxSfjA oEnaxdgSCK3nQqSh1kbtJCOUnAQaJY2MjD0/YlOI03muhPbsqyh1XRhkIGeqmVUZmPv0+mf1b dQi5GQw90QJlZXrbDdvpSZnpTcwoUwfBwCyKXQ2/NF+1olcKcNmtjmC/Q7x84f5i/qd0dPdgQ SwizGc/+K7E4SizQvrEAAaBmtLjIiPImfHRo9RNASo8eZdQkS4pkhClQ7NynKpB9nnNTyC4Bo 70cz9hNy8vqeRquisHBY/FDlarUpUb6m3MJ4cnyCKSpRF8YbK/p6TrBbcvjZlwR4d91fBrcyL w1CDqoZDrV8UnBR0w4mAExCSKD8K7Lf/RmA/FMFT/ZiLY8Vty9F8Ws2luwc7iv+9Y5Fnx4kwl zTKlVAK0Aczs35nptEfdXZe6yQ84TPNbWGyVNukbahO+0YXyjr7J5lvcpH0YfO/dVeYymZspV C7l6gx3AV83KZNb6Zl4oMkQY5tvfioPIqZXOrD4+ctHuIDMjDP23SkUO6PZNw2+9HruBGeeJ8 m/OIadoCB6wHwWAVZlavT3mZAP4en2XqyAyIChYT216u5j6I/XqkIpsE4VOmDru+MR+Cq2CCi eqlwWwPgxXFHHtgDWRdO0X8FHNuJuyrkwCoKA6JRCuqDmJbOYj3eJ5JbxLP2HVg1AAkhWD5+i pBa1UP814VH/Mg= Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org As preparation we want all common BCM2711 + BCM2835/6/7 functions in bcm283x.dtsi and all BCM2835/6/7 specific in the new bcm2835-common.dtsi. Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm2835-common.dtsi | 177 ++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/bcm2835.dtsi | 1 + arch/arm/boot/dts/bcm2836.dtsi | 1 + arch/arm/boot/dts/bcm2837.dtsi | 1 + arch/arm/boot/dts/bcm283x.dtsi | 152 +---------------------------- 5 files changed, 181 insertions(+), 151 deletions(-) create mode 100644 arch/arm/boot/dts/bcm2835-common.dtsi -- 2.7.4 diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi new file mode 100644 index 0000000..84c2e1b --- /dev/null +++ b/arch/arm/boot/dts/bcm2835-common.dtsi @@ -0,0 +1,177 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* This include file covers the common peripherals and configuration between + * bcm2835, bcm2836 and bcm2837 implementations. + */ + +/ { + interrupt-parent = <&intc>; + + soc { + timer@7e003000 { + compatible = "brcm,bcm2835-system-timer"; + reg = <0x7e003000 0x1000>; + interrupts = <1 0>, <1 1>, <1 2>, <1 3>; + /* This could be a reference to BCM2835_CLOCK_TIMER, + * but we don't have the driver using the common clock + * support yet. + */ + clock-frequency = <1000000>; + }; + + dma: dma@7e007000 { + compatible = "brcm,bcm2835-dma"; + reg = <0x7e007000 0xf00>; + interrupts = <1 16>, + <1 17>, + <1 18>, + <1 19>, + <1 20>, + <1 21>, + <1 22>, + <1 23>, + <1 24>, + <1 25>, + <1 26>, + /* dma channel 11-14 share one irq */ + <1 27>, + <1 27>, + <1 27>, + <1 27>, + /* unused shared irq for all channels */ + <1 28>; + interrupt-names = "dma0", + "dma1", + "dma2", + "dma3", + "dma4", + "dma5", + "dma6", + "dma7", + "dma8", + "dma9", + "dma10", + "dma11", + "dma12", + "dma13", + "dma14", + "dma-shared-all"; + #dma-cells = <1>; + brcm,dma-channel-mask = <0x7f35>; + }; + + intc: interrupt-controller@7e00b200 { + compatible = "brcm,bcm2835-armctrl-ic"; + reg = <0x7e00b200 0x200>; + interrupt-controller; + #interrupt-cells = <2>; + }; + + pm: watchdog@7e100000 { + compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt"; + #power-domain-cells = <1>; + #reset-cells = <1>; + reg = <0x7e100000 0x114>, + <0x7e00a000 0x24>; + clocks = <&clocks BCM2835_CLOCK_V3D>, + <&clocks BCM2835_CLOCK_PERI_IMAGE>, + <&clocks BCM2835_CLOCK_H264>, + <&clocks BCM2835_CLOCK_ISP>; + clock-names = "v3d", "peri_image", "h264", "isp"; + system-power-controller; + }; + + thermal: thermal@7e212000 { + compatible = "brcm,bcm2835-thermal"; + reg = <0x7e212000 0x8>; + clocks = <&clocks BCM2835_CLOCK_TSENS>; + #thermal-sensor-cells = <0>; + status = "disabled"; + }; + + v3d: v3d@7ec00000 { + compatible = "brcm,bcm2835-v3d"; + reg = <0x7ec00000 0x1000>; + interrupts = <1 10>; + }; + + vc4: gpu { + compatible = "brcm,bcm2835-vc4"; + }; + }; + + usbphy: phy { + compatible = "usb-nop-xceiv"; + #phy-cells = <0>; + }; +}; + +&cpu_thermal { + thermal-sensors = <&thermal>; +}; + +&gpio { + i2c_slave_gpio18: i2c_slave_gpio18 { + brcm,pins = <18 19 20 21>; + brcm,function = ; + }; + + jtag_gpio4: jtag_gpio4 { + brcm,pins = <4 5 6 12 13>; + brcm,function = ; + }; + + pwm0_gpio12: pwm0_gpio12 { + brcm,pins = <12>; + brcm,function = ; + }; + pwm0_gpio18: pwm0_gpio18 { + brcm,pins = <18>; + brcm,function = ; + }; + pwm0_gpio40: pwm0_gpio40 { + brcm,pins = <40>; + brcm,function = ; + }; + pwm1_gpio13: pwm1_gpio13 { + brcm,pins = <13>; + brcm,function = ; + }; + pwm1_gpio19: pwm1_gpio19 { + brcm,pins = <19>; + brcm,function = ; + }; + pwm1_gpio41: pwm1_gpio41 { + brcm,pins = <41>; + brcm,function = ; + }; + pwm1_gpio45: pwm1_gpio45 { + brcm,pins = <45>; + brcm,function = ; + }; +}; + +&hdmi { + dmas = <&dma 17>; + dma-names = "audio-rx"; +}; + +&i2s { + dmas = <&dma 2>, <&dma 3>; + dma-names = "tx", "rx"; +}; + +&sdhost { + dmas = <&dma 13>; + dma-names = "rx-tx"; +}; + +&spi { + dmas = <&dma 6>, <&dma 7>; + dma-names = "tx", "rx"; +}; + +&usb { + phys = <&usbphy>; + phy-names = "usb2-phy"; +}; diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi index a5c3824..53bf457 100644 --- a/arch/arm/boot/dts/bcm2835.dtsi +++ b/arch/arm/boot/dts/bcm2835.dtsi @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "bcm283x.dtsi" +#include "bcm2835-common.dtsi" / { compatible = "brcm,bcm2835"; diff --git a/arch/arm/boot/dts/bcm2836.dtsi b/arch/arm/boot/dts/bcm2836.dtsi index c933e84..82d6c46 100644 --- a/arch/arm/boot/dts/bcm2836.dtsi +++ b/arch/arm/boot/dts/bcm2836.dtsi @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "bcm283x.dtsi" +#include "bcm2835-common.dtsi" / { compatible = "brcm,bcm2836"; diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi index beb6c50..9e95fee 100644 --- a/arch/arm/boot/dts/bcm2837.dtsi +++ b/arch/arm/boot/dts/bcm2837.dtsi @@ -1,4 +1,5 @@ #include "bcm283x.dtsi" +#include "bcm2835-common.dtsi" / { compatible = "brcm,bcm2837"; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index 2d191fc..4329b17 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -18,7 +18,6 @@ / { compatible = "brcm,bcm2835"; model = "BCM2835"; - interrupt-parent = <&intc>; #address-cells = <1>; #size-cells = <1>; @@ -36,8 +35,6 @@ polling-delay-passive = <0>; polling-delay = <1000>; - thermal-sensors = <&thermal>; - trips { cpu-crit { temperature = <80000>; @@ -56,85 +53,12 @@ #address-cells = <1>; #size-cells = <1>; - timer@7e003000 { - compatible = "brcm,bcm2835-system-timer"; - reg = <0x7e003000 0x1000>; - interrupts = <1 0>, <1 1>, <1 2>, <1 3>; - /* This could be a reference to BCM2835_CLOCK_TIMER, - * but we don't have the driver using the common clock - * support yet. - */ - clock-frequency = <1000000>; - }; - txp@7e004000 { compatible = "brcm,bcm2835-txp"; reg = <0x7e004000 0x20>; interrupts = <1 11>; }; - dma: dma@7e007000 { - compatible = "brcm,bcm2835-dma"; - reg = <0x7e007000 0xf00>; - interrupts = <1 16>, - <1 17>, - <1 18>, - <1 19>, - <1 20>, - <1 21>, - <1 22>, - <1 23>, - <1 24>, - <1 25>, - <1 26>, - /* dma channel 11-14 share one irq */ - <1 27>, - <1 27>, - <1 27>, - <1 27>, - /* unused shared irq for all channels */ - <1 28>; - interrupt-names = "dma0", - "dma1", - "dma2", - "dma3", - "dma4", - "dma5", - "dma6", - "dma7", - "dma8", - "dma9", - "dma10", - "dma11", - "dma12", - "dma13", - "dma14", - "dma-shared-all"; - #dma-cells = <1>; - brcm,dma-channel-mask = <0x7f35>; - }; - - intc: interrupt-controller@7e00b200 { - compatible = "brcm,bcm2835-armctrl-ic"; - reg = <0x7e00b200 0x200>; - interrupt-controller; - #interrupt-cells = <2>; - }; - - pm: watchdog@7e100000 { - compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt"; - #power-domain-cells = <1>; - #reset-cells = <1>; - reg = <0x7e100000 0x114>, - <0x7e00a000 0x24>; - clocks = <&clocks BCM2835_CLOCK_V3D>, - <&clocks BCM2835_CLOCK_PERI_IMAGE>, - <&clocks BCM2835_CLOCK_H264>, - <&clocks BCM2835_CLOCK_ISP>; - clock-names = "v3d", "peri_image", "h264", "isp"; - system-power-controller; - }; - clocks: cprman@7e101000 { compatible = "brcm,bcm2835-cprman"; #clock-cells = <1>; @@ -184,8 +108,7 @@ interrupt-controller; #interrupt-cells = <2>; - /* Defines pin muxing groups according to - * BCM2835-ARM-Peripherals.pdf page 102. + /* Defines common pin muxing groups * * While each pin can have its mux selected * for various functions individually, some @@ -263,15 +186,7 @@ brcm,pins = <44 45>; brcm,function = ; }; - i2c_slave_gpio18: i2c_slave_gpio18 { - brcm,pins = <18 19 20 21>; - brcm,function = ; - }; - jtag_gpio4: jtag_gpio4 { - brcm,pins = <4 5 6 12 13>; - brcm,function = ; - }; jtag_gpio22: jtag_gpio22 { brcm,pins = <22 23 24 25 26 27>; brcm,function = ; @@ -286,35 +201,6 @@ brcm,function = ; }; - pwm0_gpio12: pwm0_gpio12 { - brcm,pins = <12>; - brcm,function = ; - }; - pwm0_gpio18: pwm0_gpio18 { - brcm,pins = <18>; - brcm,function = ; - }; - pwm0_gpio40: pwm0_gpio40 { - brcm,pins = <40>; - brcm,function = ; - }; - pwm1_gpio13: pwm1_gpio13 { - brcm,pins = <13>; - brcm,function = ; - }; - pwm1_gpio19: pwm1_gpio19 { - brcm,pins = <19>; - brcm,function = ; - }; - pwm1_gpio41: pwm1_gpio41 { - brcm,pins = <41>; - brcm,function = ; - }; - pwm1_gpio45: pwm1_gpio45 { - brcm,pins = <45>; - brcm,function = ; - }; - sdhost_gpio48: sdhost_gpio48 { brcm,pins = <48 49 50 51 52 53>; brcm,function = ; @@ -410,8 +296,6 @@ reg = <0x7e202000 0x100>; interrupts = <2 24>; clocks = <&clocks BCM2835_CLOCK_VPU>; - dmas = <&dma 13>; - dma-names = "rx-tx"; status = "disabled"; }; @@ -419,10 +303,6 @@ compatible = "brcm,bcm2835-i2s"; reg = <0x7e203000 0x24>; clocks = <&clocks BCM2835_CLOCK_PCM>; - - dmas = <&dma 2>, - <&dma 3>; - dma-names = "tx", "rx"; status = "disabled"; }; @@ -431,8 +311,6 @@ reg = <0x7e204000 0x200>; interrupts = <2 22>; clocks = <&clocks BCM2835_CLOCK_VPU>; - dmas = <&dma 6>, <&dma 7>; - dma-names = "tx", "rx"; #address-cells = <1>; #size-cells = <0>; status = "disabled"; @@ -490,14 +368,6 @@ }; - thermal: thermal@7e212000 { - compatible = "brcm,bcm2835-thermal"; - reg = <0x7e212000 0x8>; - clocks = <&clocks BCM2835_CLOCK_TSENS>; - #thermal-sensor-cells = <0>; - status = "disabled"; - }; - aux: aux@7e215000 { compatible = "brcm,bcm2835-aux"; #clock-cells = <1>; @@ -620,8 +490,6 @@ clocks = <&clocks BCM2835_PLLH_PIX>, <&clocks BCM2835_CLOCK_HSM>; clock-names = "pixel", "hdmi"; - dmas = <&dma 17>; - dma-names = "audio-rx"; status = "disabled"; }; @@ -633,19 +501,6 @@ #size-cells = <0>; clocks = <&clk_usb>; clock-names = "otg"; - phys = <&usbphy>; - phy-names = "usb2-phy"; - }; - - v3d: v3d@7ec00000 { - compatible = "brcm,bcm2835-v3d"; - reg = <0x7ec00000 0x1000>; - interrupts = <1 10>; - power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>; - }; - - vc4: gpu { - compatible = "brcm,bcm2835-vc4"; }; }; @@ -671,9 +526,4 @@ clock-frequency = <480000000>; }; }; - - usbphy: phy { - compatible = "usb-nop-xceiv"; - #phy-cells = <0>; - }; }; From patchwork Mon Jul 22 05:54:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 1134714 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="Ybeb0TcF"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45sW7Z5Vxpz9sDQ for ; Mon, 22 Jul 2019 15:56:10 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725811AbfGVF4F (ORCPT ); Mon, 22 Jul 2019 01:56:05 -0400 Received: from mout.gmx.net ([212.227.17.20]:49711 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727359AbfGVF4E (ORCPT ); Mon, 22 Jul 2019 01:56:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563774938; bh=f172zsKe8yNWds5ywNLrH91B/sTzHWIKm+VpqMgCJDM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Ybeb0TcFGtRyIal+8MgzFGfkwMU1sxdLcHz0xTomsuBA7KEsHM/I2wFXJMbX4yjzL 8w1pzuapzfPVl6ovylYHjPt0GfYv0TEBFi9vy9s0AlHbRU1fwDtNPmyV85OyRNfZl4 It2UXBQhGN7Vx75ZTp6lpOJT9547XtfjOjB9WDrU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.98]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LzHZ7-1iSsdU3S2T-014Tm4; Mon, 22 Jul 2019 07:55:38 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Matthias Brugger , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter Cc: bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-mmc@vger.kernel.org, Stefan Wahren Subject: [PATCH 04/18] ARM: dts: bcm283x: Define MMC interfaces at board level Date: Mon, 22 Jul 2019 07:54:35 +0200 Message-Id: <1563774880-8061-5-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563774880-8061-1-git-send-email-wahrenst@gmx.net> References: <1563774880-8061-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:AXy4t8CxDUNd15b3CCEUgH+gIkCfO0Qm9Fz8w70RGONbuZsEztq qBu5Px4rWSx/Ng7D2yPwnCIFyZdPj/0ji+DQZ3YSXuvpSYS+N+sAZ0p85mFQ7o8XRRHw0iK /FtqxsVBxW2rcrknt7pz7/0UditF+dkSen/SHbyUd4zNhvITYb0VjYWOjH8kWAbr7MKkzBI /Yu0ioD3oL2ymU0mP7tUw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:ScrwUdDYiSA=:bSCt8W9lfYgPUCA8uQCa1m GZOP7x65nEu7JfNyPqqhs8D21K2VIqwU7ZdrWtns2Dou3QjyEMdkDS6T4l3PdzP2EsYhWR2HS qF+YiYRJXfDHC0wVsBuvMTKlyizTk8QQxwY4BzTXavUpNPJ/jpBzUCocs2VrGZaRUA3IhJHJn 0Skv7SiykRzbY/i0jKk+eBm+y7YIZe3hKlcV8+F41rplvE+W4okoIjs9C6fzgC3wGnHYT9NKt 8NzOo+KcPmqf88zTz5+9JlgHy4zNfAUo+McX1Txxax+YbH15bCNRZia4g1cVwjh9qGItShGhZ 0zNsWR3Ih/hXUYjm39HabqX/DadaqsGkavet3MYiWkFZ/5pGIfZQz0qktUXrnnGPlivesrIe0 RNUHp3u48aELT8+uWnnuWJZcdUdP7/Q8sxiXsXGhnrnlAx+Ijiy1ykWmH4ysDgGXrQGONuEw7 YDDJ8gw8ATlmAx9G2A1hDc4NwDeabuC/+xeQCyC+Rm5pTcecoFAUWPLF9nd6w/Wo2Z1N+1e2n vDiCtfCzfXWZbvR/F17qgOE1snUDEYQPgQESCPWDiq2sSD/RztUVCyq+rXBj0Xrydx1WI2DCk Uwtfdzl7rKs2DpiYLW2n7Tnbh8dnxKbAgaltDDOaLC1LyIRtf1NU0VgCr5ZkgsRnzxAHMwWEr DZCgk7Jxhgszwg0DttTpP613HCkVVFKjFSii20dbXjvrLMWdKvtXdJwvvFl40pGoM5CeLXIq3 Cz70Wa6X/ZWAHvo8R5BJZDEqcxivG01lKCwREwJXfjaTDWW3rSj+G5MsCiXYf3WV3++YHMi2G EjJbL2y/G47DFj6joRReGL9yIpVCX9Tufw5DN9UdjJlDliXxdYO9c2damQfnhs2Ozr+bE1w05 ANOo0QBwuJ2eEWW15uh4ea2x8LtFuTvAz0PD0tDY0ecfr4DfeeajN9YpGa6Xc/t39w8myZgro psutpJwihMPeE+UjRDIW6iprD3Bosyvt9JhRyKUEzqe1KDg2oAiJJgm1XyrhFa3xlyRYi7+9m GYsC0mCxeNXgP4MFHmHCE88g0/X1tkcUsbA/T30f4N1RvZqLrGsXv5/SAsbE7vc2KQ3QCu5MB 652VLbOPxVYq8Y= Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Starting with RPi 4 this is the first board, which doesn't use sdhost as default SD interface. So the MMC interfaces should be defined finally at board level. Since all boards using sdhci already does this, we can drop the pinctrl part from bcm2835-rpi.dtsi. Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 7 +++++++ arch/arm/boot/dts/bcm2835-rpi-a.dts | 7 +++++++ arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 7 +++++++ arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 7 +++++++ arch/arm/boot/dts/bcm2835-rpi-b.dts | 7 +++++++ arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 7 +++++++ arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 7 +++++++ arch/arm/boot/dts/bcm2835-rpi-zero.dts | 7 +++++++ arch/arm/boot/dts/bcm2835-rpi.dtsi | 13 ------------- arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 7 +++++++ arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 7 +++++++ 11 files changed, 70 insertions(+), 13 deletions(-) -- 2.7.4 diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts index db8a601..cb3f08d 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts @@ -107,6 +107,13 @@ status = "okay"; }; +&sdhost { + pinctrl-names = "default"; + pinctrl-0 = <&sdhost_gpio48>; + bus-width = <4>; + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_gpio14>; diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts index 067d1f0..2d167d9 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts @@ -102,6 +102,13 @@ status = "okay"; }; +&sdhost { + pinctrl-names = "default"; + pinctrl-0 = <&sdhost_gpio48>; + bus-width = <4>; + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_gpio14>; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts index 1e40d67..83a3a60 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts @@ -109,6 +109,13 @@ status = "okay"; }; +&sdhost { + pinctrl-names = "default"; + pinctrl-0 = <&sdhost_gpio48>; + bus-width = <4>; + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_gpio14>; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts index 28e7513..b6b4fea 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts @@ -102,6 +102,13 @@ status = "okay"; }; +&sdhost { + pinctrl-names = "default"; + pinctrl-0 = <&sdhost_gpio48>; + bus-width = <4>; + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_gpio14>; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts index 31ff602..b5782fa 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -97,6 +97,13 @@ status = "okay"; }; +&sdhost { + pinctrl-names = "default"; + pinctrl-0 = <&sdhost_gpio48>; + bus-width = <4>; + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_gpio14>; diff --git a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts index 4764a25..41afea4 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts @@ -81,6 +81,13 @@ hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; +&sdhost { + pinctrl-names = "default"; + pinctrl-0 = <&sdhost_gpio48>; + bus-width = <4>; + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_gpio14>; diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts index ba0167d..5ecc403 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts @@ -116,6 +116,13 @@ }; }; +&sdhost { + pinctrl-names = "default"; + pinctrl-0 = <&sdhost_gpio48>; + bus-width = <4>; + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_gpio32 &uart0_ctsrts_gpio30>; diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts index 3b35a8a..84c7035 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts @@ -98,6 +98,13 @@ hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; +&sdhost { + pinctrl-names = "default"; + pinctrl-0 = <&sdhost_gpio48>; + bus-width = <4>; + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_gpio14>; diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index 715d50c..40bac52e 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -68,19 +68,6 @@ status = "okay"; }; -&sdhci { - pinctrl-names = "default"; - pinctrl-0 = <&emmc_gpio48>; - bus-width = <4>; -}; - -&sdhost { - pinctrl-names = "default"; - pinctrl-0 = <&sdhost_gpio48>; - status = "okay"; - bus-width = <4>; -}; - &usb { power-domains = <&power RPI_POWER_DOMAIN_USB>; }; diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts index 7b4e651..f97ec95 100644 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts @@ -113,6 +113,13 @@ status = "okay"; }; +&sdhost { + pinctrl-names = "default"; + pinctrl-0 = <&sdhost_gpio48>; + bus-width = <4>; + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_gpio14>; diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts index 6c8233a..433e306 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts @@ -80,6 +80,13 @@ hpd-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>; }; +&sdhost { + pinctrl-names = "default"; + pinctrl-0 = <&sdhost_gpio48>; + bus-width = <4>; + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_gpio14>; From patchwork Mon Jul 22 05:54:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 1134716 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="AwFDE/Yy"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45sW7d2cjdz9s7T for ; Mon, 22 Jul 2019 15:56:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727395AbfGVF4H (ORCPT ); Mon, 22 Jul 2019 01:56:07 -0400 Received: from mout.gmx.net ([212.227.17.21]:58793 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727407AbfGVF4G (ORCPT ); Mon, 22 Jul 2019 01:56:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563774938; bh=bMN5HaH7xs5OZI3fgydBkJ1gPM3MHOTFQvPIB1gYS7c=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=AwFDE/YySr0GdGHIZmfP53fgwqRgOCKx16WpA6xGERQjIWtRG6aGsfOirYqDxVL0e /GcVyBML+tKD+IuozYeUfUHfUUbf6n84gIiDGEZJ6Rbd7OQXtPNggk0cWjqwygCF5q Cb3neq5NA5ocuE9smWmu82nzSAUampsAQfUqwZu8= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.98]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MFz0E-1hbjeW2byg-00Eqxb; Mon, 22 Jul 2019 07:55:38 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Matthias Brugger , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter Cc: bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-mmc@vger.kernel.org, Stefan Wahren Subject: [PATCH 05/18] ARM: dts: bcm283x: Define memory at board level Date: Mon, 22 Jul 2019 07:54:36 +0200 Message-Id: <1563774880-8061-6-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563774880-8061-1-git-send-email-wahrenst@gmx.net> References: <1563774880-8061-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:X3xwkgbaTPJx1LgEFk4hJ11u0bJ5hSD3ydEnoGP91/5YDumjkEq 7xTve7hfbhDN9BqwDcmMKCrrjTWl2bXMtvUMiiJbYQrmeUwPdyPTsmaALS1mpbhSVBdD/s0 TtdUXg7SX+RnRbOBcNpb69Ykzzd/waAkbKAStqt6cA8UZ0mgzB6ShkRCYwooyjII1XctQLS TYqmXtE/GJRNVs1tYRGdw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:p0bBXSMhw48=:pR4PKOamJEV9esR7U1N/Ac k9OSI1+vFb3GFbkolnEtJUAJ3bhHAX2W/CR7xEMOh+4V5MIysIByCFpMAcOH9bGl6gmtCrlxG HrFgVdDmmTvvzNi+WxHsCDfpE678EcJ3Xs7Wjp1ty9S2tr4FMx4V4+TEafpV06RiriCfTN5xZ P+XXG39LhB0usd+GN3CLw7fCt93KEBCP1zdUlAVrC8nerl/WC2fmQSGMWrsvEweKKK7/7AGpK ZPuz4LcLj4olHRGjdMDMwO8XKaOhA46w0AoPv7IPxx6IKZ+Se668Ypjm9OSAe+ikInliFUCOI 8oW81u1v5jGpezwOgAlNtjag9QuLgNrQquEMNkRBVV+nOzBqFoXTJqexe9huxfZxQ2bO7UhHj gLcP4reRZsnxHtZ/mgrD7mORoF95h2o1v84xn7v2Kwt/oGr4DnQLRupzwxAf5YhYSvuL2xSKy rnanLzasj1AaTNpVJpVcqULFbH9guRIJ0XCmx/7wa7u5JwCUh+b4D703DHxVXTVGCGr9BQYNP s+YkpX/W9dIfMdrM6vhJN36P1lmYen2sv7LRw2t59Uf3E6OoozHewAqz6CjjXD+P+m47EGyy3 4tBjFfVYcquppLiHOUWpnlnSlGLSvCdX03lnNLgq6tcnf5eHm34XYdAtuAj2DdSQfBP+ouqef V5Zx1IG7eAr341zwPTx9mcS146L6/4Yv3ztZ4QJ8Ne/FovSvAJkyVwobhQ5WcaAG/IirVZWfa uSGonTbIKJ3dfdkAaeWIGpq7+OFGpgCipENmNuTponND5rWcEpLgAIEtnBK18ZjddyFefDLvg +Sm7bHGmtNuonXKw8FOhwlqvjHuDyEDpfrTNlOtfzpBiyeP/mSliAVmStQUL0e/MdIGUIjDVr sD1Ie6LGJ3pLpUlKSOg/hDFEivhbRfwa3c/JWk3OyiYReHoGRNN1Coieo6LTvxr/JPYqztAiF x6+/QFrkIW+WMBjco4RW3akDMuHQLYSjIn4ZYWEnV+fSfZDaTgO2y1jLnt0AqZ3z6xrgABDr6 2xw7JfZisu5Z/EuFLpjUdBFmgbKhwvsSIvc3CUVbCdx1H35PafIZfKExVU/AFcqrJs0MCv2rl mOSsEDlEFmgh0I= Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Now with the varity of several RPi boards, the memory should be defined at board level. This step gives us the chance to fix the memory size of the RPi 1 B+, Zero (incl. W) and Compute Module 1. Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 5 +++++ arch/arm/boot/dts/bcm2835-rpi-a.dts | 5 +++++ arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 5 +++++ arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 5 +++++ arch/arm/boot/dts/bcm2835-rpi-b.dts | 5 +++++ arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi | 5 +++++ arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 5 +++++ arch/arm/boot/dts/bcm2835-rpi-zero.dts | 5 +++++ arch/arm/boot/dts/bcm2835-rpi.dtsi | 5 ----- arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 1 + arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 1 + arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 1 + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 1 + arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 1 + 14 files changed, 45 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts index cb3f08d..5b42e9a 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts @@ -8,6 +8,11 @@ compatible = "raspberrypi,model-a-plus", "brcm,bcm2835"; model = "Raspberry Pi Model A+"; + memory@0 { + device_type = "memory"; + reg = <0 0x10000000>; + }; + leds { act { gpios = <&gpio 47 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts index 2d167d9..b716214 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts @@ -8,6 +8,11 @@ compatible = "raspberrypi,model-a", "brcm,bcm2835"; model = "Raspberry Pi Model A"; + memory@0 { + device_type = "memory"; + reg = <0 0x10000000>; + }; + leds { act { gpios = <&gpio 16 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts index 83a3a60..3318082 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts @@ -9,6 +9,11 @@ compatible = "raspberrypi,model-b-plus", "brcm,bcm2835"; model = "Raspberry Pi Model B+"; + memory@0 { + device_type = "memory"; + reg = <0 0x20000000>; + }; + leds { act { gpios = <&gpio 47 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts index b6b4fea..97d7eb5 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts @@ -9,6 +9,11 @@ compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835"; model = "Raspberry Pi Model B rev2"; + memory@0 { + device_type = "memory"; + reg = <0 0x10000000>; + }; + leds { act { gpios = <&gpio 16 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts index b5782fa..37e02a1 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -9,6 +9,11 @@ compatible = "raspberrypi,model-b", "brcm,bcm2835"; model = "Raspberry Pi Model B"; + memory@0 { + device_type = "memory"; + reg = <0 0x10000000>; + }; + leds { act { gpios = <&gpio 16 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi b/arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi index ef22c2d..58059c2 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi @@ -10,6 +10,11 @@ }; }; + memory@0 { + device_type = "memory"; + reg = <0 0x20000000>; + }; + reg_3v3: fixed-regulator { compatible = "regulator-fixed"; regulator-name = "3V3"; diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts index 5ecc403..f38f388 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts @@ -12,6 +12,11 @@ compatible = "raspberrypi,model-zero-w", "brcm,bcm2835"; model = "Raspberry Pi Zero W"; + memory@0 { + device_type = "memory"; + reg = <0 0x20000000>; + }; + chosen { /* 8250 auxiliary UART instead of pl011 */ stdout-path = "serial1:115200n8"; diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts index 84c7035..5fd0686 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts @@ -12,6 +12,11 @@ compatible = "raspberrypi,model-zero", "brcm,bcm2835"; model = "Raspberry Pi Zero"; + memory@0 { + device_type = "memory"; + reg = <0 0x20000000>; + }; + leds { act { gpios = <&gpio 47 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index 40bac52e..f5125b7 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -1,11 +1,6 @@ #include / { - memory@0 { - device_type = "memory"; - reg = <0 0x10000000>; - }; - leds { compatible = "gpio-leds"; diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts index f97ec95..6a89999 100644 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts @@ -10,6 +10,7 @@ model = "Raspberry Pi 2 Model B"; memory@0 { + device_type = "memory"; reg = <0 0x40000000>; }; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts index 7f4437a..0e29aaa 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts @@ -14,6 +14,7 @@ }; memory@0 { + device_type = "memory"; reg = <0 0x20000000>; }; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts index c6fa34c..a1487ae 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts @@ -15,6 +15,7 @@ }; memory@0 { + device_type = "memory"; reg = <0 0x40000000>; }; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts index ce71f57..a36bfdb 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -15,6 +15,7 @@ }; memory@0 { + device_type = "memory"; reg = <0 0x40000000>; }; diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi index 81399b2..7c3cb7e 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi @@ -5,6 +5,7 @@ / { memory@0 { + device_type = "memory"; reg = <0 0x40000000>; }; From patchwork Mon Jul 22 05:54:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 1134711 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="WAcQDrsb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45sW7W4yP3z9sBZ for ; Mon, 22 Jul 2019 15:56:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727381AbfGVF4D (ORCPT ); Mon, 22 Jul 2019 01:56:03 -0400 Received: from mout.gmx.net ([212.227.17.20]:57615 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726701AbfGVF4C (ORCPT ); Mon, 22 Jul 2019 01:56:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563774939; bh=iBgoZEjqz1uvIdXtw/jNq8gNBaVuMlaRN35UMIiLDco=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=WAcQDrsb3w3p7Xi5DZHYcCaC8VjjmomOSaVi+vLjBkIYXlq6n9LRDoViTrLPhcCG/ 8T/zHwRhLBnzyLl/MLyrI6JIaeGTiHe78FclVr1enuxev52WVK2G59tBTd7FZjx7fY g9hrhNnFY/Fubf8RaDy41kdPd2LLRp1Hg/vF5Tq4= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.98]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Me5Q2-1i4Dmn1gRq-00Pxpf; Mon, 22 Jul 2019 07:55:39 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Matthias Brugger , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter Cc: bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-mmc@vger.kernel.org, Stefan Wahren Subject: [PATCH 06/18] dt-bindings: bcm2835-cprman: Add bcm2711 support Date: Mon, 22 Jul 2019 07:54:37 +0200 Message-Id: <1563774880-8061-7-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563774880-8061-1-git-send-email-wahrenst@gmx.net> References: <1563774880-8061-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:l/MjxzPQLu7Ob/0EM/lxZew7fom9VFEYdrdZU8LU4EKKAr/D1J1 fM+Z1x/rK7ksOIO8DrAVlJc3ZqRmcvBsFeqPeoCmpJz2NyrmAK8YpDddDSSvkW09NBiwXmd BpM+mZZ4FBTEC3zvWYcLzm0EeCpSb3RkLJgGkrP9k6NmoMmR9oSHmH8shJPcO/Ap47WMKZr /Z9D2x0Cq20ptvVHpQaOw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:P+/kdd+TwHM=:8FUBPHf0/8+qFt6wQVsCh3 Rg1HiKrxOrblkjCvfD7+fXMt/S8iiYvYCbBThrvZrJjiBJP0DAqvj95O6avO6mMBAbZ5Q3ko1 r0iBI4bxhqyWkFF6Tc2EU55IKVCUI69gYbxGqaMBhZQjuyBbkjpY/wpjrtSvuRD3Qg8hN45z0 rFLtRN2V0llLayek1PZVVxMkYQL1DtGGR4CkYcssjT/eGPdHVoNafi7Xk1IDhRTegw/QPSlrb g5EfkQ872NmBQE/Z9qHjlOSz0OqQ/OykCT3B929avxPY+Y4+ug1ZccE5ODQVzmX1UpOs4Iywl DAz+0uYLupEvO6qWm4vhMRePBQglLldxj/yzj4vVFNvHTXyJe8rsKFiis4cB1GpnXot5KRwUU fGroCSjypfS3fOn9qE49h3hthWb80aOQ5zlpf/xt+Zo8LP5J/+h2GdPyO/iXLpTShAslxVl+P JO8aAVMAMhSUxxBilGLyZbuJVSg1QWCD3cn1caJUlDr6VXBuQhvuCmT58rbwvuvx58wre0Iav CroiRlV9JYvrIc+FvRxe93on4SlK/v8bzLPBtNzfqjMvUaugghhq3PNUilMDcxfuxw1QUZCsA T9CKcDvaY5aQsONWvX2eIjDRqzOPfAu3XwW7HC/E6EPm2aq19ukECpDpegeK0jMOKX93OWBTA P8RS6lg2P+s8OyscACluqEXHGaxUnrZ9S2ClwqKYl28cdHOmEwcgWn9MVFgppoc3sFcHEhjrt 7Fu1V7YkOZnNCMU4hOvqC3zNc8ns448kKaAuES4E71JG2p84VjZ7ezWUSWtcbHlID8ZwD8Uby jubELe3i5iwk6UZ4paNdkFkUn+MUB7q3T+BnhKkbiEZkf9Q9KI7cyxccl3laQVzXfp65VQRpK 8m/+K89Art4FReadbrmZo0AFMDDFT/bbch1L4aflo9lqo1bFa21iYC93zv3P7BlTD6sVy44Hf drFuGnJHBWvcC6UjksrxVFVSsfbwc3OWH0zx1K510fCB0ITijK5E/acu+DHO3379y2oNSZGGc o5Ujd3nQanzr2LiRIKjdfIOdWqJwcjYxrZykpXzlFsT2og0XTpQzxXuL6To3AyoQLcp/CZy5j eMJua1ikFqcBbA= Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The new BCM2711 supports an additional clock for the emmc2 block. So we need an additional compatible. Signed-off-by: Stefan Wahren --- Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt | 4 +++- include/dt-bindings/clock/bcm2835.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt b/Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt index dd906db..9e0b03a 100644 --- a/Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt +++ b/Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt @@ -12,7 +12,9 @@ clock generators, but a few (like the ARM or HDMI) will source from the PLL dividers directly. Required properties: -- compatible: Should be "brcm,bcm2835-cprman" +- compatible: should be one of the following, + "brcm,bcm2711-cprman" + "brcm,bcm2835-cprman" - #clock-cells: Should be <1>. The permitted clock-specifier values can be found in include/dt-bindings/clock/bcm2835.h - reg: Specifies base physical address and size of the registers diff --git a/include/dt-bindings/clock/bcm2835.h b/include/dt-bindings/clock/bcm2835.h index 2cec01f..b60c0343 100644 --- a/include/dt-bindings/clock/bcm2835.h +++ b/include/dt-bindings/clock/bcm2835.h @@ -58,3 +58,5 @@ #define BCM2835_CLOCK_DSI1E 48 #define BCM2835_CLOCK_DSI0P 49 #define BCM2835_CLOCK_DSI1P 50 + +#define BCM2711_CLOCK_EMMC2 51 From patchwork Mon Jul 22 05:54:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 1134715 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="HuiV5EjI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45sW7b64Wcz9sBZ for ; Mon, 22 Jul 2019 15:56:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727409AbfGVF4H (ORCPT ); Mon, 22 Jul 2019 01:56:07 -0400 Received: from mout.gmx.net ([212.227.17.20]:49269 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727395AbfGVF4G (ORCPT ); Mon, 22 Jul 2019 01:56:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563774940; bh=cudRuspaqlYWwlEIcsrXp2GOPdVKrZrdrR8utXa8E3g=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=HuiV5EjI2gcNRdsUdlNDxAEXs8sR0gImRfXC/7DB3RP85yrabIDq5NQHncs3fvGtY 65tQO9rI8TggHC1wfLEuNQO+RnlUJgnexz1rHSTNgeo0/jrRK+KFu7OAkGPmhFvVJ7 eU6p/mPaXxFxNmdk4WwM6ilOz7j5hXXgv0ROwXVo= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.98]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MOTRh-1hjfzt0jkz-005ogW; Mon, 22 Jul 2019 07:55:40 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Matthias Brugger , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter Cc: bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-mmc@vger.kernel.org, Stefan Wahren Subject: [PATCH 07/18] clk: bcm2835: Introduce SoC specific clock registration Date: Mon, 22 Jul 2019 07:54:38 +0200 Message-Id: <1563774880-8061-8-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563774880-8061-1-git-send-email-wahrenst@gmx.net> References: <1563774880-8061-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:eszUSIGiCy76Kio/7/F0P9aMkhMnVmVVhCnbqJnbUjxnKpYXKQW hNct85tJSdcfNPGx79cKYDJWr8eXg4hEWQD5k4VZg7wN6+dEtmrVRpviQMPGozerxdXvktH gft6gt6KLUpZ3XqDWVXeDl00dwpYp5NYpNy+T9TQ7v4jzoFzn+CoLmh2P/Ji82LbMURP57f MfAybwa64IQBruxP4MMJA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:mSt9ecxj8EQ=:9AxjYi6Uo0VUV42C3KRHif 2CZzaq3fu+k32XDcnSij6ZlPneAlGvIrfA+6altCF3G2HE7DqO+9Df8Roe4SN4v+NkjjS+WI7 Kq38XUkreOVTsihrZSD+dqU+C/SVhYgUoT+WcmvGU4weyjBDLLIVNYAMPjC2N6JEf/fGWViJ0 In+xNJB9W9AcB96kUhb+SobmNRlIruoq9g6BNquerrn/rAlHxVQTBWwypvGxytEfP9MfgBgSX f+W/sfbdS9ocQO+ifDoapMv/AJPpulK9NgSMaupXPMKKWWz5nZW428LlyEk32DEwwMtQR4hIn uAF6ZsLoUzYuFbW/YYeYIfsTY3xU4OUgWUEINKkrjhv0xR0qouBgod3BVm3oBHl1c5lt/G8kU hMXNTAM5w35Nl/etP+EdvXRB0qgjLV7tlUbpGJpfAGQBryghEZyWKwROIHPH8WBTeRsUgVPiY ePa8PJ8IZtVilTm+ugQAxmcVfAo29Z+kQ0N0p+hBskPIo4/mxakfje4TlwUJErJHX8z2OmVHZ XUfajq7EeuFpgh+APk5X4yTy5HYu43mam5GXdqTttzwfJTWf+DN8QAem6btRk134+eIZZxJin 3UNwEPwXheZ94Vw1SLydtv2TgQS5YKMYfs696JtdL3QijSqh3Z1oZRvk1QjAIIiRiH9Pc6Uvm j5hmc7ZF8NWkHuzC1rpneuDmD7iBuaN6MwnhUGj2JIN9mWCJg3EWR7at6QeSw3DCTfoibFK2L jg2VVnzVoBMmXJQ5MUXj8k9A3lTP3TLaG+egeRQrsYVj+vuARiN1xoZIgb6E4yVcg4vwso1Oz Lw3Mgu7bXfoW2fHkWxYs/GTxlgt8n8+X7ooLs/BJmRZSp4OTw/l8InlvzgLtiL6UUr4Gclrnj uZ+VXNsSY1/+ZQXdkoLtWIm/Ur1ga1+yNnsf65Ztvl5YskExLPmNAsscJAUWEsEoso5ucbLuM LG7MmmP56SgpfqjvFQ84rOd5RpDzwGb3xlNImekbQKMkX4Y4vGwNbUaNMmFqxHiSM8Jdcs65F sat4yKh/3v+2T17ZWsnzqY+IqyraP1JyLJ2o+mWqJ0goCwEjQvgTyFrVhA7PVKH3nTRrrvtwu +uUUyjquahfvTA= Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org In order to support SoC specific clocks (e.g. emmc2 for BCM2711), we extend the description with a SoC support flag. This approach avoids long and mostly redundant lists of clock IDs. Suggested-by: Florian Fainelli Signed-off-by: Stefan Wahren Reviewed-by: Matthias Brugger --- drivers/clk/bcm/clk-bcm2835.c | 103 +++++++++++++++++++++++++++++++++++------- 1 file changed, 86 insertions(+), 17 deletions(-) -- 2.7.4 diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c index 867ae3c..3231b76 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -289,6 +289,9 @@ #define LOCK_TIMEOUT_NS 100000000 #define BCM2835_MAX_FB_RATE 1750000000u +#define SOC_BCM2835 BIT(0) +#define SOC_ALL (SOC_BCM2835) + /* * Names of clocks used within the driver that need to be replaced * with an external parent's name. This array is in the order that @@ -1451,22 +1454,28 @@ typedef struct clk_hw *(*bcm2835_clk_register)(struct bcm2835_cprman *cprman, const void *data); struct bcm2835_clk_desc { bcm2835_clk_register clk_register; + unsigned int supported; const void *data; }; /* assignment helper macros for different clock types */ -#define _REGISTER(f, ...) { .clk_register = (bcm2835_clk_register)f, \ - .data = __VA_ARGS__ } -#define REGISTER_PLL(...) _REGISTER(&bcm2835_register_pll, \ +#define _REGISTER(f, s, ...) { .clk_register = (bcm2835_clk_register)f, \ + .supported = s, \ + .data = __VA_ARGS__ } +#define REGISTER_PLL(s, ...) _REGISTER(&bcm2835_register_pll, \ + s, \ &(struct bcm2835_pll_data) \ {__VA_ARGS__}) -#define REGISTER_PLL_DIV(...) _REGISTER(&bcm2835_register_pll_divider, \ - &(struct bcm2835_pll_divider_data) \ - {__VA_ARGS__}) -#define REGISTER_CLK(...) _REGISTER(&bcm2835_register_clock, \ +#define REGISTER_PLL_DIV(s, ...) _REGISTER(&bcm2835_register_pll_divider, \ + s, \ + &(struct bcm2835_pll_divider_data) \ + {__VA_ARGS__}) +#define REGISTER_CLK(s, ...) _REGISTER(&bcm2835_register_clock, \ + s, \ &(struct bcm2835_clock_data) \ {__VA_ARGS__}) -#define REGISTER_GATE(...) _REGISTER(&bcm2835_register_gate, \ +#define REGISTER_GATE(s, ...) _REGISTER(&bcm2835_register_gate, \ + s, \ &(struct bcm2835_gate_data) \ {__VA_ARGS__}) @@ -1480,7 +1489,8 @@ static const char *const bcm2835_clock_osc_parents[] = { "testdebug1" }; -#define REGISTER_OSC_CLK(...) REGISTER_CLK( \ +#define REGISTER_OSC_CLK(s, ...) REGISTER_CLK( \ + s, \ .num_mux_parents = ARRAY_SIZE(bcm2835_clock_osc_parents), \ .parents = bcm2835_clock_osc_parents, \ __VA_ARGS__) @@ -1497,7 +1507,8 @@ static const char *const bcm2835_clock_per_parents[] = { "pllh_aux", }; -#define REGISTER_PER_CLK(...) REGISTER_CLK( \ +#define REGISTER_PER_CLK(s, ...) REGISTER_CLK( \ + s, \ .num_mux_parents = ARRAY_SIZE(bcm2835_clock_per_parents), \ .parents = bcm2835_clock_per_parents, \ __VA_ARGS__) @@ -1522,7 +1533,8 @@ static const char *const bcm2835_pcm_per_parents[] = { "-", }; -#define REGISTER_PCM_CLK(...) REGISTER_CLK( \ +#define REGISTER_PCM_CLK(s, ...) REGISTER_CLK( \ + s, \ .num_mux_parents = ARRAY_SIZE(bcm2835_pcm_per_parents), \ .parents = bcm2835_pcm_per_parents, \ __VA_ARGS__) @@ -1541,7 +1553,8 @@ static const char *const bcm2835_clock_vpu_parents[] = { "pllc_core2", }; -#define REGISTER_VPU_CLK(...) REGISTER_CLK( \ +#define REGISTER_VPU_CLK(s, ...) REGISTER_CLK( \ + s, \ .num_mux_parents = ARRAY_SIZE(bcm2835_clock_vpu_parents), \ .parents = bcm2835_clock_vpu_parents, \ __VA_ARGS__) @@ -1577,12 +1590,14 @@ static const char *const bcm2835_clock_dsi1_parents[] = { "dsi1_byte_inv", }; -#define REGISTER_DSI0_CLK(...) REGISTER_CLK( \ +#define REGISTER_DSI0_CLK(s, ...) REGISTER_CLK( \ + s, \ .num_mux_parents = ARRAY_SIZE(bcm2835_clock_dsi0_parents), \ .parents = bcm2835_clock_dsi0_parents, \ __VA_ARGS__) -#define REGISTER_DSI1_CLK(...) REGISTER_CLK( \ +#define REGISTER_DSI1_CLK(s, ...) REGISTER_CLK( \ + s, \ .num_mux_parents = ARRAY_SIZE(bcm2835_clock_dsi1_parents), \ .parents = bcm2835_clock_dsi1_parents, \ __VA_ARGS__) @@ -1602,6 +1617,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { * AUDIO domain is on. */ [BCM2835_PLLA] = REGISTER_PLL( + SOC_ALL, .name = "plla", .cm_ctrl_reg = CM_PLLA, .a2w_ctrl_reg = A2W_PLLA_CTRL, @@ -1616,6 +1632,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .max_rate = 2400000000u, .max_fb_rate = BCM2835_MAX_FB_RATE), [BCM2835_PLLA_CORE] = REGISTER_PLL_DIV( + SOC_ALL, .name = "plla_core", .source_pll = "plla", .cm_reg = CM_PLLA, @@ -1625,6 +1642,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .fixed_divider = 1, .flags = CLK_SET_RATE_PARENT), [BCM2835_PLLA_PER] = REGISTER_PLL_DIV( + SOC_ALL, .name = "plla_per", .source_pll = "plla", .cm_reg = CM_PLLA, @@ -1634,6 +1652,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .fixed_divider = 1, .flags = CLK_SET_RATE_PARENT), [BCM2835_PLLA_DSI0] = REGISTER_PLL_DIV( + SOC_ALL, .name = "plla_dsi0", .source_pll = "plla", .cm_reg = CM_PLLA, @@ -1642,6 +1661,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .hold_mask = CM_PLLA_HOLDDSI0, .fixed_divider = 1), [BCM2835_PLLA_CCP2] = REGISTER_PLL_DIV( + SOC_ALL, .name = "plla_ccp2", .source_pll = "plla", .cm_reg = CM_PLLA, @@ -1663,6 +1683,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { * AUDIO domain is on. */ [BCM2835_PLLC] = REGISTER_PLL( + SOC_ALL, .name = "pllc", .cm_ctrl_reg = CM_PLLC, .a2w_ctrl_reg = A2W_PLLC_CTRL, @@ -1677,6 +1698,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .max_rate = 3000000000u, .max_fb_rate = BCM2835_MAX_FB_RATE), [BCM2835_PLLC_CORE0] = REGISTER_PLL_DIV( + SOC_ALL, .name = "pllc_core0", .source_pll = "pllc", .cm_reg = CM_PLLC, @@ -1686,6 +1708,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .fixed_divider = 1, .flags = CLK_SET_RATE_PARENT), [BCM2835_PLLC_CORE1] = REGISTER_PLL_DIV( + SOC_ALL, .name = "pllc_core1", .source_pll = "pllc", .cm_reg = CM_PLLC, @@ -1695,6 +1718,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .fixed_divider = 1, .flags = CLK_SET_RATE_PARENT), [BCM2835_PLLC_CORE2] = REGISTER_PLL_DIV( + SOC_ALL, .name = "pllc_core2", .source_pll = "pllc", .cm_reg = CM_PLLC, @@ -1704,6 +1728,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .fixed_divider = 1, .flags = CLK_SET_RATE_PARENT), [BCM2835_PLLC_PER] = REGISTER_PLL_DIV( + SOC_ALL, .name = "pllc_per", .source_pll = "pllc", .cm_reg = CM_PLLC, @@ -1720,6 +1745,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { * AUDIO domain is on. */ [BCM2835_PLLD] = REGISTER_PLL( + SOC_ALL, .name = "plld", .cm_ctrl_reg = CM_PLLD, .a2w_ctrl_reg = A2W_PLLD_CTRL, @@ -1734,6 +1760,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .max_rate = 2400000000u, .max_fb_rate = BCM2835_MAX_FB_RATE), [BCM2835_PLLD_CORE] = REGISTER_PLL_DIV( + SOC_ALL, .name = "plld_core", .source_pll = "plld", .cm_reg = CM_PLLD, @@ -1743,6 +1770,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .fixed_divider = 1, .flags = CLK_SET_RATE_PARENT), [BCM2835_PLLD_PER] = REGISTER_PLL_DIV( + SOC_ALL, .name = "plld_per", .source_pll = "plld", .cm_reg = CM_PLLD, @@ -1752,6 +1780,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .fixed_divider = 1, .flags = CLK_SET_RATE_PARENT), [BCM2835_PLLD_DSI0] = REGISTER_PLL_DIV( + SOC_ALL, .name = "plld_dsi0", .source_pll = "plld", .cm_reg = CM_PLLD, @@ -1760,6 +1789,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .hold_mask = CM_PLLD_HOLDDSI0, .fixed_divider = 1), [BCM2835_PLLD_DSI1] = REGISTER_PLL_DIV( + SOC_ALL, .name = "plld_dsi1", .source_pll = "plld", .cm_reg = CM_PLLD, @@ -1775,6 +1805,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { * It is in the HDMI power domain. */ [BCM2835_PLLH] = REGISTER_PLL( + SOC_ALL, "pllh", .cm_ctrl_reg = CM_PLLH, .a2w_ctrl_reg = A2W_PLLH_CTRL, @@ -1789,6 +1820,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .max_rate = 3000000000u, .max_fb_rate = BCM2835_MAX_FB_RATE), [BCM2835_PLLH_RCAL] = REGISTER_PLL_DIV( + SOC_ALL, .name = "pllh_rcal", .source_pll = "pllh", .cm_reg = CM_PLLH, @@ -1798,6 +1830,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .fixed_divider = 10, .flags = CLK_SET_RATE_PARENT), [BCM2835_PLLH_AUX] = REGISTER_PLL_DIV( + SOC_ALL, .name = "pllh_aux", .source_pll = "pllh", .cm_reg = CM_PLLH, @@ -1807,6 +1840,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .fixed_divider = 1, .flags = CLK_SET_RATE_PARENT), [BCM2835_PLLH_PIX] = REGISTER_PLL_DIV( + SOC_ALL, .name = "pllh_pix", .source_pll = "pllh", .cm_reg = CM_PLLH, @@ -1822,6 +1856,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { /* One Time Programmable Memory clock. Maximum 10Mhz. */ [BCM2835_CLOCK_OTP] = REGISTER_OSC_CLK( + SOC_ALL, .name = "otp", .ctl_reg = CM_OTPCTL, .div_reg = CM_OTPDIV, @@ -1833,6 +1868,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { * bythe watchdog timer and the camera pulse generator. */ [BCM2835_CLOCK_TIMER] = REGISTER_OSC_CLK( + SOC_ALL, .name = "timer", .ctl_reg = CM_TIMERCTL, .div_reg = CM_TIMERDIV, @@ -1843,12 +1879,14 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { * Generally run at 2Mhz, max 5Mhz. */ [BCM2835_CLOCK_TSENS] = REGISTER_OSC_CLK( + SOC_ALL, .name = "tsens", .ctl_reg = CM_TSENSCTL, .div_reg = CM_TSENSDIV, .int_bits = 5, .frac_bits = 0), [BCM2835_CLOCK_TEC] = REGISTER_OSC_CLK( + SOC_ALL, .name = "tec", .ctl_reg = CM_TECCTL, .div_reg = CM_TECDIV, @@ -1857,6 +1895,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { /* clocks with vpu parent mux */ [BCM2835_CLOCK_H264] = REGISTER_VPU_CLK( + SOC_ALL, .name = "h264", .ctl_reg = CM_H264CTL, .div_reg = CM_H264DIV, @@ -1864,6 +1903,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .frac_bits = 8, .tcnt_mux = 1), [BCM2835_CLOCK_ISP] = REGISTER_VPU_CLK( + SOC_ALL, .name = "isp", .ctl_reg = CM_ISPCTL, .div_reg = CM_ISPDIV, @@ -1876,6 +1916,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { * in the SDRAM controller can't be used. */ [BCM2835_CLOCK_SDRAM] = REGISTER_VPU_CLK( + SOC_ALL, .name = "sdram", .ctl_reg = CM_SDCCTL, .div_reg = CM_SDCDIV, @@ -1883,6 +1924,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .frac_bits = 0, .tcnt_mux = 3), [BCM2835_CLOCK_V3D] = REGISTER_VPU_CLK( + SOC_ALL, .name = "v3d", .ctl_reg = CM_V3DCTL, .div_reg = CM_V3DDIV, @@ -1896,6 +1938,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { * in various hardware documentation. */ [BCM2835_CLOCK_VPU] = REGISTER_VPU_CLK( + SOC_ALL, .name = "vpu", .ctl_reg = CM_VPUCTL, .div_reg = CM_VPUDIV, @@ -1907,6 +1950,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { /* clocks with per parent mux */ [BCM2835_CLOCK_AVEO] = REGISTER_PER_CLK( + SOC_ALL, .name = "aveo", .ctl_reg = CM_AVEOCTL, .div_reg = CM_AVEODIV, @@ -1914,6 +1958,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .frac_bits = 0, .tcnt_mux = 38), [BCM2835_CLOCK_CAM0] = REGISTER_PER_CLK( + SOC_ALL, .name = "cam0", .ctl_reg = CM_CAM0CTL, .div_reg = CM_CAM0DIV, @@ -1921,6 +1966,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .frac_bits = 8, .tcnt_mux = 14), [BCM2835_CLOCK_CAM1] = REGISTER_PER_CLK( + SOC_ALL, .name = "cam1", .ctl_reg = CM_CAM1CTL, .div_reg = CM_CAM1DIV, @@ -1928,12 +1974,14 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .frac_bits = 8, .tcnt_mux = 15), [BCM2835_CLOCK_DFT] = REGISTER_PER_CLK( + SOC_ALL, .name = "dft", .ctl_reg = CM_DFTCTL, .div_reg = CM_DFTDIV, .int_bits = 5, .frac_bits = 0), [BCM2835_CLOCK_DPI] = REGISTER_PER_CLK( + SOC_ALL, .name = "dpi", .ctl_reg = CM_DPICTL, .div_reg = CM_DPIDIV, @@ -1943,6 +1991,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { /* Arasan EMMC clock */ [BCM2835_CLOCK_EMMC] = REGISTER_PER_CLK( + SOC_ALL, .name = "emmc", .ctl_reg = CM_EMMCCTL, .div_reg = CM_EMMCDIV, @@ -1952,6 +2001,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { /* General purpose (GPIO) clocks */ [BCM2835_CLOCK_GP0] = REGISTER_PER_CLK( + SOC_ALL, .name = "gp0", .ctl_reg = CM_GP0CTL, .div_reg = CM_GP0DIV, @@ -1960,6 +2010,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .is_mash_clock = true, .tcnt_mux = 20), [BCM2835_CLOCK_GP1] = REGISTER_PER_CLK( + SOC_ALL, .name = "gp1", .ctl_reg = CM_GP1CTL, .div_reg = CM_GP1DIV, @@ -1969,6 +2020,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .is_mash_clock = true, .tcnt_mux = 21), [BCM2835_CLOCK_GP2] = REGISTER_PER_CLK( + SOC_ALL, .name = "gp2", .ctl_reg = CM_GP2CTL, .div_reg = CM_GP2DIV, @@ -1978,6 +2030,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { /* HDMI state machine */ [BCM2835_CLOCK_HSM] = REGISTER_PER_CLK( + SOC_ALL, .name = "hsm", .ctl_reg = CM_HSMCTL, .div_reg = CM_HSMDIV, @@ -1985,6 +2038,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .frac_bits = 8, .tcnt_mux = 22), [BCM2835_CLOCK_PCM] = REGISTER_PCM_CLK( + SOC_ALL, .name = "pcm", .ctl_reg = CM_PCMCTL, .div_reg = CM_PCMDIV, @@ -1994,6 +2048,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .low_jitter = true, .tcnt_mux = 23), [BCM2835_CLOCK_PWM] = REGISTER_PER_CLK( + SOC_ALL, .name = "pwm", .ctl_reg = CM_PWMCTL, .div_reg = CM_PWMDIV, @@ -2002,6 +2057,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .is_mash_clock = true, .tcnt_mux = 24), [BCM2835_CLOCK_SLIM] = REGISTER_PER_CLK( + SOC_ALL, .name = "slim", .ctl_reg = CM_SLIMCTL, .div_reg = CM_SLIMDIV, @@ -2010,6 +2066,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .is_mash_clock = true, .tcnt_mux = 25), [BCM2835_CLOCK_SMI] = REGISTER_PER_CLK( + SOC_ALL, .name = "smi", .ctl_reg = CM_SMICTL, .div_reg = CM_SMIDIV, @@ -2017,6 +2074,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .frac_bits = 8, .tcnt_mux = 27), [BCM2835_CLOCK_UART] = REGISTER_PER_CLK( + SOC_ALL, .name = "uart", .ctl_reg = CM_UARTCTL, .div_reg = CM_UARTDIV, @@ -2026,6 +2084,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { /* TV encoder clock. Only operating frequency is 108Mhz. */ [BCM2835_CLOCK_VEC] = REGISTER_PER_CLK( + SOC_ALL, .name = "vec", .ctl_reg = CM_VECCTL, .div_reg = CM_VECDIV, @@ -2040,6 +2099,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { /* dsi clocks */ [BCM2835_CLOCK_DSI0E] = REGISTER_PER_CLK( + SOC_ALL, .name = "dsi0e", .ctl_reg = CM_DSI0ECTL, .div_reg = CM_DSI0EDIV, @@ -2047,6 +2107,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .frac_bits = 8, .tcnt_mux = 18), [BCM2835_CLOCK_DSI1E] = REGISTER_PER_CLK( + SOC_ALL, .name = "dsi1e", .ctl_reg = CM_DSI1ECTL, .div_reg = CM_DSI1EDIV, @@ -2054,6 +2115,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .frac_bits = 8, .tcnt_mux = 19), [BCM2835_CLOCK_DSI0P] = REGISTER_DSI0_CLK( + SOC_ALL, .name = "dsi0p", .ctl_reg = CM_DSI0PCTL, .div_reg = CM_DSI0PDIV, @@ -2061,6 +2123,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .frac_bits = 0, .tcnt_mux = 12), [BCM2835_CLOCK_DSI1P] = REGISTER_DSI1_CLK( + SOC_ALL, .name = "dsi1p", .ctl_reg = CM_DSI1PCTL, .div_reg = CM_DSI1PDIV, @@ -2077,6 +2140,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { * non-stop vpu clock. */ [BCM2835_CLOCK_PERI_IMAGE] = REGISTER_GATE( + SOC_ALL, .name = "peri_image", .parent = "vpu", .ctl_reg = CM_PERIICTL), @@ -2109,9 +2173,14 @@ static int bcm2835_clk_probe(struct platform_device *pdev) struct resource *res; const struct bcm2835_clk_desc *desc; const size_t asize = ARRAY_SIZE(clk_desc_array); + unsigned int soc; size_t i; int ret; + soc = (unsigned int)of_device_get_match_data(&pdev->dev); + if (!soc) + return -ENODEV; + cprman = devm_kzalloc(dev, struct_size(cprman, onecell.hws, asize), GFP_KERNEL); @@ -2147,7 +2216,7 @@ static int bcm2835_clk_probe(struct platform_device *pdev) for (i = 0; i < asize; i++) { desc = &clk_desc_array[i]; - if (desc->clk_register && desc->data) + if (desc->clk_register && desc->data && (desc->supported & soc)) hws[i] = desc->clk_register(cprman, desc->data); } @@ -2160,7 +2229,7 @@ static int bcm2835_clk_probe(struct platform_device *pdev) } static const struct of_device_id bcm2835_clk_of_match[] = { - { .compatible = "brcm,bcm2835-cprman", }, + { .compatible = "brcm,bcm2835-cprman", .data = (void *)SOC_BCM2835 }, {} }; MODULE_DEVICE_TABLE(of, bcm2835_clk_of_match); From patchwork Mon Jul 22 05:54:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 1134712 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="LAI7Hzhk"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45sW7X4zRCz9s7T for ; Mon, 22 Jul 2019 15:56:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726701AbfGVF4D (ORCPT ); Mon, 22 Jul 2019 01:56:03 -0400 Received: from mout.gmx.net ([212.227.17.20]:35555 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727360AbfGVF4D (ORCPT ); Mon, 22 Jul 2019 01:56:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563774941; bh=Mfs0KFxfuAdl7r1+zeKQYCRtJqTlchom4wahS0rVa9E=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=LAI7HzhkHmg0EPk8R4lCkHHwMYmBL/H+4RGITe1XCKHXI8kDAlC4Kwr62UM3Z4ub/ 9w4invLuc3itgf0SJaJhZjT28rmBIHGhWfIeHS9YGvm73Eu9WF6VolxM+Lc2TMT1ST F7DTv1lnEgq1rrlWG66rNGsFjQJbk99tnZSXHn04= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.98]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0M96Jd-1hhU9J4AwP-00CPJs; Mon, 22 Jul 2019 07:55:41 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Matthias Brugger , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter Cc: bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-mmc@vger.kernel.org, Stefan Wahren Subject: [PATCH 08/18] clk: bcm2835: Add BCM2711_CLOCK_EMMC2 support Date: Mon, 22 Jul 2019 07:54:39 +0200 Message-Id: <1563774880-8061-9-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563774880-8061-1-git-send-email-wahrenst@gmx.net> References: <1563774880-8061-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:jOIrka6HlPmHspKjerxs8OHrw+5PSYK7EHf98yzfquXNqTlzaXl wqkK02jPXet29eNpvVl6ZCzFT2lDri2YewY5qZYpxPQUlkZaWrqUIjd2H/Vys6vakrEUTLX ER5H5A3MWuLkIC9HB/NE+VPVgtGmoN2CRUXq/cpr8hxEVlgMOMmaiLIdiXKGJ9kSRPHWW8y 11kSozk9voAcY7UBmqx4g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:RvlB6W0jnFk=:zEnFQRGi6xEmsCsXqgqK6v Z86h5PRUbMVuiSbhbpJaaA+iOunXMXODXGIhNbqsxjooEG7RNNMv0+70im+kVOX6Bmm1TkwgE Em3rqLuS967zU3WntcmqEp7th1aXZZBTdf06hvQbFoANkn7t2s9jJNAQp3HmJ1vTBEA1joeH8 jxZjy9+7G7cN4qSuFNmX/U+kDlsOKC9BncLZMg45zW1PY05lnbxn3g9uBofAnjndVXK1Phaho SRQMyDsqL/MySpzJTgU3A9FFIG2OGmy/H4H98nhiJRLx6CMORL2RIc8eUPkrEcJkNi0z0dhzb wCIbvHgTHy/BwmQRXeseoiYbgbLu933IUGWrvR15B6n02rCOiZkqbvAVJj+HCt1dXTke5joEJ maxoaSzapET7qQaWKl7sxNd/cjBc3r703ZwDIG98se1g/65xpMtWPM5+7kNYxtNWFwU/yKx2m VC6O7+cS27lkSeYnwtcZqU8PeayjfbZY18DPPMwpOD3W+1zfARWiOII4Gg9qt2graoY6zZlWp D0tw0dfpYW+0sdPZ9Sym7PRz/KYzWwpE0nECgY1J5wamm7GbVFGtRAa9+cYDlQ+oF5eCT+ckh QvUoTYvbeRLE3q4kU8oj7POGXjqTHwGzssZPr4PFRELygCXDKiYA4j8NWoMvdXbOsHlYpzLTh EWvVHOSFECNsbaohLPj3XnmkmvcIonmfwfMEb/kJO+i50UOKJwXKZzMh+/ZeA4unqaH2bcIZt Sr8F905f6YHd/hzrU12tybLG17Gcml10oJmZ88+U51G0utiuKuZswgpH2C8QT0AQoFp5Fob9E Nzmcca6I73fVKPlrKQO3DSwCjg91EcbCqn3GX9exalRSBeQaPF4L65jJA4DiDjch8K3Cy/Lyr qiyMVd/2c0xICvUGEvYy3PofHZRUPVVQ8MY7aVNltDsL2V/+zcU7BqGTZs2ePmSFw+XApi8nG PEqsqTpLAgNN6UNVuDpg5T/aNfzwv0+uFvOsCRS4QnMyCarQnnZ6ak/sAeH80Ikys643uNeBh TDkyWiXi0VkNeNyp3JhdiLJWfY+iyirulvSxs//lmMc2fvcCQ+U8IoVN+EaN5yDhM9Z76Hq5u PlzqoEv/O6BHVo= Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The new BCM2711 supports an additional clock for the emmc2 block. So add a new compatible and register this clock only for BCM2711. Signed-off-by: Stefan Wahren Reviewed-by: Matthias Brugger --- drivers/clk/bcm/clk-bcm2835.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c index 3231b76..fbdc4e1 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -114,6 +114,8 @@ #define CM_AVEODIV 0x1bc #define CM_EMMCCTL 0x1c0 #define CM_EMMCDIV 0x1c4 +#define CM_EMMC2CTL 0x1d0 +#define CM_EMMC2DIV 0x1d4 /* General bits for the CM_*CTL regs */ # define CM_ENABLE BIT(4) @@ -290,7 +292,8 @@ #define BCM2835_MAX_FB_RATE 1750000000u #define SOC_BCM2835 BIT(0) -#define SOC_ALL (SOC_BCM2835) +#define SOC_BCM2711 BIT(1) +#define SOC_ALL (SOC_BCM2835 | SOC_BCM2711) /* * Names of clocks used within the driver that need to be replaced @@ -1999,6 +2002,16 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .frac_bits = 8, .tcnt_mux = 39), + /* EMMC2 clock (only available for BCM2711) */ + [BCM2711_CLOCK_EMMC2] = REGISTER_PER_CLK( + SOC_BCM2711, + .name = "emmc2", + .ctl_reg = CM_EMMC2CTL, + .div_reg = CM_EMMC2DIV, + .int_bits = 4, + .frac_bits = 8, + .tcnt_mux = 42), + /* General purpose (GPIO) clocks */ [BCM2835_CLOCK_GP0] = REGISTER_PER_CLK( SOC_ALL, @@ -2230,6 +2243,7 @@ static int bcm2835_clk_probe(struct platform_device *pdev) static const struct of_device_id bcm2835_clk_of_match[] = { { .compatible = "brcm,bcm2835-cprman", .data = (void *)SOC_BCM2835 }, + { .compatible = "brcm,bcm2711-cprman", .data = (void *)SOC_BCM2711 }, {} }; MODULE_DEVICE_TABLE(of, bcm2835_clk_of_match); From patchwork Mon Jul 22 05:54:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 1134708 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="TbHarNWI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45sW7Q658rz9s7T for ; Mon, 22 Jul 2019 15:56:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727353AbfGVF4B (ORCPT ); Mon, 22 Jul 2019 01:56:01 -0400 Received: from mout.gmx.net ([212.227.17.22]:53843 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726701AbfGVF4B (ORCPT ); Mon, 22 Jul 2019 01:56:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563774942; bh=GU89YlLcWxJcFvez/UaJULPPU3ocAYeano9D1Dz28OM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=TbHarNWIFz79a6JKSq3R1jg/7c1cEZ0b7xukUCC1wpbwKjy3S9QQPkvzURGssnadQ 78zwIj+ocU0hGXdHyaTDe/Mb8c9wMkGLgb4MThEGFbXsYsLe83rfTq0Y2W9UibWJKk 1hPzwb0RFxBG+mKkm/FqBJSYNv2QRv04nHyXbZnA= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.98]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Lb90f-1iHvMa3EZF-00kdbk; Mon, 22 Jul 2019 07:55:41 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Matthias Brugger , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter Cc: bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-mmc@vger.kernel.org, Stefan Wahren Subject: [PATCH 09/18] dt-bindings: sdhci-iproc: Add brcm,bcm2711-emmc2 Date: Mon, 22 Jul 2019 07:54:40 +0200 Message-Id: <1563774880-8061-10-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563774880-8061-1-git-send-email-wahrenst@gmx.net> References: <1563774880-8061-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:TaoYEtFo6S+DLQN5O+CGyxUkFR5mMK1xgBJd6RyXw3VKX/UrVSh BG+9tH/fcHsmYsgHTXW1kxK1UWwy4RSWfKcANA/BKooQJWwqa51a862tyPQockoHN8upkx/ b5eZZAVZu90yqoJ7fgmbyudw4msCoCmGax4l34Q3BCSCQ1YuwzC4SIh+BccMCYMRGgd0DJN H8D1PpxKGa14YMA3X+dOA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:Oc5cSNfgdP4=:b7SJHzW5K+AQaEndZymsXb k2CvHTZ7mHMnyIznsMUMbPPmlfjYI4tLfmZS4H3je1gdctzpIEc+V933v63sO4yOpI9l2aflj 1a2v35bXMvDUAZAQaMEGMdzU0D5zqQcVTkNvdiuSEwX0YjGBExySyMa/W5DwF4e+kg8DRPHGW /auZZUCB0CwWW8IbrHSZXZYrKqjqcHOZkhhmLYZGLX2Xwduz70Ocf+9wA9vMkcidU66aI/vdN z1MG5kSh2hO49lZj5Wzvf3giDOQZiPtYPr/nfSacN1T/L4o8AvdBKDju+eCKvVDaMTW9yB6ZY b8Jkgj921ulQywo3jF+owYaullhNg1KmDQldjAAWYJ9kJpt8oSGn+I81UperGwyMKG0r/9IGi qOFBLW25gCkT53fatFooLF+/9Qg3Pd9EJjXV8pGqxJje91sk0nYOr9/JbTaXNspkQNLicWBtr r0OQ3jXAfGjyNidsQ8Jk8vv6dP6F6gdCDQoO8stENVrejLRER0KBHAMKAMI7H+BoYj5HNJif2 c5BsLQ4ol0jZB7ZGaiHPgPEOAdPmqdMySwXik/e1uLfJn6ryl0Ix2qyrhOCVR/jta0xUH8t+7 Sy0bWxmU1NWnRAa3ZlwRMiNbrYK1FG9jLgz5doEzUgjJIf0u5p3cbZZaMvwiFAfhbFkNCPLL5 vzhuBvGhgwLkMarx5siygViWD/K0QmWhJPmkf7md8zZHu6HIeZVN320T/LpnU38mtcQq6Ajc/ /8zYIPjDlUWKPOquM02btWMEGLwxZoAegAGyS/Bd9G2n/fKuZkCw5sJl2dzdiW2evN9n+1HXz tU2t7eWPPsjT5I/wbjyjdovMiLSrfWq9U3INcRG/ADEAqmkkDbMJlSzXclC/yuCCt06eQh0+z 5d+Md25CSStUtIZVFD7UhkyxCjAgaSgS1uqChVFhNljjAnwrSMU/q8Tcx3z6RH4rMTtUl5vDE B2tVX9+LspqfRiJu5Fi55c53SAW86XV5mcOH3EP96AuEhIDr1Y0AeO9um+aIK0FSGSDb+8VYC ce8YGQY5dojEtkGWSvGDUMV/wzj3AtnCDEYDjSX2qFSWGqHnsF4h5k/qMfc2QDqTKDP4jGAf9 LzLPSXWnXkIlyY= Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Add a new compatible for the additional emmc2 controller on BCM2711 and clearify usage. Signed-off-by: Stefan Wahren Reviewed-by: Matthias Brugger --- Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt b/Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt index fa90d25..09d87cc 100644 --- a/Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt +++ b/Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt @@ -6,10 +6,12 @@ by mmc.txt and the properties that represent the IPROC SDHCI controller. Required properties: - compatible : Should be one of the following "brcm,bcm2835-sdhci" + "brcm,bcm2711-emmc2" "brcm,sdhci-iproc-cygnus" "brcm,sdhci-iproc" -Use brcm2835-sdhci for Rasperry PI. +Use brcm2835-sdhci for the eMMC controller on the BCM2835 (Raspberry Pi) and +bcm2711-emmc2 for the additional eMMC2 controller on BCM2711. Use sdhci-iproc-cygnus for Broadcom SDHCI Controllers restricted to 32bit host accesses to SDHCI registers.