From patchwork Wed Jul 17 19:50:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11048205 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D1478138B for ; Wed, 17 Jul 2019 19:53:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1AA5271E6 for ; Wed, 17 Jul 2019 19:53:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B560F28685; Wed, 17 Jul 2019 19:53:08 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 5DA30287BE for ; Wed, 17 Jul 2019 19:53:08 +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=568eLGYGsgvhR8usMBZbWTKxu2W8YA1NA9yyqykwgjM=; b=mxAykdRN7eBF0gRfL1IA/Fwhv4 KVlPaXFU9bZvr58TCVf6KEs5dnuG/TwKeD/cdBdHrRXQESrEoeXKo2UPWWU1OFXPOS59jVOOLm8Ia 014oMJgIknOzURnL4ltcL9HsvUiIwtdIjk0XjDf0Ggzx1ri52H9Btnw7lnq3ecBQZlYprUNzTD3t5 GIaXQnIdcx6HQjvG2TpZKVWTNMQvQuLOXYbmE7sTeo5EpAzrHP8rKeU9PECCoBpsP0A8pCsmckcIv swkGE+j/jZvavdoor+pgPq2r2ohKYK8kjnDrO4nn7sTS7CZwI1pP9cmQBJ868mTG1l0NDPBhk0740 W9/pM1QA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hnpz9-0004QH-NO; Wed, 17 Jul 2019 19:53:07 +0000 Received: from mout.gmx.net ([212.227.17.20]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hnpx3-0002tM-0H; Wed, 17 Jul 2019 19:51:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563393040; bh=/s7RMumfEwstl7olzGA0BrPMCx0k4sO1vVXkkHXi5NQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=DQT9SRiMDY7EAJx0y1jQ+KIpPbedDgA05TuwXyNBsdyuz8S3/IpJO7C73eBBy6EKT tWvFg8Owi3d0OcWxcyPao7tx2uQGZ9cn11tc12IyRA1TEJMl74p3rtyPEQdmd7Y+lS o3D4ofiQsDUu27r2XV5+s1XIacAXV7DadXDYgUDk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.103]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LwW8p-1iW7LU49CJ-018I3U; Wed, 17 Jul 2019 21:50:40 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter , Mark Brown Subject: [PATCH RFC 01/18] ARM: bcm283x: Reduce register ranges for UART, SPI and I2C Date: Wed, 17 Jul 2019 21:50:09 +0200 Message-Id: <1563393026-17118-2-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> References: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:CJ8wET5URohu2KkeXrcHhHmDGXGjU8/uihiC24UzNWPG8WPnILf MfvakcJvuZMx9UYZpnoVxqjUjj9CFUPr9HYpW6wquTSG8xiks3u6xDlibcCFNAeVhnDuFPt PU3dL773rKuf1yzm9BsVVJgJScV2VvCZtN8VVDCjxyJuGIR+TVfkYtLbk8Zf9S0Fz38QO5W Vdiv7O8Pi4EOwg6UBF2bw== X-UI-Out-Filterresults: notjunk:1;V03:K0:tseAc+LVRIM=:cZ8AUJyQf/pMWFJC1pvF3B hPcGoFpHwxoX+DpKZ8sE95r/GV5N/Jj1xSw/ePw/hpvVGBdWUYHecfFO2CYtaTOYG60sHAgVs IWrLdqlISLsm+pjLnEwJaux78AyX/98ndTWzcvuOFjj+grV4um8qMVHsbaJLqtWh2098rv3Bc MK6+SnhAtW8XWk43KAlAb3UDqtYQkBEYmIdmL6N2KMovL6AwDz+4MDc59BWViwCKBN7P/QakF N30QI2Aa6e5btOUMhlgw/TcXue2vqnkk/46dThDehB+tRzbmbMFC1ugCg7xYr+3Rqx6Qo45U3 cE84UAXceqqK+c32ZlhimUgu/0ShIhaVb+6EYSadiWbV2u68X0/yDue7YavVnT0kwi0zmueuF s9VUCO3xu40ZETp7lIN2WzQWuiVfmoLaz2jBsumEUF6omT2ePfMMzE3t3p7FfC/tba6XRhDum 8sYwVfRXGsPD3rCtVjKwLlHef8FBACIIOT7kv5iAdbDSs8qw3WzQ2JHcyGC3MxCECqJnpdhQG mwyeUhkb3we70Z83/6rCGhAPudd9orsgoD+Get9DOP93RXsTMJSFQhY8YctYdS/0PdQfIZyFu J5b7edClUN97ecMDl41d8tk152BE/wwo8MdBoUa8g24rl1+1BlwWrc1zSlkZD5c0C9uCtdPIB ZjeYOpHXLmFznEjTXhDTpn4U2XW7RVc9g+D2cSoQdmv2tRUg+xhNkLtbnlEcUNUkx1OcxaHiC 5yFqVHYmJv6Qilt7lwd6X+c1zUsfRnOBifBd9N+rjZ9R/RBXu7GQhjY61w8LpkAfmZaLjvcvB axFvv3lWDEwmifet47dgKooTblXd/ykOdXx3kBPQLwUbKK4opFrKQE0MctT1trFOQ4iRCAeUv vMPcB6dPzOm3IjB5EK+JbDzyQ8Irz9gJ/DVr3du1/UufdQ5mhAyHg4Mc+u4NAarYOJ5APnC4V aGmTyO1c8dXuAAT3gR+8aNk+6rXU7Bfbw7hGqYlA9qprlOxSKivfNt4lPUP8YdZQOl1QSUNAO 1UT29IYmOFgt02uDfUd8gODihZYYI3FERshOmkfW/ANYtvTK/GRRpQrkpDtd9hFkmzX/fEiba LBvZlDz3MZ6CL4= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190717_125057_338988_12702098 X-CRM114-Status: GOOD ( 11.74 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren 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 assigned register ranges for UART, SPI and I2C were too wasteful. In order to avoid overlapping with the new functions on BCM2838 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 Wed Jul 17 19:50:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11048213 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8E43D138B for ; Wed, 17 Jul 2019 19:54:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DDA9212BE for ; Wed, 17 Jul 2019 19:54:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7172C2873D; Wed, 17 Jul 2019 19:54:33 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 E0D082870E for ; Wed, 17 Jul 2019 19:54:28 +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=vegMha+HdZa8uKVdN04Gs0olV7zUoRpD1TZdFGPDck4=; b=Ld5lQEXb5hU/seATEPUjNv2FXJ zEngsL49ls8KHe5Vp4OL0CUyZ2AJGCw4o19jBNw6lXbNQwLkMv2pUeSzYOJAN6PLAtBNIPIP7CRYK xHgkfPNtMyF7ihoRq3RRu1I0gfeyvP/mf2ucW4TnogAhnNATuWoshcayNvUpLM8kW7u7IzJBk/SDW Ck7Oap8wexNk0yP4MUcu0GxuNuKk0jZ/LyCG93NzAWLmr8DTBR8KUuz//ZqKFewfvl/VbuczaE0xt isApXHjrnsxfAK3GGVHGpRta+9/OIXiz5rAnl6Z2DNl3bv5t1DgpJDBFXZRKBAMZtg9Jb8GxeN0Ef xMdHGpFQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hnq0M-0005bn-TZ; Wed, 17 Jul 2019 19:54:22 +0000 Received: from mout.gmx.net ([212.227.17.20]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hnpx3-0002tV-8I; Wed, 17 Jul 2019 19:51:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563393041; bh=IbHBEvkm46Df6NDQJU0fBgIAcSdQXQe5FrhYL3TkGBg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=iCgW2v5DLqp63Lv5JWJtnadcsEKDrDvfWrTimoEguYOLLC9gG/g/WZ0XRP9oAr8IG 7OsoNNropeO3nD9BWzEg/in6jvXvaqPEXWHWrCxB2Ll46BAfmEA5pKbuAGcMMJv6XD SmEkLsvAgt3Wn/IA2ZE1lUuF84K1iyCdndWNztYo= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.103]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LoaCE-1iOnak3ery-00gcHl; Wed, 17 Jul 2019 21:50:41 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter , Mark Brown Subject: [PATCH RFC 02/18] ARM: bcm2835: DMA can only address 1GB Date: Wed, 17 Jul 2019 21:50:10 +0200 Message-Id: <1563393026-17118-3-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> References: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:+5q58Km5FEwEe+uM5Q0Gj6kw3og4mdA5ECedTbzfgxPiG09Eis7 ptyvC4ZhjRm21dxrBSg9WlRG8qaaC5YVzTxORJcP2N07ChxC0hKlaufyFIMOS9u+oACfQPu D0TfK1YyQjtaZtowzAmQWM/eT3t4DK5X7I5KqQJ7OxF2tVKgpFmPT1G3GhK1y3QDMjgvtj3 vktSSMngEZp9OVaw6RtTw== X-UI-Out-Filterresults: notjunk:1;V03:K0:kY8C3gZC1ms=:KBarscFDAHaYmxzAyGF4ih 32lWvKJIgAHbCuKo0R+vF4SA1MvO4YpqQh+bDQRL+KRlaJ0ZM5rXZO54d50ErEJggWGguVI/T sXq2P1l5ggSdoT19LoHtR4fuDtkRUQj8Cr8LzOmYd7W/hGAh5Me5oGn+d8BCxgo9YtQQvJEk5 x+rrMH+fVWz9BwR730vU0/Gtwbl3JnpGpOdhMC79V16bXla9lqg2jn+/OPGsCMca9xP9qM7dP zcjVeWFaVoxFngrvcl34QIWd5gwfe8KIfVBNNtMbmjdUXX2eytEwnARvs+2X78FOhOJJgxqts EADvSADr7Aa7/JQ1KEIWy3aWuv8PIoMaLnJ0eMJLCDPG2LkMXLvErenJrEjCFHS25SSEbbjkK gOZ9gm1PjagFLHb3Jk/tio3FZ73Q7muoh9lO6O7oJppiGtQIIcrVzrJdzb89pC+v8lcpeVyGS 2J6Ju0p4KuxhqrvGklhMpgiaTxA60X7Wh0z31Wz31rSv2UqcF6rEKC9gwTkkKUorNj+03G+RC SdEmBko4++0EjzJ27W1qwEHyVUWWWY2MEi9MUKRvN897aTDIyHxj6q5eHyw+HX0SzzUbp4rg5 RtNpm7/6+q9wPlUOIzHJyTv9O029cd0aJO91/bJukRltJmblFhPnZzcblrLA+c4QIY3Ak2Kf/ 6kwqc6nBeb26MN3VM0PIYkZ9GfcOoF4ynMUmVfc9eLDeWJ2wZzMHSeKDhpJIx2TWhALpzl5Oe 6x3W9ruoDHMwCgGiIrTzRauFlwduqxLs0Zo4WXca6TIg9112sBAYi2/+yLOTpIgn+HsqUoyYO p6ggPKgUFZgsErfvRzOYwlVag0DFCAkohH+LJ81B3o5ZxZ6qBOLQ3kxsegD86gY6I+dPmV7UR IF8sogl1Ky+lB5K4CWbupL38ne5D1vsLDPQS4RtNsBqvmX7YUa98+NCN1B7cyA+FUQdf6gRwX q0idC2+Vbq1MgGDyWmo2AMh6EkHc9yvdr0hCqqHAQ+PcRfEEG6Jp3g/PklCXAIPrqfkRB169V VyG5mzEXRKeoAM6lqdSCsHAo1pDqa0i6J3qUazRNoDuNYV5u/a4eKaRGS1YOoMw6MoR7aaEUW GiIku1c7nqAsbk= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190717_125057_607741_50D17227 X-CRM114-Status: GOOD ( 12.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Phil Elwell , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren 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 From: Phil Elwell The legacy peripherals 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 Wed Jul 17 19:50:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11048195 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5EE99138B for ; Wed, 17 Jul 2019 19:51:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4DE8728720 for ; Wed, 17 Jul 2019 19:51:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42022212BE; Wed, 17 Jul 2019 19:51:19 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 6D7012879D for ; Wed, 17 Jul 2019 19:51:18 +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=5vUz6sgjiy4X49ReugOtFNJ7e+JVGrO+Yh7UYfGB5Hs=; b=EtHXTTGVMLoPx9WbIZxfc71xLe 96y5/MzQchNQD3sggyAzIJBDkupf0LMO4RswNq068G1SNo/4KWxXhNsYE3VOpzb44RaID1Sdz7KO8 Wryos5UuCyC7Tm9CFWi7Jf8giyKqAZ6sO2O45oe3v4ppb20KbFrjj4LWFH/o+S1S9rRPZRT7x/Cqz qkZPPgQKN+ev/Q8GlQpdUqEcDX55bE4GQpAHBSwsa0FnpOGJPsb5xuDyZCgjOblHENAfiRbltHTzJ Q5bo+8uNrAmMjC5eGFvhiW2bAHouVARqASs6E7qtgJk3SKtSlDdhiFvRbXrOK3pbu9IWrFcEdi/rM sq1A8USg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hnpxM-00038U-OK; Wed, 17 Jul 2019 19:51:16 +0000 Received: from mout.gmx.net ([212.227.17.22]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hnpx2-0002tO-RB; Wed, 17 Jul 2019 19:50:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563393041; bh=z6D7aEV1fnU5SCz38WawP133AJn+njkVZgrnNxNCliw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=lDKZRTsMR1I9ARHMNga4QbOnXuNncE2AC6ZyO26r7W1c1ciG8bVEBcHxtxh8GWhxR j+L+8eZiVOlhj6AoAiRhmnZeHv7JcNpv2HGP4odf758TXXbS3y13qXyyQZY4Ushh3b yWSplZZF+T8sZhSiPGUWtuLwHBBAeR/NHiOt0iV8= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.103]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MfiFU-1i8e5F25Dg-00N9f1; Wed, 17 Jul 2019 21:50:41 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter , Mark Brown Subject: [PATCH RFC 03/18] ARM: dts: bcm283x: Move BCM2835/6/7 specific to bcm2835-common.dtsi Date: Wed, 17 Jul 2019 21:50:11 +0200 Message-Id: <1563393026-17118-4-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> References: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:Zd+RwTrexxXEosJKJbqCUnQpX/20t6il/vIWambEOPC+Yw7gIi3 KGY2GEJxPcVB1qUmRLMdu0rxCeSzn1Mf9SNS7rI6n2d+0bxTwv+WHNHEhrF2T/9DcN+rRwu TM5ffIDehuF0sqODwmSmQsiFxWGmHaD7eRs0nN3gewIC8hEjKYBKAZ6znUe87+g5LqemSYQ wF89gu8s3c+h4b+3Nv4gQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:/AO3cczuXEg=:gGnKrOFcBd/tea2+8OReWP IildetI7FKhlOaSIRNzivztZXt16EkW7OaHZs1/Nq48/qm8OWbmjR389FVjzxaz87MRB9j45w ynY8WlyyR4OJSLJL53k85uRtD0bavNrPglgXZm/pouGR0gGiZwsO1cjmVrhr+uJbAzRTz8/31 MOE8VqFmhFdUO9F9LsLjkuhD31X68sbmlFYuO5y9KcE56k9cIdyxBQ/YgO84H5YMuapLDEz1w NS/jATk8o1t6SIk5PLgrTycLkr8PFK3pQxg3ISo1XKBexkjmxJYnTRSmeqtyreIW/mSXz59Mh bkVRYPAwjydZ5K/2T16CaaXdPuaFP3tCtUPhGe0ZI/W08zm/BCrFVVyYDJIRcpYpENttcGzGM cEXL2IMR5fkC7cAaib0EiqyAqeaTwQf2BqGfHvP+0fXdsunp+DsZcowniCLd1Nid1aH61Uza8 FyW+NBSr05sYxwAwMjpLObYFHWjm6eSluHzI1p/M7prNvuFZc0Z9IjKUs/AMB716GAGpK2KAk e18OtqpxUSvw9qxZ7ryIpqNva9FxxIrQbqIm7AWmoJd0/1HRb9sJ9reGVJbxUzXp5W3cPRvRG aUjO2yACFPGsBdiV82UkCcR6/idwgALivk3u0LKks3NLhUWnJkx9Ii9wUITAFgdIT8IJ40lGM QpJfvpFaRXyrucupm5O2lg+W69Y/jzlvswanMfnFxms2TaqQj9Ag1OGHFEqqyfddl+oGvrppo bncOR/dUOruq5/onIDXTYIO7R3rXfnDDEuvMg20Mxl4ryBrLGj58BosqWgRRCWAX64HNFNTD6 fGlbFcvDRzrYgzHT8aRhfOWe3fNhm+UnsFT1v7aWzoiuBzjg7Kuok1M0AH0SvZvwL8EQxkaaA 7jTuT1j31OZjHXuxUghnURnSddkId8VfXVgiFcjvLfU3CdwrGGOfYIlfGVzVcPToD2GI4etc+ ZZTX7B9wMxzupfkNjcnLY9qHMk7yTIwRBxIWGvPwOv1oIzn58TO/Es37rwwquYnEVJ4cAwtXB vcMGJ9qIC9UcDzw0pMiTquZLwxc3wDuH4DoWVQ7iM8opIyIW4kRaX8EbJdMzSi7oR7etrvC68 d05iPmlZt+1xdI= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190717_125057_177919_56E2566F X-CRM114-Status: GOOD ( 19.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren 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 As preparation we want all common BCM2835/6/7/8 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 | 173 ++++++++++++++++++++++++++++++++++ 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 | 158 ++----------------------------- 5 files changed, 182 insertions(+), 152 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..2791ff7 --- /dev/null +++ b/arch/arm/boot/dts/bcm2835-common.dtsi @@ -0,0 +1,173 @@ +// 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>; + }; + }; + + 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..1104e4c 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,83 +53,17 @@ #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; + mailbox: mailbox@7e00b880 { + compatible = "brcm,bcm2835-mbox"; + reg = <0x7e00b880 0x40>; + interrupts = <0 1>; + #mbox-cells = <0>; }; clocks: cprman@7e101000 { @@ -155,13 +86,6 @@ interrupts = <2 29>; }; - mailbox: mailbox@7e00b880 { - compatible = "brcm,bcm2835-mbox"; - reg = <0x7e00b880 0x40>; - interrupts = <0 1>; - #mbox-cells = <0>; - }; - gpio: gpio@7e200000 { compatible = "brcm,bcm2835-gpio"; reg = <0x7e200000 0xb4>; @@ -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,15 +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 { @@ -671,9 +530,4 @@ clock-frequency = <480000000>; }; }; - - usbphy: phy { - compatible = "usb-nop-xceiv"; - #phy-cells = <0>; - }; }; From patchwork Wed Jul 17 19:50:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11048203 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5D06813A4 for ; Wed, 17 Jul 2019 19:52:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B7FD1FE8B for ; Wed, 17 Jul 2019 19:52:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F8E022AFC; Wed, 17 Jul 2019 19:52:55 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 A2C181FE8B for ; Wed, 17 Jul 2019 19:52:54 +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=NSKGpaGXPZMIMaqFmsOpt0rrps3rsC30VldLtae9J6c=; b=uC8PHEpk5dBjj4ONXJlatKjbXj K83AsvdPZhcFExlm/wYk7AXhLZD35azDfHsYk+OHg21j/MtfTf4+cHHonyF1+Z9zKTalwfKuvzbP6 pVRee5ok3dBpfYBFCA3RwUT21Zdq5OJYZA61SN2f/1n2RJXkCaWmURnZ3SQc7ee07DgRcK46utYnW pGZ3YQLFSIFCHlynnAyfujiPonSsdwuDU9XZOmf84nesh9bCObDBAD1858g+IgRbZl2z+sCt5aH2E e9MpY5/iunPAiaiTry4XHziVkNJLDPwcKb3JHHpI3SBhvYpQRTHu2tqYUzfS1gkVcyaklqwxFzeoC QO+3Ie2A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hnpyp-0004Ba-9B; Wed, 17 Jul 2019 19:52:47 +0000 Received: from mout.gmx.net ([212.227.17.22]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hnpx3-0002tQ-2t; Wed, 17 Jul 2019 19:51:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563393042; bh=f172zsKe8yNWds5ywNLrH91B/sTzHWIKm+VpqMgCJDM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Tv4A/dDgMolikNBm+JtZ0RlECJ3ZyUChhY66nAUeHgMSSN29uiUxCmTndGMwxzJDa wH4q+BUod2AqZzek2yfBtDvP8azIEDQZmZMjYizNmNjWJnp2GWzAAULyI9qDGJn/pv n2lQH60H03uBOxGUNLreKK1pKnKvpXeyN1JFOCyg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.103]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Lqm3a-1iR0Vs0b46-00ePMb; Wed, 17 Jul 2019 21:50:42 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter , Mark Brown Subject: [PATCH RFC 04/18] ARM: dts: bcm283x: Define MMC interfaces at board level Date: Wed, 17 Jul 2019 21:50:12 +0200 Message-Id: <1563393026-17118-5-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> References: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:H8tyGOQ3tJi9HfWsUh8IFqaDsyoK8hSWvUbKpltQvTPzJX6qe0f HgR+Rntga2x/7aiAKrTlT1yAxRFZqlaQDlEorJuMrdGO6vsoGjBiycREYAlkBszNeKBGhIf 3+P/0oIZ6+NwaMgLEosm+lH1tqm1SLjb0+b7UXy9IL9S5MAtwYjSGZSJ4lIrUUo4SvPVmfW 97oyK/XM8cpqRxz/r5XMw== X-UI-Out-Filterresults: notjunk:1;V03:K0:M6Ulwco7aDI=:jO2dIyMmdhPx9EfRZATEDg pu97MlafezUqgKn4IBooFf4ejlf99GrlQgofCsWTvEiycJj8YJUfFVzNLnT0OhRaENatHAi3c HgRhOG1xQH695LfztmmFndFfTUsDA5vYLuet2EMuhdpstb+8RdKN+eG+3MGM4Y8Hawi67sR17 ZgbkkyEstWHD78Vh3cMw3K0CD1FMPquZl293kXfdqJdTGfN2NrgOZOIy5p/qwmTGAR8MacD2m 2FLYeyOse+XM8M26gfcXyTYxh/pSZajw/5GhjGNlMmegWoS0XpfKetpsVWlVDO4A7YhcUTNOJ oYQqVEV9My8c6nG+TkLI+xJv2JVSOVH5SzWxrVea/YyBd6JaGS8+oFh2u+9QyvDYhGjVfmmb/ C58H/yqeplgS0EM0vpbF5J0rw4m2maj3gxTmrEdusapSwg6zbJ//63ywzSLwTHRU4CP7nlrop 1hhcajeRiSN1LdNn4RJjd5lnFer311nofo6ObFdXHdRWJziYh7NoPcMjF6DkEeGTWNeUp0HeF SwZj0q/JL7kT+7SuH7YP6bgXpePJv6xmAgLdTgPmR31mUI80u6f3siYzm3gwp1CrzxH7Y8Q6+ ORmiW6EMbbbsN4AJNeKSRPsr1uwCFN5aAbVi9AVITpNBwloyI7LMSCBU4Fo87k48s1y+isCkR 2Wqq2NZG8E7bZjV1JElxceU4KrJk/8JVgejYT5GQr92Ajg7NeIDUAOX9kWVzNRSPWxGYOJM1X RsnwWqHnJWvkj7gWp8cAs+DjHuLTXSEkky7TAx7bUOlIhUvgUETbY6Ky1tXMCDvYkR5ov6Cqd ouXSSSnMrI1yH3bFqzdHgW//79X7k48u2SF0AflAPFB9qCbHfK2Ntt5K8EuPbP3qznudN5DjZ +jLL5tzZNd4MthI+IkH81yS3ATyzFD77QCBCOe5jReIJTbqoMV3Ohdx3bO447s9d7umCW9bN1 Cxs73m7Ao5Ur5NlwuQCy9X+AkU2m6azqSFiCH3HUMYR++833n8OA+K4aFuOmGiAPx8b/ENuVU l4A3JX0cI+4ChYgM+XDZ997xRBan44HLuzLM+1h3JVCOSifpdlYtX2NZhvigpaWcg68+Bxzmo D5lz5gihNSIbzg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190717_125057_438535_AD2966F2 X-CRM114-Status: GOOD ( 12.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren 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 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 Wed Jul 17 19:50:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11048193 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E1049138B for ; Wed, 17 Jul 2019 19:51:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9055286B5 for ; Wed, 17 Jul 2019 19:51:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BCD47286DA; Wed, 17 Jul 2019 19:51:03 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 CD24A286B5 for ; Wed, 17 Jul 2019 19:51:02 +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=cbx0QRID+SPvOrjWC/GiM1LdrwmpooheiLD+1z9LsD8=; b=KC8sRmy8xUlnYOvOg51ZeqC0Xy q/j7yNbPibvtetDWTi78zOU2dtLqbpAKtWRhTNxAieXGcGtVrV6YJW9gfR8Nopml5gOMHLnKTvaFj mIkH5uAgg7m3suEPDugaOwUQBHce5HDffea+I43zIQ/RmNQU7hAqhML3FzAfqyYJ/aKk+lA2iLbdt kgscUE4sNSmEHftIfpu7p4DTmNKVQKXuo6jfU3vZbS9WD/udy+7CI1o6PcakuaWhdmutRGMeqi3wY R2j9FYun1M2yZd4d63bbRtH/dtYtKrazyScxkdFRNmmnxycOJsFyFrI5ilnjnzmTWNVmaphqBZKKX XYRvbDFA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hnpx7-0002x6-BB; Wed, 17 Jul 2019 19:51:01 +0000 Received: from mout.gmx.net ([212.227.17.22]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hnpx2-0002tI-Sk; Wed, 17 Jul 2019 19:50:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563393043; bh=bMN5HaH7xs5OZI3fgydBkJ1gPM3MHOTFQvPIB1gYS7c=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=ObADk1ltN1b9eAZFJ/dvTcdwnghiCQ0i9PA0gj4ybp0QO7yLlHX3u2uc59Zm0LWCF wODuRZqXZ7UgrztIprbNAJXfTBcxj32HQcD5GJYZvipazdnG7Tlq4ORH30CRCGawgT OBinZnXcMijsdPEh1dmj7MOrQHSDwzI19sWf417w= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.103]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MZxch-1i1EVB3LCh-00LlwW; Wed, 17 Jul 2019 21:50:42 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter , Mark Brown Subject: [PATCH RFC 05/18] ARM: dts: bcm283x: Define memory at board level Date: Wed, 17 Jul 2019 21:50:13 +0200 Message-Id: <1563393026-17118-6-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> References: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:+qUlbWv36YNvHIARxY8HjLdDd7OcImGMezScPmhJq9+C42OBSZS oSzdMEKkwp0h37hik0ttB5RDWntsuG7X/3Dqu31vFTRi2wY7mt3AEMBS+njOoZnxsqIwwwl zK4MFx5U6c2KtItuLklpEKp6iV8JquGYPGaqa/shqagci8tWLc2z74O1Hmql6jd2AtC4rE+ A5cnvENUeT3ldFCHdDVsg== X-UI-Out-Filterresults: notjunk:1;V03:K0:UBGlykYIrRQ=:hwtxnuQFCUsIlxGIGJnNPv PS0CAZAqf/qCM883EeF/jNLcXOL4XMNtntkYy7Dbh3T1uLuDCHu+b66N4tSSpoP1LV8sIyjF+ dRGhyTAa+RnTFLBjw8ZisM7pwy442D5FKcajIwP+YJoWK4XhyDdWAE++DUpVrM+te6AOBOtUc zZW10nFWmzlZiWyPHZdLpDE3s+nffs57+O4IIj7O61n9wZWVIMiX9ZyQpNUfzgsZd0Go/jf89 yvh+rLVbVa4hemP6kwiLOqhZhDzBmVivi9JAGKPQeOOAxCSQMA7bfI3KNqgV67u1HZ0cLxn+A Sj5w35Zh094VTdJdU+mECb+LtyzUo70B0hPh8MnCSpa6pVXuch2q17PkfAfzQyYCVhS+tSod9 75BfHoM8v6bmEj+qHGqTRSmTrRcqP1baDhIUsJ9Jrm+HSBsEm02nok9D9D8GEPy0DrQMldRmI cRgULSXBvCgr6BiZMel3/oHgMJvlhYuRUBrAtoG4rlqhBMl6NnWXd64F+FD2H6QF8Tx5pE6/b SPnHLPkdl474yytm2ExwIDMnc39fmWnN7J88At+xxTxpsfekVkdcJR9Ko853r6V9OMj+Nhj// SMcR5+Tmbn6PNw9gjH0YFYu90UIdCjAl7BIRzGwO0/R0pOutSCM3ggHuqWHTCSI23ZZFCQ6pg vz7JeAXOfgB3iR3ZyEy1UMPtDpn0D2Boyi6grxH2mw72WbaWjd9kQrA3zk/16bnBN85to9pNa QKFYzAyOigjq1jxvbEgi/Oz2UfPwPFqwUtVOMPRrcGNAj2My3QZnbicuB5z6L45rOeqxIIjBq eBp/EuroSUYuijo9/GO5LQ8q7fFh0pZM5xRwE7SpbYJGdm4ft6R9M1iE7Wuf3zNcKbL/42WRQ 2uuizn9n5meXF3NllHRzHWOUlVQ0I9Yta+YiGF5AqpYlC7W4/j+g21m18Lz0phjZFHiHU7H+X rgwE39tggipRbX4Y3p35QK2inUm6PrOFY+L8aupro9GN/qgrkaHjqSMHCeSTbfQvS2f/FZMob rjQzPcEbC5SEY5a6rdiFduzDkwco/MQnS82/jrzLjLgTu5QnN/Tt2EJ32MjTxmb5I0T6Am6Rm 7ljcWM+9vygPpw= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190717_125057_236314_CC3B6114 X-CRM114-Status: GOOD ( 13.94 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren 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 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 Wed Jul 17 19:50:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11048207 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 593D4138B for ; Wed, 17 Jul 2019 19:53:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48EB72857D for ; Wed, 17 Jul 2019 19:53:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D6B228685; Wed, 17 Jul 2019 19:53:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 E0CAD286B5 for ; Wed, 17 Jul 2019 19:53:28 +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=AwnYS5wQ7vVq3D/R+FKcr9mNdKYtMOHrBiA0t0GUZzc=; b=hYP6Co0AdWGG8uJgNvotz4lhUb b34yE71mwll6L5XT1PFwNef8DgdzI2tl0O9wrfBE63bMS8aBCwVMMqU0yFFP5EcdXyPxiDRw7pmo6 FSPr+mGze8JIxS/tQWHa0ts+1qQOSoQoIB8Ka9ka/ZBzPYv29TH1iz4J69Ki9FTASoh5VYJapdSlX AR8XgpE3Ma3bs62S8IHwQRlj/3smOK+ZjPPBttyAc/byX9H7ZeP3wOIGbQXvgXlclrmODdb07clhA bNd9HA+glyJPl6lNHneHHq0QgvmtVveFjmq7Px5m5nYITGoKGTuNezJJvrBqA/CsNFW7X0tUMBQaB R1P1lQ/w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hnpzP-0004ds-Jz; Wed, 17 Jul 2019 19:53:23 +0000 Received: from mout.gmx.net ([212.227.17.22]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hnpx3-0002tK-R0; Wed, 17 Jul 2019 19:51:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563393043; bh=1E1WYZ9UNXig/XjZbrNwH2B/Uz0L71XIHibc51jpswM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=ay8CZ/2quxkRrjGfJkjdNVC6PtL5emHaXbpeaZJT6EPxrNRQcH6rM1j0RBBFEkmN3 kVYo3L/IKNMxv2rITpsbrQgYoZUrUBAVzCCjNV/+ea0BNnomNqLYYntELQP2hYb44x u2VOFWGL2MBHVTWdfOKk+RthHCF4LF0yPOjPSN28= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.103]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LhB9P-1iGnNk1k4F-00oYFU; Wed, 17 Jul 2019 21:50:43 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter , Mark Brown Subject: [PATCH RFC 06/18] dt-bindings: bcm2835-cprman: Add bcm2838 support Date: Wed, 17 Jul 2019 21:50:14 +0200 Message-Id: <1563393026-17118-7-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> References: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:otG1bhmBIpT4ePgWexdXOh6jWbIk6hLbeRBVV7g/EvQ0SPzgNmm pB2ELjR445W2htcYtD7+pIRijISaun31bKLNZRZlY/G4h+QQupCDKBxhF9XRwAb8NLKFrdX acgvhavysceFMzQDmcg5pNJki2PO1G1PrUyA467p8O+7fZRmqe5Rxk1JWSxut+SGeoa6z0T 65kVq9Fs5CQubt5W/u8/A== X-UI-Out-Filterresults: notjunk:1;V03:K0:phn0F9BrgZY=:TFY2ntK3hwWEUmvEUuK8yL JYIYMoBB6jorvtcS6K8kh1Up38KTe5lxMQsaSveZX4E9gY8m+/5EO/ttJsZwgIDZojvVvKFdw 0sZnRnAKqfCpKwS0rytmEBr3jU87yNG6jx8P1/uiSxhQvgHw+Be55k9ylt0DpJT8vZoN22aoK cpIVXxQEWEwOpWW+Egb7jMF63m/waXl8pTVVUV5EJZyOAKROCSJTUArLUslRYIUVKpHnFtwr7 ehNpDyB29trql1tLd/cAXgjtKMCMvq33A15MyR7U0k0pVwc3lBkrokfp20RPmNNbdFVUnO4JT AQO4YwrY3Avrs2njcymQr8JWfxsQsLWCs3wQJST6nBYOCrYp/K9KpEk5bU1PlNsF963w4x1Me HwRHHwanOJGWSUNUN268mOvx841H5Px9CO/npuDsSKQsuu4OguwcBLkU/b9rX8dgDPUfu8MQu aKl8ONUNXhWKsArOT0pvohKMssqFOBSuuDNPsUBujTkT72oM/KN9BpFiKeL8/EwQCTpPlEoh8 7qiZbj6PVGImV60VKgb9Ys/eV5qKM7ZKsN1hLOvV+ZBrT1GJ0yxoGuLwFRZPJFRykE72a/zXR BgAyYJUxf5gQsftL9enXkBz2KGbal02dJO5l5f1Ye1YgKOLgEcxgeHiPyTdDhcm9gTW0O+Ngu ehbW+fdZGuzIEnpz50A2vIdFlp+UK4Kx4EIwHl1j9ETKM4drVYpM+OEpaPZqO483XVTXqIe8n Az/maY7h7EWdiqkBpZV3AQF2/pKnmJOq9Nv8lJC0pD1OOKqwj/1Rs0cFSAfkfx1OXcCdcg9Ar gWVaaHdIxiFzySnKGVmgjJ9SGVNuksNZb+0QrA6aQJh2HJkKoNMNOgogemPxumBRtOfCy39xE VMRTUUBEujaLjuFFUNcQgjbl8yXO4XzxykMueMvkTLO0B+Fl+GAHoM2hykTo1b/4OzsJAIueT 5gVguBWXqrG1Kr7nmQ3pIuIMNEYDexv8C/GNawW25BgQNwnxYpXKBdAvzjzpbq26rtTmhPbUP 610ubaBOVX0KqGJfhpi/irWSYDLllV4NSKIOwmzAXJ2m6e5IqJ4P/7v0MdWI5SnBYe1ilMq9U yCF/bHgVNxeHwg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190717_125058_164260_502C4E99 X-CRM114-Status: GOOD ( 12.79 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren 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 new BCM2838 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..e395795 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,bcm2835-cprman" + "brcm,bcm2838-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..d73acd8 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 BCM2838_CLOCK_EMMC2 51 From patchwork Wed Jul 17 19:50:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11048219 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BAB3A13A4 for ; Wed, 17 Jul 2019 19:55:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA5922873D for ; Wed, 17 Jul 2019 19:55:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9DD4E28685; Wed, 17 Jul 2019 19:55:24 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 332E42873D for ; Wed, 17 Jul 2019 19:55:24 +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=alaLxJ++DbKUVYJx0gNwpImGZhdhPEtFviW6wkgmu0o=; b=D5oh6U3zY7/J5EGeB537on1J6c y73z1QVpPyNhg+O4I6E06aBXWboAA+X8tpoSne3l5F+BI9euY8uUrnAQVwJvcNnoV860l13dk5j7Z +slAWmMRljk9e+ksa7tRu/TGOdFKqiB9QBN5H1w3nA3CyYcosaNMLB7l8ILo61dKKV5K7LKc/FkFh 5Dv5BB716b46PNirGp98VwUMON3f8bAZTfZE0YqoJuYZdC4LkfDeVBTCRJfN01Rp764DazmYkYpRo EYgCxhd89beuKiDU5ed7picAhGV0MazAxfvJZYYqYEVFN9TUhbpDgbTmJFM72OUL8o5EaIIO/6yXu qo5IxVWA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hnq1K-0007VI-NN; Wed, 17 Jul 2019 19:55:22 +0000 Received: from mout.gmx.net ([212.227.17.20]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hnpx3-0002tL-90; Wed, 17 Jul 2019 19:51:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563393044; bh=R9brMAk7TYtzYQPh2zNgNq7URsVol2j16aDqED3oRj8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=fOG4rbRjsAk1NsQ2JoRn48422d5imwY/rZvgEetewYNI6hV/wMGFgXlnQ5OYRFgVW wZ3of7YWTleKShERN9JY9HmYqJ6hNywEjhjzn4sUs8uGdSB6gPz2egCyIxrIUwX+Ad deEaEuF3GqKwYpNbr9tXGkwyTkRFXDKADJA4/Tvg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.103]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LlqNY-1iNAlY06Ua-00ZRHT; Wed, 17 Jul 2019 21:50:44 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter , Mark Brown Subject: [PATCH RFC 07/18] clk: bcm2835: Add BCM2838_CLOCK_EMMC2 support Date: Wed, 17 Jul 2019 21:50:15 +0200 Message-Id: <1563393026-17118-8-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> References: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:wBXTrd+q4tE1UkS/4oFb93izCQy8kYwkLZTmkyTdzGs+hz+TH3d Fxc4MBR1loExiXjomd0ZMTEo31jMJl/FmkYLZAuyX/Doj4aCey4Eg7Iph/g61a0Ak23O/R6 uuK/uhecjgHHdQPuKN74wIGMhKxQ8S/4enIst2HhrOmEyH6Nn3tRX0cpTqlVDvxp5d9+KKw uSCl7mIVBwe+mD4AQwBLQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:vGIp4TJST88=:arugvaM5LrSwYEzsFAx5Py l+1DaLQ659uZ3kSs8VqOS4U3S/CJW24xpb+Qa3wa+N5TRSTSpBc4eZcq3PCIAsRubuUFO6BbV 3kFNTNHH3ZjqyuirWjBsBhOGn4bg4JcPDRs+DkUMCsO79LtOCerUq6wRiK3G/g+y9u4C6Nlhn +YsS6aIo4V1t0gfcuHrpiw27kU+3Kf3pFff2k+TYXANJ9vBR0QfW+UaWOBUNBwoTyqNrn8qxH YiDZUYquwFUKldus8pENQSlgvyMKi+/YLAlkHpqXujS5khhx5xN5Y90+poF0tuNPQzP1VMbqL k8LWue7g3+1kG3wna1n4C5Chpbn9DyjgUSf79aQ22pmFxejXTMKDXj3gdFbAWhND5SIgipM+D UI6Mi/nd0UgR9LQcCNmhVaMAZ3T5/OCYX9NEmv+5LxELOIrGxzCBJ0lXTgtqLwKaDnmqbwY4F XoU9DdUjfnKHN2xXeAtCGJyJUF/FrHG2O4kh6MFvr3nx4lLVkVj01fgn6uAEfaYWQoTlXWinH 3eGBvoDmMQ6fBO9vIrpiVQjFsw97H36uX0qXwTHJ2hX1nGQ0DOM0n/HHewrsbWmrjNdLFaFA9 Tk4zXnSgJNVIJP1C+BqYUkSaU54cPfqoFrSY5PgXZ17Mu7B6ILhIInU18cKNv1vNBnCc14QOB Q64FIHYa3poZrxMBUAf5sWX9I6zs3BR3lo371gT/Z4pBhPsiuvFqR51Irc0aRb1TzZygcb+BQ YF/G+10rRmA1bgDcJLvafd6+GCAIAb32DD421mM3Rd4aW6Co3ByoLJe5dXud124qyucChSRVE GFmSJrZP1mtpev9frmwORxON2jqkj0CEYUArnrxUS8Z3PscIXhxb35do6fMeyb9JTTgvGcv0a 4EtZwwjarNhuPxcUHbZJJPHBQn8fTbwoOBQBcc7TmfWKSgGDbLlRktYrkb1YLrBk9Exr+4SMy j0JWeKYjE2qUbacyA14CpYcSPMx35Ns+umWnt0k5eBRrWk+l4haUwTIekSNyNueZFOFL0Yf3n lBHGZD6TWSoaM2LDHp4CSvDsYZMiGEFsNmvxvfAcoV4d+NjsL6MRp1RVFE6TXx6Z+SJptKn5z pa1N4N61rU1pZg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190717_125057_639901_5D178524 X-CRM114-Status: GOOD ( 16.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren 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 new BCM2838 supports an additional clock for the emmc2 block. So add a new compatible to register this clock only for BCM2838. Signed-off-by: Stefan Wahren --- drivers/clk/bcm/clk-bcm2835.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c index 867ae3c..5fe4695 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -31,7 +31,8 @@ #include #include #include -#include +#include + #include #include #include @@ -114,6 +115,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) @@ -1950,6 +1953,15 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .frac_bits = 8, .tcnt_mux = 39), + /* EMMC2 clock (only available for BCM2838) */ + [BCM2838_CLOCK_EMMC2] = REGISTER_PER_CLK( + .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( .name = "gp0", @@ -2101,6 +2113,14 @@ static int bcm2835_mark_sdc_parent_critical(struct clk *sdc) return clk_prepare_enable(parent); } +bool bcm2835_has_clk(size_t index) { + return index != BCM2838_CLOCK_EMMC2; +} + +bool bcm2838_has_clk(size_t index) { + return true; +} + static int bcm2835_clk_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -2109,9 +2129,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); + bool (*has_clk_func)(size_t); size_t i; int ret; + has_clk_func = of_device_get_match_data(&pdev->dev); + if (!has_clk_func) + return -ENODEV; + cprman = devm_kzalloc(dev, struct_size(cprman, onecell.hws, asize), GFP_KERNEL); @@ -2146,6 +2171,9 @@ static int bcm2835_clk_probe(struct platform_device *pdev) hws = cprman->onecell.hws; for (i = 0; i < asize; i++) { + if (!has_clk_func(i)) + continue; + desc = &clk_desc_array[i]; if (desc->clk_register && desc->data) hws[i] = desc->clk_register(cprman, desc->data); @@ -2160,7 +2188,8 @@ 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 = bcm2835_has_clk }, + { .compatible = "brcm,bcm2838-cprman", .data = bcm2838_has_clk }, {} }; MODULE_DEVICE_TABLE(of, bcm2835_clk_of_match); From patchwork Wed Jul 17 19:50:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11048211 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AE1F813A4 for ; Wed, 17 Jul 2019 19:54:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 992901FE8B for ; Wed, 17 Jul 2019 19:54:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8BC422870E; Wed, 17 Jul 2019 19:54:09 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 75D8C286D3 for ; Wed, 17 Jul 2019 19:54:00 +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=EeIJ8CIkUG44KK8KDQ0tHBbRjqzjGmg2ZQRISkhtXXs=; b=G2TmvaL74xMGJYQvQJm5NJVfDg Qrt5McG7+BGKK4xWz4nVnS41RJ0XiIIUD0b+MzEhqGmUBgEh59asU9CqLExzvWuR37znbOPOUPIZL AUKe8CxTpH2HzfPzST48o8bxhaX2Jk9gPdyMuhSGTv4C0G6U3JvwOPi1FjFV820XhTjga0kn9HpFC q3j6JUF1Kj6yfN1Mvg7mUJdxstaZ6euCFiIjh/U2Pn6jg5RXQpbv8pilmNYDT84VjQTBqtl70JTO6 b4Q86mnuMzDAKJHGrB/16jFgDn1u+sdxP3kGXDNbPojLfmMwAU8DQWV6h2DZMOhAoXc6KpnGHABXK PvUI4hjQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hnpzz-00057X-K1; Wed, 17 Jul 2019 19:53:59 +0000 Received: from mout.gmx.net ([212.227.17.20]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hnpx3-0002tP-92; Wed, 17 Jul 2019 19:51:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563393044; bh=+RVfDoyStk3kA2tIa1p3ImtA9muC7UvcFiwkFCkx9MI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=gobR3O+o20TnTmuaz6GF4MaVHmMtQ/p27fwVl6KtgJDln3NigqdDxWTmTfABDQHmA x3oww3NpqoOTCg4PQu9wYWVlScrxEWsNM1nl7Jx9oUxGJ+R0fEwjwOg9EVEfSujo6m sLzbxQkdA2Z3ovHgq0XwbzbmdWa+O+3gizVp4eAw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.103]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LbR3e-1iBaBy2o3u-00kxsL; Wed, 17 Jul 2019 21:50:44 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter , Mark Brown Subject: [PATCH RFC 08/18] dt-bindings: sdhci-iproc: Add brcm,bcm2838-emmc2 Date: Wed, 17 Jul 2019 21:50:16 +0200 Message-Id: <1563393026-17118-9-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> References: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:XdWI3pNA7FHmjLxJynsiwapxSHzTrtJ1/rbJJRXfgEdpnZTTpG6 keJL+y67QtNpN1Ulj8ieaPCYS0z7er1w955IaZRssVD7isnmrfUyjhmkI6xIMEXtci0JJJ2 fTxQFkwrE8biKgPNQjkNwgQby1PGjrfCpiodahufZe9fgmJgG44r19aX/g6CCzX+k1AkhIi yloiAqxcPFodkFsH+fmHQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:1N/SEaInjWs=:W/IiBA8/W/kf+3YLx2a54y Tc2kv0vYFEfi2eNsmt9RJqixBILA58kzhaCt9ZpUJDy3Iq5V///n0657HfF7JvSIrMNlIqD2Q 8h1bijapQ4gXi9t+DzmnaizI1RxxoyPv+dzVm9e1cgMKym16STUUmnipt8tpPBJCLuYdnGzYk Yv7CxMKNRPyUSqIKd2MYX0K4RvucFZIrCjfT/QEDAycS5TOihYcbFJc3P7mPrjPc/Tn1AlJcn fAnvSBL2ZJbqZViZFR/qhw05mmHZlZjpGdyILOh8/rHlOsqWX9e5r58StyY9WEZC7bAexget7 vTJb/LIUO7K7x64EGIrfmNWvBTXBLhQqM9CtnYXKny4caD6q5rRdZMsi70O4KdLb9FwMTxSEn TZ3164j/w82JwN4hLBiG10flrF6A/4yP/FcCok/PEFRfdiV3mhGogQqG2RggmwVOrcscxoWvg XXtRYgio3Km0pzNaTji4Hlpwmm5JtfrKhjgYvKuvft/20R0yaKWCeSHQnZ5SsDmgW9JO3IYRz PSF2JF+z+MiVogLcnsM4afY8QCAUQSvVn/x43W+dbVouRmL6pE0RFgwjBOsgOVAcdm/PsMCSA st4LInIJF2AKTvncca55S4WmirHDlFpMHcQ2PDpo5zPjyUCm4U4kRpMnwq0RSoNTZduwdthKk 8S1p1qISjfRQ7RZK9X0NFOvjK4Ayb8ptA0i3EgXJ2HHyoHYQTuGj7D/H/HFX0kHr7itEaMUrH /xWlGew7PizhUCcrLAEfPwbxNrQEshabIsFtAGPkwBMHke6yyZkck1noAFCf75y5jq0LKmFB/ whqnHlzg0qmoyDJEDVZQVtoQ1zp3CtQCw42ZvJaSssM651EkH5rOQvRnNjalXgCU7py0hK/XR VxcJ8GCIJjkFfalOxlmZaIeCuNEpt5H43dd/hpVqRVu8Rv91UlSY1dnhxy+R0eIshI/f858Bd XyUfpIoSNVMM8PlYNH2Fp7i6tKFdEpsyBhsxTUr+NSF00U5t5Goc7KSEpTfoMESSDF33O2rHH JZdbkcG0L9lzubzTWxIgrgHkelLf290QJKORXTn2bML5tsTPJetrWMa4GGhsbMXq4cjKAPmJY nPUP2dJJRlOuEk= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190717_125057_626902_9FBB273B X-CRM114-Status: GOOD ( 12.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren 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 Add a new compatible for the additional emmc2 controller on BCM2838 and clearify usage. Signed-off-by: Stefan Wahren --- 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..18bf610 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,bcm2838-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 +bcm2838-emmc2 for the additional eMMC2 controller on BCM2838. Use sdhci-iproc-cygnus for Broadcom SDHCI Controllers restricted to 32bit host accesses to SDHCI registers. From patchwork Wed Jul 17 19:50:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11048201 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B66E113A4 for ; Wed, 17 Jul 2019 19:52:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A4E53287A3 for ; Wed, 17 Jul 2019 19:52:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 980452873D; Wed, 17 Jul 2019 19:52:30 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 44E30287A3 for ; Wed, 17 Jul 2019 19:52:30 +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=IlFK2Wl6R4AY8Qrtl+po/jpKnPWSg962W1b/iEkx0Kk=; b=XuCGN0ijPnwOue+M9H8TjqTAqQ X26Trjz4Zp8b5SI7EDopZdPoWFipubJQo12N7upvq39ersk1bpmVLMKrBHP06Gc2nE416K8thKVAF gNaSX28tyLOf3px774UiizOBvMMXgt+Wr5EEmPnRQky6y30A/a7vsNLhcEVOYHvBfUOTmg4FyDZLB OuPnR6jMiY0AdolMyZIZ5qLgZrB89k6P6KY984Wk6UVV4/ZzTDwPkiUxxcm3udpXA4ky8BlRlR8mo AL90ayVcAcnHP34WICIyiaG4/bEcQOPQhy9erxyymHnHT5a6dkl7+LntCaKcYtBJnokbCmIS8ePRB 6e/p3ZOw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hnpyX-0003x3-U7; Wed, 17 Jul 2019 19:52:29 +0000 Received: from mout.gmx.net ([212.227.17.22]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hnpx3-0002tN-2r; Wed, 17 Jul 2019 19:51:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563393045; bh=goqH1lVWvB3A8xH2hajIJ5sNIn+wikMpmDskA+IKhdU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=W2xQ+RrLwflxplh62uEoXGgQ4+Ak0dfAUBFFB6bVrNJlXBPq8WaEuLysrE+qdE0aq AhP87SB2MjvrMDXVGwlsMRnqXpDdAdfMoukrIPKqqRkWR6QV0yQm9vW2vlaqKV6x2M 8Gwhdwgd5wT+ykQbrBvVOe03teshIFIFrTSvg/fQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.103]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Lfolq-1iFxuB18m2-00pNjB; Wed, 17 Jul 2019 21:50:45 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter , Mark Brown Subject: [PATCH RFC 09/18] mmc: sdhci-iproc: Add support for emmc2 of the BCM2838 Date: Wed, 17 Jul 2019 21:50:17 +0200 Message-Id: <1563393026-17118-10-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> References: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:SWE29vUHdmdIFrpCjCd58D79kHyqz1N8szIfijtwj8rKTcnduZY ploABNHAngz7QO72XIWfVqbxRp4rzr4LD/axgfbBiSpK1B30SjIUQ16epNqBw97VHXQRAE3 0B0HO80SMN0L2G0DVMut9AEu+KoULIk7nHZUSXPZWsQJQpJkXTkXJVaJMpkiAKtf87wvBjt Iqv2DgmcmwBdvAGPbgzbA== X-UI-Out-Filterresults: notjunk:1;V03:K0:vLZgQM9vSH8=:BGmWsgK8TftQgy8P9ePPGR 7J/GLJLyYyZIzalW6SuGm/InhyKaDxHPQK6qUP/ho1rfVZJ38wYxX9WmyeiqhFB70gowkan7Y BtLC7+9LM0GP3yd+T6D97AF+K93g9hPtBpetRSv5gZIEDpE8Za41JHRZZ2IYTGm2Jve7LI78N yz90J+kXhFakgdBKXKHPZ5G0D6aPOA1T3zybGVbLjD3/3gtLIOOdl6hw8W+OriooktGMO+2QE XrBqsb7fgAM9CIZa9klkO1YGH5AIqGvw06oX5hHyVfN3GVwITme+5nj0FNG5rwYegyZqb++FV 0kz9NHaWgBumAhoChWwBntrbql3mOuqdYQWmj9XDbmCAUVjzJIKvykJVdhAFUb2v6rUJtUIYR uK54C6q5UObNc9xAW3Tvwz6tpMmpomegz/mv166MEb2COSNqAug7LwO5WuDLBydF/VGvlZWSX FYB0m7ZCSeMclNMOVP51bba3DM6xpvqd111YzZGyoRA5/5tiyv9mKJi22Gtxrn2Pl4IqXzzY/ 6CXytmy6r5wS1hK5dsrIXmnL+AD1F7Lqchybewf4AfRZ7n5JdqXCBdiURVuiVW4SCMPPJcW0h dwLEOho3JHn1r/UibekEfHgy8l2nNI2LkPT0TXT50/Khb78icjeI69X3neJJrjskmm8s+nQWL SYLboLl4NHo/IKuujXs7k9vU0MtWQKpLth/C1zEWlixPlbpU9OQVjDCJZiImdpn29UcpRD6oO lBvafHlJ8rIRbBAVTrwqHPr5J1yhG3eF+1ztAv/bOlBEy1zTAxO3WIVm8sdtxFGHlBYoIJhND f2KHCH4yzAE1cz4umT9IrvJUgYtD2C37Kl/AXVjuYWez2f9eToq4wr1sUWpc7VNDOGS/Xnq10 wtO6zbGC16JGFmr08SW8BLVV+owRoTk98WCAqgBF527hqFUdxL0mEBMeZDLced7PB2+Tafb8s V4P0YQ47GULhD/FZXori1ZojsK3axMZjlkWmmwlC6QgZxe04kKQHaPtgkwfEJSz8SZoa2P5xM rTGrSDY79GkwplkbT0RBX1aZ8gBDnDN6h1aou7BzXOcxdKLfCEzjwTMGPAZ+QGtoTuPIRjn9R rBAUQQGySt/prg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190717_125057_434843_F5B46D86 X-CRM114-Status: GOOD ( 11.94 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren 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 additional emmc2 interface of the BCM2838 is an improved version of the old emmc controller, which is able to provide DDR50 mode on the Raspberry Pi 4. Except 32 bit only register access no other quirks are known yet. Signed-off-by: Stefan Wahren --- drivers/mmc/host/sdhci-iproc.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.7.4 diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c index 2feb4ef..353cf997 100644 --- a/drivers/mmc/host/sdhci-iproc.c +++ b/drivers/mmc/host/sdhci-iproc.c @@ -261,8 +261,17 @@ static const struct sdhci_iproc_data bcm2835_data = { .mmc_caps = 0x00000000, }; +static const struct sdhci_pltfm_data sdhci_bcm2838_pltfm_data = { + .ops = &sdhci_iproc_32only_ops, +}; + +static const struct sdhci_iproc_data bcm2838_data = { + .pdata = &sdhci_bcm2838_pltfm_data, +}; + static const struct of_device_id sdhci_iproc_of_match[] = { { .compatible = "brcm,bcm2835-sdhci", .data = &bcm2835_data }, + { .compatible = "brcm,bcm2838-emmc2", .data = &bcm2838_data }, { .compatible = "brcm,sdhci-iproc-cygnus", .data = &iproc_cygnus_data}, { .compatible = "brcm,sdhci-iproc", .data = &iproc_data }, { } From patchwork Wed Jul 17 19:50:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11048217 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B0DA413A4 for ; Wed, 17 Jul 2019 19:54:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E1DD201BD for ; Wed, 17 Jul 2019 19:54:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 928F828720; Wed, 17 Jul 2019 19:54:58 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 218CC286D3 for ; Wed, 17 Jul 2019 19:54:58 +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=R0ZfjjW40uUyvpHBUbMJNrYXY2UXCYo9H4Eh/GcQCRc=; b=imSQ1yhG64p0KLg9ev5A0rMPZB RpcrgRDMIFe1CTnVi9krT0O/KsEB8bAwPmPC9aUpcG5buzKzF4wdQ1XPwfD6Cg9hl+M1Zt9NrQo96 K3dMGouhiDmBD9llQjgVEPHwsfi84ZeUUPNpCTcEJiGkvEMPFjXRryPqjmnmjRnN3zIHbVLcMvpd+ BpUHXFzuTGvEcy/lOOJdUvK03Z/7sSpwCBGLKX/IhRGsS3qGhIBocpXa6Fqz1CTj2LP33cXL1i01z OcIB37Rw8EFLstl9pDueXZyt0bBFmp83dOhPjneTkpk2X6RYIsDsRx5zrRcLdsqoX5APaP3ibn02T YMSta90A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hnq0v-00064z-Kj; Wed, 17 Jul 2019 19:54:57 +0000 Received: from mout.gmx.net ([212.227.17.21]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hnpx4-0002tS-QO; Wed, 17 Jul 2019 19:51:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563393046; bh=MjYDuc6QsIM+npV5DIdNaHuG0Osttr0SwYf0sdv6rIE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=bmYIaZHGx5y2WkhrQTWNwaY5vdQpDp0siZAv+UndP0QpacyT/9gpwuDTeEtuDFc2H EzgGM9kHluVPyTpfU+N3Ir6eZHUg0RMP6N68yd3xpPoerK3P3qUlHzVYRcemLlrBLo ZTfOlNLeO/3bv3iuhF+jqg9XW6rzYhiADTjDH+n0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.103]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Lfolq-1iFxuB3kL4-00pNjB; Wed, 17 Jul 2019 21:50:46 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter , Mark Brown Subject: [PATCH RFC 10/18] pinctrl: bcm2835: bcm7211: Add support for 7211 pull-up functionality Date: Wed, 17 Jul 2019 21:50:18 +0200 Message-Id: <1563393026-17118-11-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> References: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:jsna6FmkwWfK0Sozkjk0lkfkTYaHeb7wn5FR1K/E07/BZkelD0W u0Ca3BGKkiOAdkz/djPgS9xnYGj7fWM+1/1dA+8l56a5h6//Bqou29lU4sFuf/1N9DzGvIr AepyXGAzE3f/zmrECcqkLHZVtua/stCGo+p5rmNa5e+VOiGtzgOhrv8MciEKXlxdRNR5Q/A 39MrSXyc1/wql7D1VZUXA== X-UI-Out-Filterresults: notjunk:1;V03:K0:CANcB4XUUT4=:NHucmbzKfiyJLkmOYVjID1 tSSxwf/rs9uLOnteIWSsN+0V7cmt6HpzpuZZ7LjgI5ZGSJcAVyjHPz1Sabt8kcDsxtOqj/FHd o4Cmt+n3ejeSMqr4XP/TrUTempwNlFstgm5d/tz/4EMfsRIzgoaprUGULH8Eq1MzoZFVJ2c3h 5XmOCbhjVMhKQCWZi6rGy9YfHxgBhvCGRfUubciB0EU9gMqVlXHEYEd6/wrWh3procI17whx6 AyyNhjpgmz9Gl0eAQiGEdXz5O0kMX0PSBw2dTZNcNtUpPgmo3k2Xh6KOaVLP6ZMC566WAdnlW 5wI6/F1vwG8NcjUXpUgN11HqF05jJMqIi4NkJ8xGPTT6BmRcko9XSB+IT+McuH8SlR7okRCQk LAxM6qTyH3vxQvRcMinWy6JIr4+jj8S1KiXcP67Pmpo//BYW3I0u2HIP3sa+g4cs0LsZ7hpoa h0nzRNOZp4PSFqIVvbbyKJLZSJbzvja1ryEQOdAYHg/OKYC8z3aEF8yu8GtW0O0CZ0guW1Lts nx7nByitTlgZd+rC5zS/ZUckDdEa942VSvDuy77ItNogJzJ/zx/y6LWQthcuyNMwbPEflZKq1 aJ5Hty/3VzTocu1nRvNhei9Xoq6K6kx8x4XDWs0eSNDlaJQayT9SySdgZsXE0b2r2uFeU1N5a GJKc4bV/gGneKj5lhqdrH3LuNybWYA6qcTQODKBpdaorV87WcSyJd7qom2ALGHOGdwH0wqH0y gacVCU+2LEZ1lqKgPNik0+F+5BJeWRM/pulqPl7LC8ClbK/b2RPGs6aWG9Z15PQpw+TSOfKw/ C3sdjH1f7m4yIDPV2Rpk9MmDjG8InaXdG37SVGsTM9FNChPAVsmuRDo+xnOZgTbHAQhhRnoVa mwzEaelhate8zbzK9A62gZfJM6OtDD2uQeo/JUVAXZdy6162Y7RS1Yq8Eq1/qe0+fQ/bgKWQa c4BQV5OyM5KnCSL/qeXX9i/p9X/4kzjcbeUyItWLjelf5lJssPkKO6dHqqE1GSj6ZG1MkgmJw eCImzx7opUsRCVWbAIjGUUoU0kJmxGZ8kMTWLvkMzIKCBvVeP8qi5msgaR6rXbbJD9W5NIFMC ZOAiGf1WKzLLa4= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190717_125059_188851_EC8604FD X-CRM114-Status: GOOD ( 18.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Al Cooper , 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 From: Al Cooper The 7211 has a new way of selecting the pull-up/pull-down setting for a GPIO pin. The registers used for the bcm2837, GP_PUD and GP_PUDCLKn0, are no longer connected. A new set of registers, GP_GPIO_PUP_PDN_CNTRL_REGx must be used. This commit will add a new compatible string "brcm,bcm7211-gpio" and the kernel driver will use it to select which method is used to select pull-up/pull-down. Signed-off-by: Al Cooper Signed-off-by: Florian Fainelli --- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 85 ++++++++++++++++++++++++++++++++--- 1 file changed, 80 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c index 183d1ff..35d9f95 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -57,15 +57,26 @@ #define GPAFEN0 0x88 /* Pin Async Falling Edge Detect */ #define GPPUD 0x94 /* Pin Pull-up/down Enable */ #define GPPUDCLK0 0x98 /* Pin Pull-up/down Enable Clock */ +#define GP_GPIO_PUP_PDN_CNTRL_REG0 0xe4 /* 7211 Pin Pull-up/down select */ #define FSEL_REG(p) (GPFSEL0 + (((p) / 10) * 4)) #define FSEL_SHIFT(p) (((p) % 10) * 3) #define GPIO_REG_OFFSET(p) ((p) / 32) #define GPIO_REG_SHIFT(p) ((p) % 32) +#define PUD_7211_MASK 0x3 +#define PUD_7211_REG_OFFSET(p) ((p) / 16) +#define PUD_7211_REG_SHIFT(p) (((p) % 16) * 2) + /* argument: bcm2835_pinconf_pull */ #define BCM2835_PINCONF_PARAM_PULL (PIN_CONFIG_END + 1) +enum bcm7211_pinconf_pull { + BCM7211_PINCONFIG_PULL_NONE, + BCM7211_PINCONFIG_PULL_UP, + BCM7211_PINCONFIG_PULL_DOWN, +}; + struct bcm2835_pinctrl { struct device *dev; void __iomem *base; @@ -975,6 +986,55 @@ static const struct pinconf_ops bcm2835_pinconf_ops = { .pin_config_set = bcm2835_pinconf_set, }; +static int bcm7211_pinconf_set(struct pinctrl_dev *pctldev, + unsigned int pin, unsigned long *configs, + unsigned int num_configs) +{ + struct bcm2835_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev); + u32 param, arg; + u32 shifter; + u32 value; + u32 off; + int i; + + for (i = 0; i < num_configs; i++) { + param = pinconf_to_config_param(configs[i]); + if (param != BCM2835_PINCONF_PARAM_PULL) + return -EINVAL; + arg = pinconf_to_config_argument(configs[i]); + + /* convert to 7211 value */ + switch (arg) { + case PIN_CONFIG_BIAS_DISABLE: + arg = BCM7211_PINCONFIG_PULL_NONE; + break; + case PIN_CONFIG_BIAS_PULL_DOWN: + arg = BCM7211_PINCONFIG_PULL_DOWN; + break; + case PIN_CONFIG_BIAS_PULL_UP: + arg = BCM7211_PINCONFIG_PULL_UP; + break; + } + + off = PUD_7211_REG_OFFSET(pin); + shifter = PUD_7211_REG_SHIFT(pin); + + value = bcm2835_gpio_rd(pc, GP_GPIO_PUP_PDN_CNTRL_REG0 + + (off * 4)); + value &= ~(PUD_7211_MASK << shifter); + value |= (arg << shifter); + bcm2835_gpio_wr(pc, GP_GPIO_PUP_PDN_CNTRL_REG0 + (off * 4), + value); + } /* for each config */ + + return 0; +} + +static const struct pinconf_ops bcm7211_pinconf_ops = { + .pin_config_get = bcm2835_pinconf_get, + .pin_config_set = bcm7211_pinconf_set, +}; + static struct pinctrl_desc bcm2835_pinctrl_desc = { .name = MODULE_NAME, .pins = bcm2835_gpio_pins, @@ -990,6 +1050,18 @@ static struct pinctrl_gpio_range bcm2835_pinctrl_gpio_range = { .npins = BCM2835_NUM_GPIOS, }; +static const struct of_device_id bcm2835_pinctrl_match[] = { + { + .compatible = "brcm,bcm2835-gpio", + .data = &bcm2835_pinconf_ops, + }, + { + .compatible = "brcm,bcm7211-gpio", + .data = &bcm7211_pinconf_ops, + }, + {} +}; + static int bcm2835_pinctrl_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -997,6 +1069,8 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) struct bcm2835_pinctrl *pc; struct resource iomem; int err, i; + const struct of_device_id *match; + BUILD_BUG_ON(ARRAY_SIZE(bcm2835_gpio_pins) != BCM2835_NUM_GPIOS); BUILD_BUG_ON(ARRAY_SIZE(bcm2835_gpio_groups) != BCM2835_NUM_GPIOS); @@ -1073,6 +1147,12 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) bcm2835_gpio_irq_handler); } + match = of_match_node(bcm2835_pinctrl_match, pdev->dev.of_node); + if (match) { + bcm2835_pinctrl_desc.confops = + (const struct pinconf_ops *)match->data; + } + pc->pctl_dev = devm_pinctrl_register(dev, &bcm2835_pinctrl_desc, pc); if (IS_ERR(pc->pctl_dev)) { gpiochip_remove(&pc->gpio_chip); @@ -1087,11 +1167,6 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) return 0; } -static const struct of_device_id bcm2835_pinctrl_match[] = { - { .compatible = "brcm,bcm2835-gpio" }, - {} -}; - static struct platform_driver bcm2835_pinctrl_driver = { .probe = bcm2835_pinctrl_probe, .driver = { From patchwork Wed Jul 17 19:50:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11048209 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 022A913A4 for ; Wed, 17 Jul 2019 19:53:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4DA92267B for ; Wed, 17 Jul 2019 19:53:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D8F0F286B5; Wed, 17 Jul 2019 19:53:44 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 83685286D3 for ; Wed, 17 Jul 2019 19:53:44 +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=gR3m9PKnWaXyAAzz437Qe61VFuNiL2V8GQxu26INjaY=; b=JpeKULAtKSfJV4YaNybKJt1O9n GaUxNti9KSPFziCzW9/jDIIqXu+lA51rPdaCYW61F/SXBxkp9PzQ7giMhdypRk6OE61xkb7EwECZL DkOc3ZrYJ6C5rp9ODju9sVLAqRq7mWB1LWt0fmMyfR3saLcoWxhQkYgZhXYrN7WHp5yUOlrV4rtvk HJeeU3UaQ0DTwaIkvWNMlvdgiaQF/iDl+EjItZChD3KeoOTfb4FUTgE6+CLB8gaM7MQywmcZu5/FK 6AEyH8dS1s9tjio44ZGqtkz6/GtfZhfPWa9fmCmCxttiszb8Hp2JUzNtnCznBf3PBJoFy+3zqhWno eM6k9qww==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hnpzj-0004sq-Ow; Wed, 17 Jul 2019 19:53:43 +0000 Received: from mout.gmx.net ([212.227.17.21]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hnpx3-0002tR-No; Wed, 17 Jul 2019 19:51:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563393046; bh=WOVNn//5VSTYo4vhSDrls8pRJwZusUo3NZilyrpEYh0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=g5u7Yi3IMzHegEU2nfFoRDxcxJ6E1kSVDtFMnCi2hfviO4+7K94kCtDHOyZJRoZWU 02OBsa+FIjFjSPiWIZnyIwqwx8VJueutplucJbjUC9APezUHIwcB1eSnhNTvYJjZk+ ZmEgPtU187ishh4fkb71zdWgUaLW/TB8Fo7Bbyvg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.103]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Lyi0B-1iYKGX2Ait-01658K; Wed, 17 Jul 2019 21:50:46 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter , Mark Brown Subject: [PATCH RFC 11/18] pinctrl: bcm2835: Fix BCM7211 pinconf handling Date: Wed, 17 Jul 2019 21:50:19 +0200 Message-Id: <1563393026-17118-12-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> References: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:q340osXNt2MIqoSmFRq896014RbMyi72mNiv8JYjo0i2OK0dvz6 8QqUWu7jdo9MJbinU2FVN6yC6/TeldleHoOflJ/uIEkGZqkMDr+2FdoIMrIDtbU3/pd95x9 +GB7AAcdgftshHhjhH/r2bcO8GxUrQliEegZ95qap9h4PcQjsBxHjkVos5/c4EZiJEJtiZi lLq4qRDbtHZ1V6/jjmCfA== X-UI-Out-Filterresults: notjunk:1;V03:K0:BXBDGoF3MMk=:Sy4/oQ1oFBn4ZaIfiWMWvF 9lX86q5Ks1VH96ihXXsbC/5V85o4dnhP6rfLb8tTsjC1uMR8yr7AJdDodBc8r5Y+qxewNbkZn Pj5jp3zd8rUYXdkMK/kN3L+JYBUPaV1LaVKDKrIkdp2NZQpLtheMsSfrSrOyZZypcaOnn6ulq tDuNQxJEKfogcIWTG6fMxgbh8SEMiWN0qnfgIpqGuPYX7JgclQY5n6fs30dhYEWetN8/qDPQn ZXzZscRHdgA2lW1C/m8mU2LsT+R8ckkTO1744YQEgl42CfkasbGgcULF5O6KLA12vM83n9wgC jaWbpJUILBaTiaekEpph5jFdtkFmhXPPmyQTQaYvcOSBlnrTBeuhWAtV0G2MndawRznA4nWE8 DETodbg0e3jd93fLnW6Nlf3vk/6vcbkmxNDdFZlOAb1XI+a10TbNXm7cdRAgEd2aNcK3Dy0Gb jRrlSuVDvytZwpViH9PXGnrRA/3ob2R5/Vylmng4zRv7RqKoRdKgwkcZhQRGLmM2IvjU8rkiD QNm2vNIlSp6OtjEmHPlOX+yAg69sNCHK9ab8krAGHylMvlsR2V75c6vvY5l3t+LsGRl8/XaDn 2JW+RImM/g5/V12kYlbG9GOBjIzoQ1fIxad6jtZXaEAtnUM3+Ek92ld543pIq5dR4O9wpc5It ylD4R2kIZqtas+Jho79q7zu3qZ/JaoT8B/o0+KDwaZclKBlJ0C+Uro+KyYJD6gbXxgXLO3m/X H9d5pw7HU//dl+J/phja92ZWcJ6zK6e1Dn7jTYTdZbHxSF74dosHErtFFs7N+88KU+L5QmOUo xKLMJtH5dhpi8hE4snu4MRrF5lAUaPH0zQiYinUoyGkAxbMP14JFMkCtgQjIAntqiuOH2HnlF jNAyxdg1XhYRVF6uragysumbTWagkbna0wJ/vN1fLtYdXMyeKcW1V6Bs/KQhRyeRdY2rDwAPM aYpojh3cTNjQCBu/HB5T6Mnfdw/A+meX3VzONkrv/S0GOsyVBGSFbfVRsLUuRb2mRefkFnF1X aZuIZEQtUt80jFG5THjDHFa3J2Bhsr++/BjnvTD/Cm2YynX+QXZA7eKBSF+8U5/Dtp+Gkve3A 01SByvA0ifJ3V4= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190717_125058_080498_DC3C6883 X-CRM114-Status: GOOD ( 12.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren 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 BCM7211 pinconf doesn't look correct and behaves differently to BCM2835. So fix this accordingly. Signed-off-by: Stefan Wahren --- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c index 35d9f95..029adad 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -999,12 +999,10 @@ static int bcm7211_pinconf_set(struct pinctrl_dev *pctldev, for (i = 0; i < num_configs; i++) { param = pinconf_to_config_param(configs[i]); - if (param != BCM2835_PINCONF_PARAM_PULL) - return -EINVAL; arg = pinconf_to_config_argument(configs[i]); /* convert to 7211 value */ - switch (arg) { + switch (param) { case PIN_CONFIG_BIAS_DISABLE: arg = BCM7211_PINCONFIG_PULL_NONE; break; @@ -1014,6 +1012,8 @@ static int bcm7211_pinconf_set(struct pinctrl_dev *pctldev, case PIN_CONFIG_BIAS_PULL_UP: arg = BCM7211_PINCONFIG_PULL_UP; break; + default: + return -ENOTSUPP; } off = PUD_7211_REG_OFFSET(pin); @@ -1031,6 +1031,7 @@ static int bcm7211_pinconf_set(struct pinctrl_dev *pctldev, } static const struct pinconf_ops bcm7211_pinconf_ops = { + .is_generic = true, .pin_config_get = bcm2835_pinconf_get, .pin_config_set = bcm7211_pinconf_set, }; From patchwork Wed Jul 17 19:50:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11048197 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 69805138B for ; Wed, 17 Jul 2019 19:51:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52FD32267B for ; Wed, 17 Jul 2019 19:51:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 412FE2879D; Wed, 17 Jul 2019 19:51:52 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 C7DEA271E6 for ; Wed, 17 Jul 2019 19:51:51 +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=c8EaMCvYvwPAGREuWS4/6G/WLymSLNE5orDls62EZ3c=; b=egTJrJnutspQrpONm21v8p4HHM /jATcwFnTCDelkXgCegME7XOJL303fyBFWmZmUJsmIlqhMTbH7BzyopL/v/hleVaQXuI+IwIL+msj W1msriZm79ZuLHqdX3TccNKZ8d924XgvHQdjYhS60lOsKVPjTZhpnmlqQnTnSDjT1/DcvafdVIv9v nFHDMuwrneJ5LUc4vupn7bK2dUe9N1n9RC0FETO2Bo2LTlDHIzy80q0lXXWxRlw03jpU6P0O6sk2t RZmWVPB/VSWbgte2GrZvlix2ZkjJjSv7k5HM/oW4c8JSHBOa2WIDyk9GMheM4MNazzst/7BqLMbcM Oz5YG7rg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hnpxu-0003TA-FM; Wed, 17 Jul 2019 19:51:50 +0000 Received: from mout.gmx.net ([212.227.17.20]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hnpx3-0002tU-7B; Wed, 17 Jul 2019 19:51:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563393047; bh=TctOuDTMF2+mTkyAAYxQiJpzWSxmzO7gifGGf/XX1Q0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=gWiw+9dnz7FLf0EG/+I69QvoKRreNyQhm+22sy3ZkrZm3do0oQT2q9ryxX/5g84OA M/rwQAo0jJ8mHTNRJ3mBDHnS+elh4asiq/bFNoJyWSS33sb3LKWr5O2EdL3h3h8Rqw Acowz8oKwwmzBdhLcCQwakhfpiLk0wCIwvP097NI= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.103]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0M7CRe-1ihQw50cgI-00x2i1; Wed, 17 Jul 2019 21:50:47 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter , Mark Brown Subject: [PATCH RFC 12/18] dt-bindings: pinctrl: bcm2835: Add brcm, bcm2838 compatible Date: Wed, 17 Jul 2019 21:50:20 +0200 Message-Id: <1563393026-17118-13-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> References: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:87Ew/UJtWXs2QXR91bCBFqHCtMnLslfvTGx0KTFgyUdg135m0/c ut5pTxI1URukaSdaowrBdos5TzvcM4Zr7PCZBMgRUk56rBmXptyk5k9uhT/A/JFP4pdsoJi vipXTnrTROxCq4lznmxb8pxy1EzNHwmscJjeGKHZS2fs/7LH44yNATm1BMN602VX+xkz7qA ZuF3TP6jXjsGJO4auiSPQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:GXSscg8RGqY=:hpwIUehAdXwVH/35BucHtV 8ye1FO5m9O/4KO0U5tNWO8XxUEzYdJ3A7k5O9KqH60oIzIY+nzYi0y1NLE6Z2vtwyfDv5UTQT 4mbNP8Nxpqp6Cwl8pXXGnEPskXuz/1aHf3jGN1V7Ov5k7jZzoOZY1vKp7/AP9ig7M1YcQLrv3 poZgRpklJqG3q5UVw02YHhjv25gBKpcJisFVNHqjjf6CvKAb9OlGLkP9uTKuqoED9oeBQHSpW WykxukO2dzf54v4RFY1pghLqufE16fdyVWUb+BZQkNE3XObfuAliqdjYwdBM8YtIaacgIbfa4 EDCREuxgOlYAIojNB2ZvaSZr8Mdi8BJ9vMHIFR59eNid2Lr6BnN6vduYlGx/R02SGUC9+BWxt pJIAKhM++HH+Hp4JUuA8ZlzN4UvjA7G+1MDgWHaI7O2i+1fbGP0CY522GrdAyvXTNxM8xzIe2 RqhYRMLxZmtxdrm8/PLdmZVZp5R9/J8YOEkpa/jNdIxWakpr9Vx8bE7fMp3SsT1HrZOKw1x6f +Ewun1yFxxbJ1HPX2ak4e0TjG7qA4vIYOWqbMAIQhCsb30VrpK/ydjBZ6lcvji9r1S4GuB6GA 1f0Z6wpItlbSsNx5bzv4wLHSyECuWflmuGtn6J7rlBdXFsGsALeNjeLfs8hxAp7ilUksvhuZa +yMHomGr9nT9UeDiYk1wdBi6SXZI6yp+M+M4FJpvuDuptWL4Uf39cZ5ogooJRw4tD5AVqRLDZ ptQCEYNkWxZ0Z7OKM5irkFyw5FR2ey4sde0HyG7+ytmZRw80CMkN9uRLo02k15HmQDlTTS+Gt 4cPptUyh1OafXfugx3bpRY8pU0oc5+dirMGzUAOHoacDaSAbsFPe5XwTCJ3kwOxRBn5gY3Do/ GkWCpl4/vxRlpmsW3L5t1YXVq7g4fxKiN0SDiGWJAPcRq5XdFhWm57jL4L/F7Q1eaHc49gKcK RaeIq6gBEsyzlmX19gVpuEO0KfKNn2uuYuWu12QbaF5lT8I6eCiAa/Xw3+4LKSvwSUZtgIhvg J4+dY2/jZgRKQlX8qJD+dhMmgNr1i16/ZYGI5qkZC7y306cIgZBVTtZetS8/Yxl5xG0kxmBYH w0zepiH7Ytb4vo= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190717_125057_559924_8114ED99 X-CRM114-Status: GOOD ( 11.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren 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 Add a new compatible for the BCM2838. Signed-off-by: Stefan Wahren --- Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt | 1 + 1 file changed, 1 insertion(+) -- 2.7.4 diff --git a/Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt b/Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt index ac6d614..f7835a6 100644 --- a/Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt +++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt @@ -7,6 +7,7 @@ Required properties: - compatible: "brcm,bcm2835-gpio" - compatible: should be one of: "brcm,bcm2835-gpio" - BCM2835 compatible pinctrl + "brcm,bcm2838-gpio" - BCM2838 compatible pinctrl "brcm,bcm7211-gpio" - BCM7211 compatible pinctrl - reg: Should contain the physical address of the GPIO module's registers. - gpio-controller: Marks the device node as a GPIO controller. From patchwork Wed Jul 17 19:50:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11048199 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E8F85138B for ; Wed, 17 Jul 2019 19:52:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D6A3A201BD for ; Wed, 17 Jul 2019 19:52:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CAC882879D; Wed, 17 Jul 2019 19:52:10 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 844E6201BD for ; Wed, 17 Jul 2019 19:52:10 +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=NoeflS4l97YHM3ujyl/JXCoPpV7VdbznRdFuqZMg8J4=; b=FiuTUOoBdfaWoA5Yykr+ycfmZn 4SlAMorw7YE7gF0DFHYrnl4/yD+XkhYsb7EVdlkUbHGCqvtlbYNqKylaoHXQ1yD3r077QspFCtyYf MGqSVAYD48JK7O/8HDXaJB2M4MMdsmA8L2ZQFsh5Sx68c9PHHOVmGB05MO5DoAoXMEOpFvJz38tLU 8d0UI9ttE19PLhMQ75Lel2a3hn3M72wpKahqacF5ljIUwe1YByYOjiKYGrCZZYOmkPR+8wfdYVYJr MZaypG+UbipsSl6fmcsT2uiKE/GoLzbkt08Xw3EBF4w+srNP3Omt45KpKC0w3QNUUF9GdYColNcTq V9C3ulzQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hnpyD-0003ho-DK; Wed, 17 Jul 2019 19:52:09 +0000 Received: from mout.gmx.net ([212.227.17.20]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hnpx3-0002tT-1y; Wed, 17 Jul 2019 19:51:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1563393048; bh=TaaSa9UWk3OInfMHWpymHM26JHDzB6QlKTbtkv8UQ6g=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=H4qntAtc2g9NKtHwJyBLLU7y4/TuDyLFN3cyppNzXbUt9NrTnRdDT2/vJjC7GoqYO b2Z6Amp2Awx+dhLaXEvOPJWjxCLWE8KHK7bvIKg9yqFLziPbn8E4LjrQ4ekhjWWCB4 Xsqy2cg1wXLXiXxcbYznnRJOo4C5ev7Um/euKM34= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.103]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LabZr-1iACkK3FIl-00mLJo; Wed, 17 Jul 2019 21:50:47 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Rob Herring , Mark Rutland , Linus Walleij , Michael Turquette , Stephen Boyd , Ulf Hansson , Adrian Hunter , Mark Brown Subject: [PATCH RFC 13/18] pinctrl: bcm2835: Add BCM2838 support Date: Wed, 17 Jul 2019 21:50:21 +0200 Message-Id: <1563393026-17118-14-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> References: <1563393026-17118-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:ibrv61wzbRpwS4rfeadIqPkOf6Z0fPI+HM0R4/oQmC8nowECHKg gqqxlk9zhwPTEepOfYQdwd1G16ZdhrjsbBn+CKjRERZBqxp1o9Kvgb1WFGbfA+SjgumUWdU 1vGJ/aOVomqxQZl01V5yLoggD2FWFROL6ttC+X+hTwOKyGcqUjm1njXDD2MtyEq0fc53cpi dv3GBdTB48Q0Z1sG2oc2Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:KLHBeHRKL6Q=:pBQIs2tT+rkNqc43PSOX+s QxdYnRLqpJ864Clz+ITIxxUUFTLwjfagvaQi6T8YNbR5Jrnb/tlsTQxiD9cyok3CRmh6Ahp/4 zol7e37NErvs/OGi4Sk0c0lMNpBeKsNtOeC3b3WB153h2meHW15XaoNS+QdQvzZgTw+eNIYul TVo2Uls6a/Qmno3gnIW5UioyNXrK8vL4372Vk8OM6G4+bw+ysaHXvt9ZSIO+TziouOQLgaKg/ k4b7bIxkrUxzsBds/8obnuRgg0aJIlYgGVyzlYDfCgVHPMXFQ2eRGTiLAlideYh9csjudkpX0 MH+8g01AZmPJNEuCBe0VIDoOnrEIX//IuPB970ZeJrpJ6NAqT008zmQjlbWB0mraRFIKolVze +r5vRZbVOd+6qe1HI+2pzHVsFUa8HIxGkxbUBbqk/U22li5XvJ77ZsqcwjekFc6VtcfLIAr98 hFGs8GSaACG4kikwU7852LDDLqR0rofAP3FgHsTwCKYCIBl6YGjXl5D17qdsxPpSoi/+HAPDE 8ldFS/Gz518+e7q84GFGgsjD2RiKTAwgQAA3I1d1YPthiNYiSUdENTmrVbM4d0VIdX7miBzSZ Kg222dHsnKsipaRB8gX6/3YeB3Ae9QIWRYANk59j8S1ucll1jV5WtikDHohrUAreG1uwlBx4H /gpT4HAe+yssxWAiVZmHaPNNawvmuZBjdk3Qp8mmwSkJMRCl7zJf2lp2yyLEXYL7Xt9SeptJC yRj0s5sHY5D6gF2aIIEBQ9cgQqIMxgIuzk667D/C/lvwlzcNLosJOyNszGsDVHfrhWDCQm7gH 1sa67xgUKLvxi+YPEiX34KDpgYevE+dAtya7/+mqeZ+obyhInHtsAugAUrsk+pQmKboosdu1S +Ta1Uc+Q4C7ayJJgG2rih93Egc49V8/1j67UnM3udmGqBSpP/EEUENJG6G4k24kkH2Zx3xpZq v/auVppP5Y7jFoO1GG1BOpsQbSazzMs+oDeT2WaaOEoyO7EhkHejPWoJZXMsGqKyEdtcFgqTZ HZLBi9GaZPIAQxpXDZs4arTkNqAY4sYmHdoed1D46/Ilhqk2jonnLZ1PbSCbU+G0i60Dhl2za 4A+IvHEqsyfnOI= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190717_125057_405816_8142E9A5 X-CRM114-Status: GOOD ( 11.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren 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 pinctrl on the BCM2711 is not backward compatible to the BCM2835. So use the compatible ops of the BCM7211. Signed-off-by: Stefan Wahren --- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.7.4 diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c index 029adad..7f7cc5c 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -1057,6 +1057,10 @@ static const struct of_device_id bcm2835_pinctrl_match[] = { .data = &bcm2835_pinconf_ops, }, { + .compatible = "brcm,bcm2838-gpio", + .data = &bcm7211_pinconf_ops, + }, + { .compatible = "brcm,bcm7211-gpio", .data = &bcm7211_pinconf_ops, },