From patchwork Sun Feb 13 22:56:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12744720 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 31079C433EF for ; Sun, 13 Feb 2022 22:59:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=KivHI06XX57+UULpwJNk64w8obki8Bxz3/qQigoLM/s=; b=sZQ+GGlUqyxRX5 xAL1qEiyJkCpvqxrbNO8MZzJKdawjE73j9XtxatQWFH4Ki4yKasmvGAVP7AsA0u2yammaF2gvflK9 NfgNElTxedpLIlCePz02qkcmeVfhn/cVSuIQqQGXCCgfdwErFdsycc19C3f64GMe8Ii+p3es/Zh7+ GbHIK293cmffWhvlOWY7MENyL9VUcPP5L9lRZd1VYzcHbxq9293brIPxU+xLVvRwE6Z97UxDxJbBy +eqqRxCoMSrTCx1QY5rXNvoMCO4VK42dH5DUKlHCBAfSXayRDJ9TPIACqxNkg/nPNlpdgOhEqL5MP +6IAsnh/s45KWvK1dLHg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNp0-00CiFK-4p; Sun, 13 Feb 2022 22:58:22 +0000 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNoh-00Ci1y-5e; Sun, 13 Feb 2022 22:58:05 +0000 Received: by mail-ej1-x631.google.com with SMTP id jg20so8969145ejc.3; Sun, 13 Feb 2022 14:58:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LF5Yow0Ccl8RgBBOinnLuOBxgoILjhOpIvfzjfH/604=; b=GRO4wMzzwXGPITRWpic+Ht2UCSRtv6Ny9KkdGyPkkdupIYY05Wslqkz8Tr3erWYjgg 2uVMKdLBF1yQhyintnTYyoDddDMZ0OiU1C2zojAGkSxGnPFq714zZIiTd5N/QTHUFF6N N0Y+dLf+SRPXX2G8qhAqhMYLgxR3ckz8/RZd+ZuMdBuZm7LLyBlVvsVzKxC26KpgEFEA GdyLKfDKOyGa3xXja7PnKrkJad4+F0/dmHLgD4PU9lsCfr0jVCOArOD9a3oOULFKyGK0 VJdBJSj4HLGAgga3La2tDSkMRT8JCQ+QY3AfkEkOyzhcNN1r1A3edLxtC5J41YB+j1Mw sxew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LF5Yow0Ccl8RgBBOinnLuOBxgoILjhOpIvfzjfH/604=; b=Js0ktmuKTZxFJAF/2Jk+lZYtjXoioDT4Eyb8Ga1FMSmi0ShY5Ae+LQ9zd6GPay9CrA 3VO4xnB5Yc89KWYIjhXHWD5gYaK7sL1ThtiHnTioZxGFPQ7T2ERkYeG0VnIo5POksn6j JXfbtkMQ6iny50bHodgrsdjGQBY+slEs02c72qZBeTyrMM5yEqgMGhjXfwGJ5/6WE4KZ 3vpvpfOy9S6UT6H895fqe/XB71Uz2yTpLFepJZhBD2pWvKyUcZrn+1qROJrMH2Gq3bqL QvN79RvKBwQ0aQuCp9zFqt2opFfQ8FkrO2Xy6W/T3vJgMhwAH8BiifBiT9+mxHcMP2bg 1UyA== X-Gm-Message-State: AOAM532HXbg7zm3KNSkfgScLm3r9zQ/4o5qKHthLVcEOXVnn+AcJ6rUB yOvP/NIXyQbjzlP0wGscLIU= X-Google-Smtp-Source: ABdhPJxDvaOfSJui8QQ/lfbUiMtSdBFKWNk7yQ/BA5q86+hue0LFJLAl0b/OY3Qm6Bjzn6OHkWQa4w== X-Received: by 2002:a17:906:779b:: with SMTP id s27mr781833ejm.389.1644793079968; Sun, 13 Feb 2022 14:57:59 -0800 (PST) Received: from morpheus.home.roving-it.com (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id g14sm3189163edb.55.2022.02.13.14.57.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Feb 2022 14:57:59 -0800 (PST) From: Peter Robinson To: Nicolas Saenz Julienne , Rob Herring , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Lee Jones , Emma Anholt , David Airlie , Daniel Vetter , Russell King , Arnd Bergmann , Catalin Marinas , Will Deacon Cc: Nicolas Saenz Julienne , Rob Herring , Peter Robinson Subject: [PATCH v4 01/15] dt-bindings: soc: bcm: bcm2835-pm: Convert bindings to DT schema Date: Sun, 13 Feb 2022 22:56:33 +0000 Message-Id: <20220213225646.67761-2-pbrobinson@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220213225646.67761-1-pbrobinson@gmail.com> References: <20220213225646.67761-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220213_145803_246210_A194F28F X-CRM114-Status: GOOD ( 16.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Nicolas Saenz Julienne This converts the brcm,bcm2835-pm bindings from text to proper schema. Signed-off-by: Nicolas Saenz Julienne Reviewed-by: Rob Herring Signed-off-by: Peter Robinson --- .../bindings/soc/bcm/brcm,bcm2835-pm.txt | 46 ----------- .../bindings/soc/bcm/brcm,bcm2835-pm.yaml | 79 +++++++++++++++++++ 2 files changed, 79 insertions(+), 46 deletions(-) delete mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt create mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt deleted file mode 100644 index 72ff033565e5..000000000000 --- a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt +++ /dev/null @@ -1,46 +0,0 @@ -BCM2835 PM (Power domains, watchdog) - -The PM block controls power domains and some reset lines, and includes -a watchdog timer. This binding supersedes the brcm,bcm2835-pm-wdt -binding which covered some of PM's register range and functionality. - -Required properties: - -- compatible: Should be "brcm,bcm2835-pm" -- reg: Specifies base physical address and size of the two - register ranges ("PM" and "ASYNC_BRIDGE" in that - order) -- clocks: a) v3d: The V3D clock from CPRMAN - b) peri_image: The PERI_IMAGE clock from CPRMAN - c) h264: The H264 clock from CPRMAN - d) isp: The ISP clock from CPRMAN -- #reset-cells: Should be 1. This property follows the reset controller - bindings[1]. -- #power-domain-cells: Should be 1. This property follows the power domain - bindings[2]. - -Optional properties: - -- timeout-sec: Contains the watchdog timeout in seconds -- system-power-controller: Whether the watchdog is controlling the - system power. This node follows the power controller bindings[3]. - -[1] Documentation/devicetree/bindings/reset/reset.txt -[2] Documentation/devicetree/bindings/power/power-domain.yaml -[3] Documentation/devicetree/bindings/power/power-controller.txt - -Example: - -pm { - 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; -}; diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml new file mode 100644 index 000000000000..47b9c266ddd1 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml @@ -0,0 +1,79 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/soc/bcm/brcm,bcm2835-pm.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: BCM2835 PM (Power domains, watchdog) + +description: | + The PM block controls power domains and some reset lines, and includes a + watchdog timer. + +maintainers: + - Nicolas Saenz Julienne + +allOf: + - $ref: ../../watchdog/watchdog.yaml# + +properties: + compatible: + items: + - const: brcm,bcm2835-pm + - const: brcm,bcm2835-pm-wdt + + reg: + minItems: 1 + maxItems: 2 + items: + - description: PM registers + - description: ASB registers + + "#power-domain-cells": + const: 1 + + "#reset-cells": + const: 1 + + clocks: + minItems: 4 + maxItems: 4 + + clock-names: + items: + - const: v3d + - const: peri_image + - const: h264 + - const: isp + + system-power-controller: + type: boolean + + timeout-sec: true + +required: + - compatible + - reg + - "#power-domain-cells" + - "#reset-cells" + - clocks + +additionalProperties: false + +examples: + - | + #include + + 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; + }; From patchwork Sun Feb 13 22:56:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12744719 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C365AC433EF for ; Sun, 13 Feb 2022 22:59:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=u/d4PlHIrvrw4ColG82wlBd6yweTNlZcvzqIpCa/K94=; b=2JEG/XfWgV+jgb U0OrCm8dU3oJG/cP58hnV3vuCfdQmHsSurT75Jh/0gY6kNkIzXNzZprASvwvoxyRSeTOyQLgcmc+G baUIivoQ69hynn8mlXNc0K9CUjASvBS8wOE84IGp7gvT3p5cici+8j0VMnckYpoaNNH4iOjnb5d0+ Qoo/ktOIjIJeVPmLtayRgYqlVOj2fV8QuFl/CpQ1Ag0LxkEt/JtNfJk3sPfnhgsH+TebSjPZKUEBQ YnN5x3blVaTAFmy+YET8r6FO+RIZpUGgz90Csfs3GOzEu1tkCYW/BSWuaP2VZGAGvTJAsre8O+fkr O4u9ERLgU+Gmp9blFodQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNol-00Ci5j-EE; Sun, 13 Feb 2022 22:58:07 +0000 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNoh-00Ci24-5o; Sun, 13 Feb 2022 22:58:04 +0000 Received: by mail-ed1-x52d.google.com with SMTP id z21so3341987edb.13; Sun, 13 Feb 2022 14:58:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3uzOnnLhVcdnTuyj/2DMEBER7KnFzL1h0mXNQZHRgW0=; b=HDoLAoBfLlRT7YczCOt6CY1ionKPeAwbypEAeacRC0xmOkGAKX/rwSI/T7BcgXzwgf clMB02+DUuz7sa7nA9VAdKsDDH7MoOz8xYmhOuqqklxZ0q5yFavkAcs7t2Au9cfSNmgd k8IFgjbmXMDBJ1PYwfBOBdZ3y6slRHRbvz+i6bKN541HbqhinQwv4jzqfn7OwN69X+4d au4+67k7hAi9NEfrOfXd2dAtmNT0cbx1wglt9AP1S3aDI6OVwnmQ+IH8+5apjNNZbK/m 0OB+8BwRV6VNCCllzdlzatWyslJVg+DB+h2eIzn6Vh4O6LQzdZMHREHD1aAqiHEzHaiM ZivA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3uzOnnLhVcdnTuyj/2DMEBER7KnFzL1h0mXNQZHRgW0=; b=MZRYGXA02z+ajcyqgJbD8mfD8oGfRLo+vEX+FNCiz4Yqt+CDbh6m47obuA2POxSDhl 0xrSIQkeqnEPjWOGtY/4xFxL4PXTHvnWqDYkuk8rExUHwOl905iHYU2HjgV5JdevF9uP ykI0c5AJv5BEIE6d7TvSnxTqfbpcIffz09E/mdcO5TUpNQ/+i0QydMxFoRzYz51kUQr6 i8P1+n55dBFF06SIn2Nl3+xSSSDoVc+2EZTew/sKHYwqU3VbdAa+QG89l9T9d0tEa7KM otxGinwMURmH3NgnhBKBYQ3kygIzCHW3YV8fYCMu61vXoYn1z1skE/BEATA4rzwNSLsS sbFg== X-Gm-Message-State: AOAM530tIMU41kX8pJMzrhWqOqjcpjfudtJXmqqz0yKc+pRjMhhwqIdw FFnQqU0NdAAL9svj9uSwra4= X-Google-Smtp-Source: ABdhPJyh0vSOPAU0NEPPag9pX3XD3oR9kbSq9lbr0COBYWtIYEe3wfwH04lujKX64zFx4TUMn5XGRg== X-Received: by 2002:a05:6402:35c9:: with SMTP id z9mr322732edc.262.1644793081256; Sun, 13 Feb 2022 14:58:01 -0800 (PST) Received: from morpheus.home.roving-it.com (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id g14sm3189163edb.55.2022.02.13.14.58.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Feb 2022 14:58:00 -0800 (PST) From: Peter Robinson To: Nicolas Saenz Julienne , Rob Herring , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Lee Jones , Emma Anholt , David Airlie , Daniel Vetter , Russell King , Arnd Bergmann , Catalin Marinas , Will Deacon Cc: Nicolas Saenz Julienne , Rob Herring , Peter Robinson Subject: [PATCH v4 02/15] dt-bindings: soc: bcm: bcm2835-pm: Introduce reg-names Date: Sun, 13 Feb 2022 22:56:34 +0000 Message-Id: <20220213225646.67761-3-pbrobinson@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220213225646.67761-1-pbrobinson@gmail.com> References: <20220213225646.67761-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220213_145803_246603_770AA4D4 X-CRM114-Status: GOOD ( 11.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Nicolas Saenz Julienne Anticipating the introduction of BCM2711, of which we'll need to support its new RPiVid ASB, introduce reg-names into bcm2835-pm's binding. This will help to have a consistent mapping between resources and their meaning. Signed-off-by: Nicolas Saenz Julienne Reviewed-by: Rob Herring Signed-off-by: Peter Robinson --- .../devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml index 47b9c266ddd1..837963e9f219 100644 --- a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml +++ b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml @@ -25,9 +25,13 @@ properties: reg: minItems: 1 maxItems: 2 + + reg-names: + minItems: 1 + maxItems: 2 items: - - description: PM registers - - description: ASB registers + - const: pm + - const: asb "#power-domain-cells": const: 1 @@ -70,6 +74,7 @@ examples: #reset-cells = <1>; reg = <0x7e100000 0x114>, <0x7e00a000 0x24>; + reg-names = "pm", "asb"; clocks = <&clocks BCM2835_CLOCK_V3D>, <&clocks BCM2835_CLOCK_PERI_IMAGE>, <&clocks BCM2835_CLOCK_H264>, From patchwork Sun Feb 13 22:56:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12744723 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 79A86C433F5 for ; Sun, 13 Feb 2022 23:00:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=psWsJpdGfdUNH36SCTQYo+OrWqoe/F9KqKh4kFN+3i4=; b=n6ihzThGmbrRto e1RsVueqS7l0p5p1yX+0YsjqtzXHC/I4rKNLw7dzMFTzqyrSOmUX7+0EtKxUHPVymaNf/b5wy32vs KmZHnMa0iq7GTm/yedxFymi/OdBx02hba8/nfRJI1CcUN9gvxSqGDpz+o7rDyhxIARsOJGoz3d3L3 ttRaatLP3sKte8H/hnAyjdg+39ro2Djbq4C1I220qqCzUrFO5Pcc2DEYR2UKeC/6hvNPsgxBXkiVi wQSISYZ+OtdDAIgdQEWxvbhYDBhcebmlcId6yadl8XPoI++0Eu4iFLtmpQCM+j7cd4wGYlDzA6pn5 guqO6c0Oyi3gaR/zrfdQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNpf-00CiUN-2g; Sun, 13 Feb 2022 22:59:03 +0000 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNoj-00Ci2A-NP; Sun, 13 Feb 2022 22:58:07 +0000 Received: by mail-ed1-x529.google.com with SMTP id z13so6303780edc.12; Sun, 13 Feb 2022 14:58:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jkh/ZThBVxR3iCrqSQ641kQC+DxWzCqRmSFjFdd592M=; b=KLPTt8yhHW7LK5Bz9+nth65FJde0niGbdiuZgNTkesIzbg9w/2D6Xio4Zvj+1yvlzP pr2UMTgNr4VzC7XtfhGBrQMtP8Wl+WXscQwZlqAbexPpgUREs2jHP0smWqz9KBonBTc7 lf0y2t2vK1dbS0GPw7Hpqzt2LWPv6e++Mnoa0CGpL2K9P2RnJLVUGSL40XDG01Ykfbbw CIx2XV46XjobKeg+Tx82fFiFw5uyGBeWXY5P2HsuIpOwA5ToiWqznC6ucaYU6gNdsLEG 2VB9RhuyHAmH7SvD1nWNmd5t4W8wlAyRMwpQUZ6nSkTtEZKLJsE9EbgFClQLKpikwePE N7oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jkh/ZThBVxR3iCrqSQ641kQC+DxWzCqRmSFjFdd592M=; b=tplk5s4U6C8lb2cK4KgH4o2Ry6izBpE7vPwBk+dP39UzkF0sM4JecGsXhshtMf6H/q UblcXvWpz+vUM1id0WxQAJ60F7K0fXZiF/DwRGNqnx181UFwZZOsegi5Rd/WRUq+Ru6N ZcWL14CQjMoZ3iohlZ+/XoFOkwSy5MRD3sI1ZA1MK6MdPWYX55fVEOhLOM4VLscXFSEJ m91lj51T6imA9OiQrgjREXTIEkLBXxUxhHGZ+z2XGG/YzkwAYdqiWBZN8c+W5Is6E0ba TRFHrm5aT43GOp7Pq4TUrF5lZSVu3n4IjQ/UiN+NJZBvtF/R9AZxJTMFudkTBTKfoImY P9nQ== X-Gm-Message-State: AOAM531vEB04n3JK/8gxyf0ITk49U5JR2az6m4Ifg7Wo3Lp62FXfQh7b 4lm5z+wnSK+6S3vXrgz5kjs= X-Google-Smtp-Source: ABdhPJwD3CmtM9qOTOKVh2wft4puLi9UOAVBT0IZACYp8gl4G7AUK2brppfMcwdW4SJS2IYJp/qV9A== X-Received: by 2002:aa7:c3cb:: with SMTP id l11mr4703839edr.427.1644793082291; Sun, 13 Feb 2022 14:58:02 -0800 (PST) Received: from morpheus.home.roving-it.com (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id g14sm3189163edb.55.2022.02.13.14.58.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Feb 2022 14:58:01 -0800 (PST) From: Peter Robinson To: Nicolas Saenz Julienne , Rob Herring , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Lee Jones , Emma Anholt , David Airlie , Daniel Vetter , Russell King , Arnd Bergmann , Catalin Marinas , Will Deacon Cc: Nicolas Saenz Julienne , Rob Herring , Peter Robinson Subject: [PATCH v4 03/15] dt-bindings: soc: bcm: bcm2835-pm: Add support for bcm2711 Date: Sun, 13 Feb 2022 22:56:35 +0000 Message-Id: <20220213225646.67761-4-pbrobinson@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220213225646.67761-1-pbrobinson@gmail.com> References: <20220213225646.67761-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220213_145805_798014_A51E3F0A X-CRM114-Status: GOOD ( 11.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Nicolas Saenz Julienne Add a new compatible string for BCM2711 and the option to provide a third reg property for the board's new RPiVid ASB. In BCM2711 the new RPiVid ASB took over V3D, which is our only consumer of this driver so far. The old ASB is still be present with ISP and H264 bits but no V3D. Signed-off-by: Nicolas Saenz Julienne Reviewed-by: Rob Herring Signed-off-by: Peter Robinson --- Changes since v2: - Correct names s/argon/rpivid/ .../devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml index 837963e9f219..0dd264f80fb3 100644 --- a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml +++ b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml @@ -19,19 +19,22 @@ allOf: properties: compatible: items: - - const: brcm,bcm2835-pm + - enum: + - brcm,bcm2835-pm + - brcm,bcm2711-pm - const: brcm,bcm2835-pm-wdt reg: minItems: 1 - maxItems: 2 + maxItems: 3 reg-names: minItems: 1 - maxItems: 2 + maxItems: 3 items: - const: pm - const: asb + - const: rpivid_asb "#power-domain-cells": const: 1 @@ -74,7 +77,7 @@ examples: #reset-cells = <1>; reg = <0x7e100000 0x114>, <0x7e00a000 0x24>; - reg-names = "pm", "asb"; + reg-names = "pm", "asb", "rpivid_asb"; clocks = <&clocks BCM2835_CLOCK_V3D>, <&clocks BCM2835_CLOCK_PERI_IMAGE>, <&clocks BCM2835_CLOCK_H264>, From patchwork Sun Feb 13 22:56:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12744722 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 495D1C433EF for ; Sun, 13 Feb 2022 23:00:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=dYeGz53TA0U6TqJX/OiVZRGr5IWMS87aOC5xgqTj5V4=; b=ywvqxmFP2zhnk2 W5g15oAoH4FaTA6UbKw6Y0ZQQwmUuD62J4An3pwdW9cb+2m1icDvy6kGnRSyeo4U/RpPAQycxuTC7 FP8kMY687kEKjtkFXESaa9muJs8afWjBrMp7B7u0Cj0G2eUplANo0wlvBMK8n6pUaxB0Ywn75Z7oi mrt3g5dUaUh8402AdqHifRFKIh1QkcNLjgFPwtK3z9omQo9cGodfsDIlu7fuFp/3vBxGvDQv3ioHb WvjkittdyJYTtUsf8hTprGZsy1Jwg/otQj0Q7irzh7sXQfaGndbE73dM9lIM6n4Rd/j29QXEZq9UZ /fKy7VBYkIPrusRVs5Bw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNpP-00CiNp-0N; Sun, 13 Feb 2022 22:58:47 +0000 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNoj-00Ci2o-UA; Sun, 13 Feb 2022 22:58:07 +0000 Received: by mail-ed1-x52c.google.com with SMTP id u18so24546556edt.6; Sun, 13 Feb 2022 14:58:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ho+AJyfUs2ysXgAUMwBRYPkfVfqL9SW0bkmswW8ndZ8=; b=grAOz/ubmR4hw8v/W3sXnNe3HYLPeXGgB3X6Zxb/KVAaJwDombdv/wvJt/rfkRsgv5 nhjR36Jq2bqW6qQnIi0vbWI3gUlJsOEd0D5bkkAu85FaUcEy9lWDLr5540ifjehV3vK7 0DPdqFLflJY0Kn8AZ8maUeBTFUe49Ev+anlgRygJ8u2QVr0fXXoOBNNZzj2MKGU2Xq2o eFHMgloz8i63MCoGLUTjKZdY1DxMe5I2HvfcBu943xOaDkAonyt0QW8lYMVT7x0cb5iw tao16BwPXmdlvqsb/xXR9+TkHPYqKzLHwj9wGT6FnPF5mykX7ubS4M5A/F/JqmFNOAu8 uF0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ho+AJyfUs2ysXgAUMwBRYPkfVfqL9SW0bkmswW8ndZ8=; b=6EcqpRPvTNMA8wheNqe/5DofFln6OdNDJr+DAn5p3vPF0Yx0Mu6EA8QKdqyZT3PWEC FJ0Fhw2EyQh1VtivokPKDlYi0H+JUN99byjFYCTS0OXOJHvhP/fdIvt85O5oG2GE4JCU /7xxM4CkzHsJFoDIu5vchyG/ZA1yHk2kHxOfeo1rUyk4DfH3qhPKFdD6XPRtwT1Or0yX k3YpJxqobGlYc3tiv7KDwKP39DPz40AxDsIGIto7L/3Mxm2TQF5Pa85zfSlmVaUYoXvG X4sQqQi/WVgr+k1loTdLXh3Ru+qc8DBIIWNUb3yAzQJu5MsyAveB5xPaKoMG2KJvVpbY XrAQ== X-Gm-Message-State: AOAM533dDA/2K6O+OLrkjD+pz1EoWVuGncAzfADYtdSpkChXjgr+WJ05 g7CNBuHmG7QGftsU97vk2Ms= X-Google-Smtp-Source: ABdhPJys+vngxbmlzUjD/f2kkNzlDACXA/vcUUBP7eLLHdDmp3/wk7atJsgDHhh3LNnlwfkC6jaz/A== X-Received: by 2002:a05:6402:3687:: with SMTP id ej7mr12770891edb.335.1644793083382; Sun, 13 Feb 2022 14:58:03 -0800 (PST) Received: from morpheus.home.roving-it.com (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id g14sm3189163edb.55.2022.02.13.14.58.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Feb 2022 14:58:02 -0800 (PST) From: Peter Robinson To: Nicolas Saenz Julienne , Rob Herring , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Lee Jones , Emma Anholt , David Airlie , Daniel Vetter , Russell King , Arnd Bergmann , Catalin Marinas , Will Deacon Cc: Nicolas Saenz Julienne , Peter Robinson Subject: [PATCH v4 04/15] ARM: dts: bcm2835/bcm2711: Introduce reg-names in watchdog node Date: Sun, 13 Feb 2022 22:56:36 +0000 Message-Id: <20220213225646.67761-5-pbrobinson@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220213225646.67761-1-pbrobinson@gmail.com> References: <20220213225646.67761-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220213_145806_014796_CFA21433 X-CRM114-Status: GOOD ( 11.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Nicolas Saenz Julienne bcm2835-pm's bindings now support explicitly setting 'reg-names,' so use them. Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Peter Robinson --- arch/arm/boot/dts/bcm2711.dtsi | 1 + arch/arm/boot/dts/bcm2835-common.dtsi | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi index dff18fc9a906..338fd91ec209 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -113,6 +113,7 @@ pm: watchdog@7e100000 { reg = <0x7e100000 0x114>, <0x7e00a000 0x24>, <0x7ec11000 0x20>; + reg-names = "pm", "asb", "rpivid_asb"; clocks = <&clocks BCM2835_CLOCK_V3D>, <&clocks BCM2835_CLOCK_PERI_IMAGE>, <&clocks BCM2835_CLOCK_H264>, diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi index c25e797b9060..a037d2bc5b11 100644 --- a/arch/arm/boot/dts/bcm2835-common.dtsi +++ b/arch/arm/boot/dts/bcm2835-common.dtsi @@ -62,6 +62,7 @@ pm: watchdog@7e100000 { #reset-cells = <1>; reg = <0x7e100000 0x114>, <0x7e00a000 0x24>; + reg-names = "pm", "asb"; clocks = <&clocks BCM2835_CLOCK_V3D>, <&clocks BCM2835_CLOCK_PERI_IMAGE>, <&clocks BCM2835_CLOCK_H264>, From patchwork Sun Feb 13 22:56:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12744721 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F0A55C433EF for ; Sun, 13 Feb 2022 22:59:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=lozC303zMLHo3kJVY/0hAWMC7AMntd3W2jHkKVaoxIQ=; b=TydbR4yv4X0pKi s5RaN8+s+7wKwXHYTSTOXeTcBznrm3+nJ+apansYvEbU5W++bexzXpf00K1VMeSznlsepaoizgjLV wFUH/FvzpgVCbN6uKOwX7ZMpb2GPgx2DsW6YASZc6rokuX0dx76drNugeiOi/gmZJXip07xhhCLbK u8sXi93py0yi9B/eObWSq6+Qb7mZvnwGW2gZFNnFPR+MEoLGYnF2MTrGyDnkkbmksaENQKcOZ5enm E/pboAqZGKmg3FPHbm4u2SNKvwwkfaa7WVrB38V2dY6GoPUTbGuR4kAJ5k2eZT/TRPM9AmykIUBE6 hP9QYdYAVJohMGs5uqtA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNpC-00CiK8-NS; Sun, 13 Feb 2022 22:58:34 +0000 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNoj-00Ci4B-Mz; Sun, 13 Feb 2022 22:58:07 +0000 Received: by mail-ej1-x633.google.com with SMTP id h8so7395107ejy.4; Sun, 13 Feb 2022 14:58:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mEM/mvQEL3zjEdFb22DMMHdYfLIwHBpNKdV0Ft1/aHI=; b=KJ2PfrdzA2hlEiS454+5HYcEmvdgnChEsYzsPj+mFjH9tsCDMONumeMapzYWcgTaN9 /xmjT42z2PLt9DWorIJLDZYg3e9kVTtKw9UppByjuURbjNWOT6G2GAZp5xKRHN3oqJ18 h0bnUKQ2Nk1ckDyu0r6WUTaJYltYlLv0aOT88P/RRT3TejTSGxUxbAjbFdM1COJvxMvx jogod+8y82x2GSbkZPLFLxCwIlPXkXle/d9xum+IR5an3UtihO/NOXPBBGADywVA4z9j 6tgRiNOkqLxxkRQh50++zZjscOsO5eKhw14COjFM/AFm6dtIvF7ziyrJAGLTHnze5weK 4AUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mEM/mvQEL3zjEdFb22DMMHdYfLIwHBpNKdV0Ft1/aHI=; b=eGeNKr2vQBqv5MNMPLdhbAYe33fPC64zjqTUqynZ/ASXP+sSR0MiSPOudoJI3LBZsT Fst7+tVySAgpSpWdfLVUsl2pH5C7si3GXZNBZION6lKe1fX0gzrhl0n6t0H6M8n5LcTo gTdriFNlvi8ygutFXj7TC31atebTDor9kxCBT0mKUKYL4YDxDUQuqbqWVqHGLte4VJPf FFOgv3UTlKeBKC0rZitlyPw0AtxPcVmuDiR/NoXFbjBeRYrMo+xlR7DL1zWw/gWfMlYn mEN9UXeZ3gTWhWJptytrxIqV2SPgDTW0l90GibU9RJy/unn/Elma37S864WtUPjIuwR8 uhwA== X-Gm-Message-State: AOAM532Fniyhyz+9cs4K/n2C0+QBdB03HS7JjWAVQnZRvNgwWcfoFC4d xU4Z9eNqGd//RH2NXbRyc9k= X-Google-Smtp-Source: ABdhPJwCgZztscaP4sLV3Dk4BcM1aLuuic7x/8LM7HHpdPWnRbFq1/EdtLx7GUpE+9RNfzh5gq2UwQ== X-Received: by 2002:a17:907:a42a:: with SMTP id sg42mr9454249ejc.723.1644793084435; Sun, 13 Feb 2022 14:58:04 -0800 (PST) Received: from morpheus.home.roving-it.com (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id g14sm3189163edb.55.2022.02.13.14.58.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Feb 2022 14:58:03 -0800 (PST) From: Peter Robinson To: Nicolas Saenz Julienne , Rob Herring , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Lee Jones , Emma Anholt , David Airlie , Daniel Vetter , Russell King , Arnd Bergmann , Catalin Marinas , Will Deacon Cc: Nicolas Saenz Julienne , Peter Robinson Subject: [PATCH v4 05/15] ARM: dts: bcm2711: Use proper compatible in PM/Watchdog node Date: Sun, 13 Feb 2022 22:56:37 +0000 Message-Id: <20220213225646.67761-6-pbrobinson@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220213225646.67761-1-pbrobinson@gmail.com> References: <20220213225646.67761-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220213_145805_788130_1BCBBF8F X-CRM114-Status: GOOD ( 13.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Nicolas Saenz Julienne A new compatible string was introduced specifically for BCM2711, so make use of it. Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Peter Robinson --- arch/arm/boot/dts/bcm2711.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi index 338fd91ec209..171fc5d2acef 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -107,7 +107,7 @@ dma: dma@7e007000 { }; pm: watchdog@7e100000 { - compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt"; + compatible = "brcm,bcm2711-pm", "brcm,bcm2835-pm-wdt"; #power-domain-cells = <1>; #reset-cells = <1>; reg = <0x7e100000 0x114>, From patchwork Sun Feb 13 22:56:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12744724 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 03C38C433F5 for ; Sun, 13 Feb 2022 23:00:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DLIk2iindFvlN12CZturW5L+Psj0B9Jh2oV6I3kgKTs=; b=QWJWbYnvYjTIbv 3ZWPhcX75ZQ79T/wWF+vKutjhGiOWXoWvCo0Kn20WxrYp49+wn4TedPFdG/+LNk7B7C7a/18Lbl9U sFv1MQ+bdlScOUynJ6HzMpwCwDP15NI8rFSUWqzDjW41n+ezcumVIf8zqXj3FZYtoPE7RkJclKRh5 +PM7idrgzjiscimh/jiwiLxdL74B5ZfTzaFwE+rFvncdfgaR23m3YzfH5jQdIMsrBPYWfWuk2tIyt y6Ueh3vZkXJFfU19uNvjWGQAUFqwdJ9GCon51BI+lJHK30uc3H1Cpd0PtPEvObbDyZMd1tJFv/AoE Xli/NnrIAa+Zd+hy/nhA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNps-00Cia0-9X; Sun, 13 Feb 2022 22:59:16 +0000 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNol-00Ci59-AW; Sun, 13 Feb 2022 22:58:08 +0000 Received: by mail-ed1-x533.google.com with SMTP id z21so3342130edb.13; Sun, 13 Feb 2022 14:58:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+88MzjtKS6j33NfAKjT3ZitqU5pJbrVp5tu84yNOBq8=; b=b7REtzY/JvhBJbXT0D8NzJcn4SOWmJeDBABbRL+qh81EYjhvpor1acp5gx6VaWzpBc MA0gXh6UpiLtlnJM7Q2oULI8CXPuW3hDGWweJ7TmlaQAiOdt+NRoAHf6t/qFd1dEKiFh xe8UqM5PBIgHMVgvIa97DfxxQpGC5weN7KD0ExPnP3mKvHkOYYhKVCFNVVajWNI3z6sL GAfJLwGoZPqSPG5EhXXP9l5sDWEZTNgCTom4RJshogG1egcxRL/oYqvmFqV4D5TssDms clPVC7ycCGSjp9BH4tTDTyNUp1z+yEY7c5zaHhJ9EX0TZjFVESXHT/n+1H3oFKKGoRQ4 42tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+88MzjtKS6j33NfAKjT3ZitqU5pJbrVp5tu84yNOBq8=; b=PPIM8bILOEwQCUYHw9Zejw6xm9VEM37NGBPyM/Q19I8gfDuMxBsFWAv9VtXGZe+ok8 hAgMoNmONOPQmBEZcW2FbBLEbxojqzi1mLoK000ydtDof9c7bLYvqKFBBzDLOWUmCvl9 tIXEQ8uLq4pgt4x5vcJSa5LFJggvBtZp6MhkK0befAUu0pVS9OWCqJnkDgPdR17xYdfJ TjAuVIu8dj1VwRyMXiQFTcteaGJsVCCDVt4b7J2uflF1LC27zl0OCLGgnCru/Bm+otTf wrxXAKniEHBXXaF/YeuwZ29a6Mw8/7ys7XSh2yFs8JsB9ljD/i0pfnWX6dbQGt3sCXVV CWWQ== X-Gm-Message-State: AOAM532XhISnkUwKR1IAWotLKtRD1PovWwKdxYMGefqhllAdben+vUV8 +zp9jRkDrCQ8BGIwYst+pAM= X-Google-Smtp-Source: ABdhPJxvbQaHzI63ftYUju86HpJS58ngGCI8VPlF27GSAWqVjn0k5gIlPOm+FppvaTyiik2aOpwk8A== X-Received: by 2002:aa7:da13:: with SMTP id r19mr11509923eds.266.1644793085496; Sun, 13 Feb 2022 14:58:05 -0800 (PST) Received: from morpheus.home.roving-it.com (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id g14sm3189163edb.55.2022.02.13.14.58.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Feb 2022 14:58:05 -0800 (PST) From: Peter Robinson To: Nicolas Saenz Julienne , Rob Herring , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Lee Jones , Emma Anholt , David Airlie , Daniel Vetter , Russell King , Arnd Bergmann , Catalin Marinas , Will Deacon Cc: Nicolas Saenz Julienne , Peter Robinson Subject: [PATCH v4 06/15] mfd: bcm2835-pm: Use 'reg-names' to get resources Date: Sun, 13 Feb 2022 22:56:38 +0000 Message-Id: <20220213225646.67761-7-pbrobinson@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220213225646.67761-1-pbrobinson@gmail.com> References: <20220213225646.67761-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220213_145807_418738_E57A826B X-CRM114-Status: GOOD ( 17.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Nicolas Saenz Julienne If available in firmware, find resources by their 'reg-names' position instead of relying on hardcoded offsets. Care is taken to support old firmware nonetheless. Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Peter Robinson --- Changes since v2: - correct names drivers/mfd/bcm2835-pm.c | 55 ++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c index 42fe67f1538e..36fede92775c 100644 --- a/drivers/mfd/bcm2835-pm.c +++ b/drivers/mfd/bcm2835-pm.c @@ -25,9 +25,37 @@ static const struct mfd_cell bcm2835_power_devs[] = { { .name = "bcm2835-power" }, }; +static int bcm2835_pm_get_pdata(struct platform_device *pdev, + struct bcm2835_pm *pm) +{ + /* If no 'reg-names' property is found we can assume we're using old + * firmware. + */ + if (!of_find_property(pm->dev->of_node, "reg-names", NULL)) { + dev_warn(pm->dev, "Old devicetree detected, please update your firmware.\n"); + + pm->base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(pm->base)) + return PTR_ERR(pm->base); + + pm->asb = devm_platform_ioremap_resource(pdev, 1); + if (IS_ERR(pm->asb)) + pm->asb = NULL; + } else { + pm->base = devm_platform_ioremap_resource_byname(pdev, "pm"); + if (IS_ERR(pm->base)) + return PTR_ERR(pm->base); + + pm->asb = devm_platform_ioremap_resource_byname(pdev, "asb"); + if (IS_ERR(pm->base)) + pm->asb = NULL; + } + + return 0; +} + static int bcm2835_pm_probe(struct platform_device *pdev) { - struct resource *res; struct device *dev = &pdev->dev; struct bcm2835_pm *pm; int ret; @@ -39,10 +67,9 @@ static int bcm2835_pm_probe(struct platform_device *pdev) pm->dev = dev; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - pm->base = devm_ioremap_resource(dev, res); - if (IS_ERR(pm->base)) - return PTR_ERR(pm->base); + ret = bcm2835_pm_get_pdata(pdev, pm); + if (ret) + return ret; ret = devm_mfd_add_devices(dev, -1, bcm2835_pm_devs, ARRAY_SIZE(bcm2835_pm_devs), @@ -54,20 +81,10 @@ static int bcm2835_pm_probe(struct platform_device *pdev) * bcm2835-pm binding as the key for whether we can reference * the full PM register range and support power domains. */ - res = platform_get_resource(pdev, IORESOURCE_MEM, 1); - if (res) { - pm->asb = devm_ioremap_resource(dev, res); - if (IS_ERR(pm->asb)) - return PTR_ERR(pm->asb); - - ret = devm_mfd_add_devices(dev, -1, - bcm2835_power_devs, - ARRAY_SIZE(bcm2835_power_devs), - NULL, 0, NULL); - if (ret) - return ret; - } - + if (pm->asb) + return devm_mfd_add_devices(dev, -1, bcm2835_power_devs, + ARRAY_SIZE(bcm2835_power_devs), + NULL, 0, NULL); return 0; } From patchwork Sun Feb 13 22:56:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12744725 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EF627C433F5 for ; Sun, 13 Feb 2022 23:00:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ossE9LWNPjZZv4qRiLwqTzZz0Ln8zYeo2c2PdDlKcyM=; b=FdzANNf73tskcO AgdzcR4UkDLaV1QxF71OA9V9huEyRuRpX/Vru5G0HHegfLMm/kV6uTc9Tx2CoX1MlK8x0bNl4yOJ5 29hBue4zz+x1azQPMSskkm/QwBWcnG8n2eDFfqAM721qi/R2fh5tnTd5lN7Sl/Tttq1mAUo4r/IGr Yckf3g/XgbRFzaDUQ+XfpPBQEZzaB30yBQ3V1Sg+0yaxWKyYFuaQtkFkwSh4hLHvuLAm8mECU3zKG I+a2T7nJTLAFSawcPzTuM6BFgDOApbOVUxtgsu7SXrDROJ11BKrYDzNsU4g31458aRE0tewaJSVXo 1M0lx0ekbLWJCU1GvP2Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNq5-00CigR-FH; Sun, 13 Feb 2022 22:59:29 +0000 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNom-00Ci5p-Cx; Sun, 13 Feb 2022 22:58:10 +0000 Received: by mail-ej1-x634.google.com with SMTP id p9so11020236ejd.6; Sun, 13 Feb 2022 14:58:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gH8fsrRlg3C6SSTb3qLzsD14CS9me/GxO3/rmRt1Yy4=; b=ps4J/eHO+enBkq9qoHdjxixoy6iK+cwVsFnT/rqf6Hd2oEdirw3vOj21XoUfYBYp06 7qDZE8DAoVTdBUcxk5KVFkHnRI7FCaBFJVvwtxFwuwyJlUaPCizlcxaJNNSMS0MyxzOx efK+tPYUPeC5VDgJWYYKA61I2cwpWdyVEw2nJUQLILM+weurWsHmTxiv0+5+Wv2XY29u jH7T8KPW0uHueWPEP2cf8249U1lroBqUugq/vdkPUH6CEs3B+kSfzXL1nqWZoqbKgrv4 rnWCgpwxQFRUDhVQ+Ibp5/ZOn9hJcc1Lk9HScUZ3yHsb4SjzeR+yEaT04nPoQWvKizks OyOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gH8fsrRlg3C6SSTb3qLzsD14CS9me/GxO3/rmRt1Yy4=; b=CKsiTikPiAjnGiIBeuKaaYXSGTRvOZXxe5xfQeEVJ4cPKp8iFO7gNIg/cM0kkNMEWQ p8IY/wrBNIdQ5qhWWCSxXxd5K8prCcXeJE5ddPTHAwzXyWJahODIdK8Q9E1vORGzenT2 mhZbw8CYIvWGkCZPXvmThblYhsIC3W9si2An9DOWVPyZfV6pICk7dzx0ci81zJJEK81O uMbOw02MPgaK6knsy6V6HbfzHYMxgOlse6rTNcnz8ZbDYONO1bm2kgCIhWp+Gm7PsrQq d2fiKHZ2PR5SrLEbeRT1Xi62Nyw8+BdrEkiB/Cd6wf4ooEpuOOu8V0xw8bBhfVn43dXA YSmQ== X-Gm-Message-State: AOAM53195qWRabGdSlKBcbv9QjJtepbvprw1jmezIsE/RusZC9rRUKLa +/Ao4qJIYkdlAyc2/YgSQgk= X-Google-Smtp-Source: ABdhPJxFnysaGfjAPQJ745Q6+KqLdQRZe6OfpJuU9XJWEdFNQYylEnVAQpnKRTUxZkRhcWmb2eMhfw== X-Received: by 2002:a17:907:3d8f:: with SMTP id he15mr9290907ejc.623.1644793086517; Sun, 13 Feb 2022 14:58:06 -0800 (PST) Received: from morpheus.home.roving-it.com (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id g14sm3189163edb.55.2022.02.13.14.58.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Feb 2022 14:58:06 -0800 (PST) From: Peter Robinson To: Nicolas Saenz Julienne , Rob Herring , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Lee Jones , Emma Anholt , David Airlie , Daniel Vetter , Russell King , Arnd Bergmann , Catalin Marinas , Will Deacon Cc: Nicolas Saenz Julienne , Peter Robinson Subject: [PATCH v4 07/15] mfd: bcm2835-pm: Add support for BCM2711 Date: Sun, 13 Feb 2022 22:56:39 +0000 Message-Id: <20220213225646.67761-8-pbrobinson@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220213225646.67761-1-pbrobinson@gmail.com> References: <20220213225646.67761-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220213_145808_523001_234FDE79 X-CRM114-Status: GOOD ( 22.74 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Nicolas Saenz Julienne In BCM2711 the new RPiVid ASB took over V3D. The old ASB is still present with the ISP and H264 bits, and V3D is in the same place in the new ASB as the old one. As per the devicetree bindings, BCM2711 will provide both the old and new ASB resources, so get both of them and pass them into 'bcm2835-power,' which will take care of selecting which one to use accordingly. Since the RPiVid ASB's resources were being provided prior to formalizing the bindings[1], also support the old firmwares that didn't use 'reg-names.' Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Peter Robinson [1] See: 7dbe8c62ceeb ("ARM: dts: Add minimal Raspberry Pi 4 support") --- Changes since v2: - Correct names again! Changes since v1: - Use reg-names - Correct ASB names drivers/mfd/bcm2835-pm.c | 25 +++++++++++++++++++++++-- include/linux/mfd/bcm2835-pm.h | 1 + 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c index 36fede92775c..a06e9cf19b64 100644 --- a/drivers/mfd/bcm2835-pm.c +++ b/drivers/mfd/bcm2835-pm.c @@ -6,6 +6,7 @@ * the WDT and power drivers. */ +#include #include #include #include @@ -17,6 +18,9 @@ #include #include +#define BCM2835 BIT(1) +#define BCM2711 BIT(2) + static const struct mfd_cell bcm2835_pm_devs[] = { { .name = "bcm2835-wdt" }, }; @@ -28,6 +32,8 @@ static const struct mfd_cell bcm2835_power_devs[] = { static int bcm2835_pm_get_pdata(struct platform_device *pdev, struct bcm2835_pm *pm) { + bool is_bcm2711 = (uintptr_t)device_get_match_data(pm->dev) & BCM2711; + /* If no 'reg-names' property is found we can assume we're using old * firmware. */ @@ -41,6 +47,10 @@ static int bcm2835_pm_get_pdata(struct platform_device *pdev, pm->asb = devm_platform_ioremap_resource(pdev, 1); if (IS_ERR(pm->asb)) pm->asb = NULL; + + pm->rpivid_asb = devm_platform_ioremap_resource(pdev, 2); + if (IS_ERR(pm->rpivid_asb)) + pm->rpivid_asb = NULL; } else { pm->base = devm_platform_ioremap_resource_byname(pdev, "pm"); if (IS_ERR(pm->base)) @@ -49,6 +59,16 @@ static int bcm2835_pm_get_pdata(struct platform_device *pdev, pm->asb = devm_platform_ioremap_resource_byname(pdev, "asb"); if (IS_ERR(pm->base)) pm->asb = NULL; + + pm->rpivid_asb = devm_platform_ioremap_resource_byname(pdev, + "rpivid_asb"); + if (IS_ERR(pm->base)) + pm->rpivid_asb = NULL; + + if (pm->rpivid_asb && !is_bcm2711) { + dev_err(pm->dev, "RPiVid ASB support only present in BCM2711\n"); + return -EINVAL; + } } return 0; @@ -89,8 +109,9 @@ static int bcm2835_pm_probe(struct platform_device *pdev) } static const struct of_device_id bcm2835_pm_of_match[] = { - { .compatible = "brcm,bcm2835-pm-wdt", }, - { .compatible = "brcm,bcm2835-pm", }, + { .compatible = "brcm,bcm2835-pm-wdt", .data = (void *)BCM2835}, + { .compatible = "brcm,bcm2835-pm", .data = (void *)BCM2835}, + { .compatible = "brcm,bcm2711-pm", .data = (void *)BCM2711}, {}, }; MODULE_DEVICE_TABLE(of, bcm2835_pm_of_match); diff --git a/include/linux/mfd/bcm2835-pm.h b/include/linux/mfd/bcm2835-pm.h index ed37dc40e82a..f70a810c55f7 100644 --- a/include/linux/mfd/bcm2835-pm.h +++ b/include/linux/mfd/bcm2835-pm.h @@ -9,6 +9,7 @@ struct bcm2835_pm { struct device *dev; void __iomem *base; void __iomem *asb; + void __iomem *rpivid_asb; }; #endif /* BCM2835_MFD_PM_H */ From patchwork Sun Feb 13 22:56:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12744726 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BF8D3C433F5 for ; Sun, 13 Feb 2022 23:01:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8nuXVdElowQlv8UGJVJcxvmoteGc9x93yu3MKwtye+U=; b=x3c20nXg/MeuCv 4Yk/WzFAJzoDtBhGKIH9D2CIMKfCyte+n9jfsF+3g3iUrC8IXqnIDtg1E+67/Cheuk+chKBcAg8Cb r0Tj+Hc6Q1HmXHMM+c4bcwmat7Fk/PIoWdA5/2mGOVdTiVrkV/2wkmou59loPbtMlCtHdwbNzBaG4 8ZpAzWt/RKbq38Ld1wILrVnyNzW/TrjiR8s91ypsXdD653b3TposN9JJGRYMmSLDWD9wQ971tv52L gFJ+SPYuN/a5+XydY02n167PoqMG0aBibVHKHYhTYHEeN3bus9kEC9IWHc6jOoAESbuPOXXtRvyUG 7TDjWP6kytZJDLZsvgjw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNqf-00Cj0v-Pz; Sun, 13 Feb 2022 23:00:06 +0000 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNom-00Ci6o-Um; Sun, 13 Feb 2022 22:58:11 +0000 Received: by mail-ej1-x631.google.com with SMTP id k25so33908561ejp.5; Sun, 13 Feb 2022 14:58:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Mdx7I5Eo8oBah9t8/cpT7ExRF6D3O1Ycqvlfz85E7CA=; b=l4JPVCQeLEpqHBwiyDM7FZuMwpCo8D7yYfnnZbSIQKtACgK2kHw8qP1u2IPItn575X XFF5mQ6cP24SV2wWk88zKdZ+xoUo6u57lmelWOe77w5l1DFRcr6yoPpdFJSoUmHQbp2p jIPWfdD8168RS9i2EH0Jekrt6J0xKhYkiGyKraMmWDEEWue3hI69IACLyyV0uP4y7+8H Fkg7L3McdTJumeEahXgIprbSgoDsDEVvMyHvJhOm+YXRERz9KBqOwuFMFtFYdKu2iDbH zSQZ8eThBGuHXFI/gLEB4359z2wrxVUP4nPn/v1k7uWl75M4WH7DFvXuV2MF/cvScdRf 5zFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Mdx7I5Eo8oBah9t8/cpT7ExRF6D3O1Ycqvlfz85E7CA=; b=yYpNW+KdMw99wOLp++XDaqfmrnLOqgUltrLzS2b4Ne6lWVNfCruREw7CndbO68VEkW fiM33uNRd+llXh7vjQmabAL8O9AXw43df+22X3iRrjJ1AiPiot0hLAVxepjP2gkUw/xw FgbGoeBArPhP/HrTOPfVVy9oUIbzUQ3HXpL9kUi38UbCk43M7k/SGNm9gQ+NT5QZb8QY UPymVc+0jZLhaPO37oTPywxzUzDW7KgN3wv6qVHwM+/KIJ4l+e7tMNEZ2E7ay0m7JJ6s 7iG7QgToDekXOOj5Rvm307y6Vt084cvZhLtKT96qOnMvwLHTafz9sgavWK4RAvu42jAd tZuw== X-Gm-Message-State: AOAM533Qrqqg4r1DOt9/g3dqCVoDCR2WpmBxXep8vszQ+c74Yd188HsC BDCdOYk0nB5rYcLa4jSXIWo= X-Google-Smtp-Source: ABdhPJwEC3TJGmKXsvO1w6ER7exMZMJ0Xc+Rid1ieNp9AtEFq2/oU//USalQA4a31llIDs2PBK/4ug== X-Received: by 2002:a17:907:9805:: with SMTP id ji5mr4505197ejc.489.1644793087598; Sun, 13 Feb 2022 14:58:07 -0800 (PST) Received: from morpheus.home.roving-it.com (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id g14sm3189163edb.55.2022.02.13.14.58.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Feb 2022 14:58:07 -0800 (PST) From: Peter Robinson To: Nicolas Saenz Julienne , Rob Herring , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Lee Jones , Emma Anholt , David Airlie , Daniel Vetter , Russell King , Arnd Bergmann , Catalin Marinas , Will Deacon Cc: Nicolas Saenz Julienne , Peter Robinson Subject: [PATCH v4 08/15] soc: bcm: bcm2835-power: Add support for BCM2711's RPiVid ASB Date: Sun, 13 Feb 2022 22:56:40 +0000 Message-Id: <20220213225646.67761-9-pbrobinson@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220213225646.67761-1-pbrobinson@gmail.com> References: <20220213225646.67761-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220213_145809_063605_463B2A14 X-CRM114-Status: GOOD ( 18.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Nicolas Saenz Julienne In BCM2711 the new RPiVid ASB took over V3D. The old ASB is still present with the ISP and H264 bits, and V3D is in the same place in the new ASB as the old one. Use the fact that 'pm->rpivid_asb' is populated as a hint that we're on BCM2711. On top of that introduce the macro ASB_BASE() which will select the correct ASB register base, based on whether we're trying to access V3D and which platform we're on. Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Peter Robinson --- Changes since v2: - Correct names again Changes since v1: - Correct names drivers/soc/bcm/bcm2835-power.c | 66 ++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 25 deletions(-) diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c index 1e0041ec8132..eea31f75dc64 100644 --- a/drivers/soc/bcm/bcm2835-power.c +++ b/drivers/soc/bcm/bcm2835-power.c @@ -126,8 +126,9 @@ #define ASB_AXI_BRDG_ID 0x20 -#define ASB_READ(reg) readl(power->asb + (reg)) -#define ASB_WRITE(reg, val) writel(PM_PASSWORD | (val), power->asb + (reg)) +#define ASB_BASE(is_v3d) (is_v3d && power->rpivid_asb ? power->rpivid_asb : power->asb) +#define ASB_READ(reg, is_v3d) readl(ASB_BASE(is_v3d) + (reg)) +#define ASB_WRITE(reg, val, is_v3d) writel(PM_PASSWORD | (val), ASB_BASE(is_v3d) + (reg)) struct bcm2835_power_domain { struct generic_pm_domain base; @@ -142,13 +143,16 @@ struct bcm2835_power { void __iomem *base; /* AXI Async bridge registers. */ void __iomem *asb; + /* RPiVid bridge registers. */ + void __iomem *rpivid_asb; struct genpd_onecell_data pd_xlate; struct bcm2835_power_domain domains[BCM2835_POWER_DOMAIN_COUNT]; struct reset_controller_dev reset; }; -static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg) +static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg, + bool is_v3d) { u64 start; @@ -158,8 +162,8 @@ static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg) start = ktime_get_ns(); /* Enable the module's async AXI bridges. */ - ASB_WRITE(reg, ASB_READ(reg) & ~ASB_REQ_STOP); - while (ASB_READ(reg) & ASB_ACK) { + ASB_WRITE(reg, ASB_READ(reg, is_v3d) & ~ASB_REQ_STOP, is_v3d); + while (ASB_READ(reg, is_v3d) & ASB_ACK) { cpu_relax(); if (ktime_get_ns() - start >= 1000) return -ETIMEDOUT; @@ -168,7 +172,8 @@ static int bcm2835_asb_enable(struct bcm2835_power *power, u32 reg) return 0; } -static int bcm2835_asb_disable(struct bcm2835_power *power, u32 reg) +static int bcm2835_asb_disable(struct bcm2835_power *power, u32 reg, + bool is_v3d) { u64 start; @@ -178,8 +183,8 @@ static int bcm2835_asb_disable(struct bcm2835_power *power, u32 reg) start = ktime_get_ns(); /* Enable the module's async AXI bridges. */ - ASB_WRITE(reg, ASB_READ(reg) | ASB_REQ_STOP); - while (!(ASB_READ(reg) & ASB_ACK)) { + ASB_WRITE(reg, ASB_READ(reg, is_v3d) | ASB_REQ_STOP, is_v3d); + while (!(ASB_READ(reg, is_v3d) & ASB_ACK)) { cpu_relax(); if (ktime_get_ns() - start >= 1000) return -ETIMEDOUT; @@ -274,7 +279,8 @@ static int bcm2835_asb_power_on(struct bcm2835_power_domain *pd, u32 pm_reg, u32 asb_m_reg, u32 asb_s_reg, - u32 reset_flags) + u32 reset_flags, + bool is_v3d) { struct bcm2835_power *power = pd->power; int ret; @@ -301,13 +307,13 @@ static int bcm2835_asb_power_on(struct bcm2835_power_domain *pd, goto err_enable_resets; } - ret = bcm2835_asb_enable(power, asb_m_reg); + ret = bcm2835_asb_enable(power, asb_m_reg, is_v3d); if (ret) { dev_err(power->dev, "Failed to enable ASB master for %s\n", pd->base.name); goto err_disable_clk; } - ret = bcm2835_asb_enable(power, asb_s_reg); + ret = bcm2835_asb_enable(power, asb_s_reg, is_v3d); if (ret) { dev_err(power->dev, "Failed to enable ASB slave for %s\n", pd->base.name); @@ -317,7 +323,7 @@ static int bcm2835_asb_power_on(struct bcm2835_power_domain *pd, return 0; err_disable_asb_master: - bcm2835_asb_disable(power, asb_m_reg); + bcm2835_asb_disable(power, asb_m_reg, is_v3d); err_disable_clk: clk_disable_unprepare(pd->clk); err_enable_resets: @@ -329,22 +335,23 @@ static int bcm2835_asb_power_off(struct bcm2835_power_domain *pd, u32 pm_reg, u32 asb_m_reg, u32 asb_s_reg, - u32 reset_flags) + u32 reset_flags, + bool is_v3d) { struct bcm2835_power *power = pd->power; int ret; - ret = bcm2835_asb_disable(power, asb_s_reg); + ret = bcm2835_asb_disable(power, asb_s_reg, is_v3d); if (ret) { dev_warn(power->dev, "Failed to disable ASB slave for %s\n", pd->base.name); return ret; } - ret = bcm2835_asb_disable(power, asb_m_reg); + ret = bcm2835_asb_disable(power, asb_m_reg, is_v3d); if (ret) { dev_warn(power->dev, "Failed to disable ASB master for %s\n", pd->base.name); - bcm2835_asb_enable(power, asb_s_reg); + bcm2835_asb_enable(power, asb_s_reg, is_v3d); return ret; } @@ -369,7 +376,7 @@ static int bcm2835_power_pd_power_on(struct generic_pm_domain *domain) case BCM2835_POWER_DOMAIN_GRAFX_V3D: return bcm2835_asb_power_on(pd, PM_GRAFX, ASB_V3D_M_CTRL, ASB_V3D_S_CTRL, - PM_V3DRSTN); + PM_V3DRSTN, true); case BCM2835_POWER_DOMAIN_IMAGE: return bcm2835_power_power_on(pd, PM_IMAGE); @@ -377,17 +384,17 @@ static int bcm2835_power_pd_power_on(struct generic_pm_domain *domain) case BCM2835_POWER_DOMAIN_IMAGE_PERI: return bcm2835_asb_power_on(pd, PM_IMAGE, 0, 0, - PM_PERIRSTN); + PM_PERIRSTN, false); case BCM2835_POWER_DOMAIN_IMAGE_ISP: return bcm2835_asb_power_on(pd, PM_IMAGE, ASB_ISP_M_CTRL, ASB_ISP_S_CTRL, - PM_ISPRSTN); + PM_ISPRSTN, false); case BCM2835_POWER_DOMAIN_IMAGE_H264: return bcm2835_asb_power_on(pd, PM_IMAGE, ASB_H264_M_CTRL, ASB_H264_S_CTRL, - PM_H264RSTN); + PM_H264RSTN, false); case BCM2835_POWER_DOMAIN_USB: PM_WRITE(PM_USB, PM_USB_CTRLEN); @@ -435,7 +442,7 @@ static int bcm2835_power_pd_power_off(struct generic_pm_domain *domain) case BCM2835_POWER_DOMAIN_GRAFX_V3D: return bcm2835_asb_power_off(pd, PM_GRAFX, ASB_V3D_M_CTRL, ASB_V3D_S_CTRL, - PM_V3DRSTN); + PM_V3DRSTN, true); case BCM2835_POWER_DOMAIN_IMAGE: return bcm2835_power_power_off(pd, PM_IMAGE); @@ -443,17 +450,17 @@ static int bcm2835_power_pd_power_off(struct generic_pm_domain *domain) case BCM2835_POWER_DOMAIN_IMAGE_PERI: return bcm2835_asb_power_off(pd, PM_IMAGE, 0, 0, - PM_PERIRSTN); + PM_PERIRSTN, false); case BCM2835_POWER_DOMAIN_IMAGE_ISP: return bcm2835_asb_power_off(pd, PM_IMAGE, ASB_ISP_M_CTRL, ASB_ISP_S_CTRL, - PM_ISPRSTN); + PM_ISPRSTN, false); case BCM2835_POWER_DOMAIN_IMAGE_H264: return bcm2835_asb_power_off(pd, PM_IMAGE, ASB_H264_M_CTRL, ASB_H264_S_CTRL, - PM_H264RSTN); + PM_H264RSTN, false); case BCM2835_POWER_DOMAIN_USB: PM_WRITE(PM_USB, 0); @@ -626,13 +633,22 @@ static int bcm2835_power_probe(struct platform_device *pdev) power->dev = dev; power->base = pm->base; power->asb = pm->asb; + power->rpivid_asb = pm->rpivid_asb; - id = ASB_READ(ASB_AXI_BRDG_ID); + id = ASB_READ(ASB_AXI_BRDG_ID, false); if (id != 0x62726467 /* "BRDG" */) { dev_err(dev, "ASB register ID returned 0x%08x\n", id); return -ENODEV; } + if (pm->rpivid_asb) { + id = ASB_READ(ASB_AXI_BRDG_ID, true); + if (id != 0x62726467 /* "BRDG" */) { + dev_err(dev, "RPiVid ASB register ID returned 0x%08x\n", id); + return -ENODEV; + } + } + power->pd_xlate.domains = devm_kcalloc(dev, ARRAY_SIZE(power_domain_names), sizeof(*power->pd_xlate.domains), From patchwork Sun Feb 13 22:56:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12744727 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E4286C433EF for ; Sun, 13 Feb 2022 23:02:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XOnTX/+Dfh9ZKoL/HgGhp7Ied0IHtK0RRTf7iuqaBig=; b=AXqg4WOaDv/19L ebn5/d7H0MKe3nQYu1fnI0a8/HGXU9ymkzkxU8PGD31CvD80YwRtTSRY0XTPOwMzR/vmEV3a5RuBp JT4KsjVpsQmtm/eG4vCQTynjMfOkWAyfTIO3AzGpCgaM5FR4hRROeQ9w1CMLa/hlDwkUN1ZRG8Vs+ WYadyvrdRtaK8AW08aTN5CAf7CDVdoMMob0yI42YI5jBrlmH5chqe+bb+9Sv71UQpjRYWf3+MI8r8 zakhfvfWI5AKt0lxjyJsTQ+sLXia38Mmgb5bRjredc5EAb1n7kMDJ+Rl2y3ZLzb+mePWyRhARAusb Aj9KrLT56qPtkRWLKW0w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNr7-00CjHj-Sn; Sun, 13 Feb 2022 23:00:35 +0000 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNoo-00Ci7k-FI; Sun, 13 Feb 2022 22:58:11 +0000 Received: by mail-ed1-x52a.google.com with SMTP id co28so24588355edb.1; Sun, 13 Feb 2022 14:58:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MLuhH6ONLHu6VxvLjNeF0wkcr4pEFWdl7WgU3dUjs2Q=; b=gHxFhbBbIairlqlrfYKyfFvzVcELELsIQoCt4ETXjEwNiEVLbYrST1s3Pt/RafI9d6 Mq3H4mCkFfZAeKMbTiroVBs3lZZlCrfMIGPJiMBrj9HlyXfTUb1jNdfSYL4vbsZWmJWv uxg5aSpKZbcz90E7oNp/BelW0ZcEuDgQpYIB7fJ0CW//vixJJVQTptjwIj1u9KChQkaQ DbJhd6ElXnSCX0w1Zy68BgpdPXcp68NTYLwN5q18Q2qIdVhauMMO71pojViIFf55yERF KZbhwGzOJYquq7jG9ekymhzx1+ezUvS99YgBr5P/XdsBsFVK1ySJxZBmQDS3rLU6VyA1 mKlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MLuhH6ONLHu6VxvLjNeF0wkcr4pEFWdl7WgU3dUjs2Q=; b=uzwZ6DRfddAS9gPjh90ahZs9ZBVPnmKo5W+t7M/1IQPm+tdkORgcJPmVcWcN5XULkj b0J+xJNIxwfAwet8LQcgIeRejSiJ2ZXDOVT4+IaWIHDKcbhzlu/nzsKW5uHUBwIKiX1f cikHprJ4Y8zmf8B9M2ocy6dZFWpm2AUlVd777WLjJgzNwOn5HTEpV/I+643DXubQFOhd 18rsUhMXK2OP/Ix40bNGPpEWREDdOfWMwhFJEzKX7M6YdU5eQPcKkhcTEZwdPHKCC2SF b+wG/pZQSOes7hOq97sZKWPceMnLyPscpG3GNtINQpem/tJrEaOBkcxhWgf77V75d3r7 xP+w== X-Gm-Message-State: AOAM532P8FQF3LP9RuL7lwhUvqIlNIScK9tle9buzunDPGb87rAULHeK 35cn7PSX/PStSopmFkLleDI= X-Google-Smtp-Source: ABdhPJxYzYpZ631OmXPjUHVbsodI7QSeEsf2iUpFjpHscHLQ7jO3sN3xxEkr/JdYmt6NU7YuAonheQ== X-Received: by 2002:a05:6402:4ca:: with SMTP id n10mr3346276edw.248.1644793088666; Sun, 13 Feb 2022 14:58:08 -0800 (PST) Received: from morpheus.home.roving-it.com (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id g14sm3189163edb.55.2022.02.13.14.58.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Feb 2022 14:58:08 -0800 (PST) From: Peter Robinson To: Nicolas Saenz Julienne , Rob Herring , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Lee Jones , Emma Anholt , David Airlie , Daniel Vetter , Russell King , Arnd Bergmann , Catalin Marinas , Will Deacon Cc: Nicolas Saenz Julienne , Peter Robinson Subject: [PATCH v4 09/15] soc: bcm: bcm2835-power: Bypass power_on/off() calls Date: Sun, 13 Feb 2022 22:56:41 +0000 Message-Id: <20220213225646.67761-10-pbrobinson@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220213225646.67761-1-pbrobinson@gmail.com> References: <20220213225646.67761-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220213_145810_550181_EAADBD79 X-CRM114-Status: GOOD ( 13.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Nicolas Saenz Julienne Bypass power_on/power_off() when running on BCM2711 as they are not needed. Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Peter Robinson --- Changes since v2: - Correct names drivers/soc/bcm/bcm2835-power.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c index eea31f75dc64..b65a39cc2788 100644 --- a/drivers/soc/bcm/bcm2835-power.c +++ b/drivers/soc/bcm/bcm2835-power.c @@ -197,6 +197,10 @@ static int bcm2835_power_power_off(struct bcm2835_power_domain *pd, u32 pm_reg) { struct bcm2835_power *power = pd->power; + /* We don't run this on BCM2711 */ + if (power->rpivid_asb) + return 0; + /* Enable functional isolation */ PM_WRITE(pm_reg, PM_READ(pm_reg) & ~PM_ISFUNC); @@ -218,6 +222,10 @@ static int bcm2835_power_power_on(struct bcm2835_power_domain *pd, u32 pm_reg) int inrush; bool powok; + /* We don't run this on BCM2711 */ + if (power->rpivid_asb) + return 0; + /* If it was already powered on by the fw, leave it that way. */ if (PM_READ(pm_reg) & PM_POWUP) return 0; From patchwork Sun Feb 13 22:56:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12744728 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 746B0C433EF for ; Sun, 13 Feb 2022 23:02:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gDD9WnJdS7FQPEIyt0s0j3hc6nqSB4NK+KhTbkzW6i4=; b=1l93RY2AwaVFdI VYGGezWUyLWfYyJoXN239ij2bx6YmbdXcFoQGF2228Sq5CRCwA8/a0bcREEkEJObZ/piqlD7l7Few E7aUqx0vFK+o7DxQ2CeQOg0iuJw9qgdSDDtTcib5u+QLyArRgXJAblhu2C57rBW/7XHeKbG9/4zC4 9cEesbUl+BDVkQVhdq1RJmHNrNh0YTj2M8hPrD+7tbKziyQfR6GVDPrJgwEjEnfNg4l/fJ/MNfkdd XTxNEI1gYbVPyZW7XGWI0+JVoyK46cbfB0VxIFzAG8a+jl0eUgCM13C8xhtgMQpL8WX4nhkAAmBnS wI4cPFK65ZT4H2JMGwYQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNrh-00Cjbc-SG; Sun, 13 Feb 2022 23:01:10 +0000 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNop-00Ci8T-LK; Sun, 13 Feb 2022 22:58:13 +0000 Received: by mail-ej1-x629.google.com with SMTP id k25so33908643ejp.5; Sun, 13 Feb 2022 14:58:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uOtzuc3KzFq47CE3a/IsqBsnHGlymFWoyRNcsMqoiCg=; b=YiDIKqi/fQuw5dMJ0QefKoK9ZeFs49A3dPOXLRakNIOD0uSpKsCvYQsyyfIEHqDGS3 7yr+D+3YX/VNOWNvrky91rd4Oh5peT+ucBd+P8XoxhFFKaoFGIxUYTbfZnKifZ/Niy7U 4jDfQuzXojLAZTk8u4OSDZp6g/Og0ZnO9oBi4rD1ZbCUX+EevGoX2Lgog8G9eH9b1oxu tq0RGyugvJz1wv2ytAlABKs7QkbnNHgwKPhNqTnQ0GALuvL7vzUzliUR1f7t4T6LKG1m Ctv/YObAqWWWWCe7AJbWTCI/eo4Oq9mSgXfm7QrLPTEKpVKu+BDYngMU4DxBTGJ9346L Dq/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uOtzuc3KzFq47CE3a/IsqBsnHGlymFWoyRNcsMqoiCg=; b=Dw1LJsM6ub+9kGY7WITZ4tQyNUDHIGfcHy6ue0Fkxep0txzlOtCMvLLpsfJ9SylSLm jITIQnMKLqF51KLRnK4Z0PwM9jOebnAqLU+c8i0+70jN3Ro0/q0/pfCxaOmKorF1H08n LGLHE4GLOaMcbivQOt3gJyA9ypXDaZjbLl1R8qLkd6ePYzJllGIBxOyEitUlssVupsd1 UZx9Km17UFMOyYcApqagWTs8WRTj6Zg28BnI3OS5Gjaxj5RZQ/cAjdlu/0JXgfVHbpXL 8LnzMDbf6EIaALPo4Ip+P5/C2nsySiFUzKvYZlweGWlGYw4Cl55Cgeu2iiDM7WqiAn/i n8Xw== X-Gm-Message-State: AOAM531bix/ZVLojyKnUj8xjtwf2+nbpHgnnyynHr9GMENlLYKAkiUuB b1O/n8Yb16364fBlnGryAHU= X-Google-Smtp-Source: ABdhPJw/v69niJY3V35RD22I+6ray2UOpcJkO51J6fugJ40hgNvNZ1/dH8/fS+BWnWvMU+bguMAnHg== X-Received: by 2002:a17:906:3d72:: with SMTP id r18mr9192051ejf.111.1644793089885; Sun, 13 Feb 2022 14:58:09 -0800 (PST) Received: from morpheus.home.roving-it.com (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id g14sm3189163edb.55.2022.02.13.14.58.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Feb 2022 14:58:09 -0800 (PST) From: Peter Robinson To: Nicolas Saenz Julienne , Rob Herring , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Lee Jones , Emma Anholt , David Airlie , Daniel Vetter , Russell King , Arnd Bergmann , Catalin Marinas , Will Deacon Cc: Nicolas Saenz Julienne , Rob Herring , Peter Robinson Subject: [PATCH v4 10/15] dt-bindings: gpu: v3d: Add BCM2711's compatible Date: Sun, 13 Feb 2022 22:56:42 +0000 Message-Id: <20220213225646.67761-11-pbrobinson@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220213225646.67761-1-pbrobinson@gmail.com> References: <20220213225646.67761-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220213_145811_745668_71192E9C X-CRM114-Status: GOOD ( 10.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Nicolas Saenz Julienne BCM2711, Raspberry Pi 4's SoC, contains a V3D core. So add its specific compatible to the bindings. Signed-off-by: Nicolas Saenz Julienne Reviewed-by: Rob Herring Signed-off-by: Peter Robinson --- Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml index e6485f7b046f..a08532909513 100644 --- a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml +++ b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml @@ -18,6 +18,7 @@ properties: enum: - brcm,7268-v3d - brcm,7278-v3d + - brcm,bcm2711-v3d reg: items: From patchwork Sun Feb 13 22:56:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12744729 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BA488C433EF for ; Sun, 13 Feb 2022 23:03:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=mMeoYtMWS2WN1KhAISKqW6j/ykHkGS44C4j1ojhPSfs=; b=O2op74teX03Bos 14H95WQNkEaoDVO6GSIRBn1XjYMy5owtOeUFNZYPRL6NnC/0oiYdyKdnoPEZNB7V1tvZbVHD51EhF K460tavpZ1NzpvLxxLPHxx/JSOqvyk/PVT9ARk5JFhzhR9OdEnCH+yayr9HbODcOAxzPje5zhKK4I 0P9SoQf5oovOQ3q9Uk7QES2lMkGw+A7Z+vSP0YsC45rGv8Z9xwNnbT4WjEbxU0VGbNZ9j89NZb8Bv +UFcMtC5DhdjUrro55CRLrchq9ufTWPyjZiQh/72yRqNQkQJwbmtkz5BxfF2V+75+pViKftWcItfS Wbi9F7oI7yAjvUJoIKiQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNsG-00CjtS-T4; Sun, 13 Feb 2022 23:01:45 +0000 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNoq-00Ci9H-3N; Sun, 13 Feb 2022 22:58:14 +0000 Received: by mail-ed1-x52a.google.com with SMTP id u18so24546823edt.6; Sun, 13 Feb 2022 14:58:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lZJOylr1gZr98EwfWR932Fp2FwArraNI7BsNa3DwKeM=; b=nTiwGP6VwIdJ9vuxq8mpP/kCL3jM3BTtAUB4NWAXaE6KTryi/VkL02z0Gw2rnTJrex cVDYlDC8lroEXcUAjHdTB36A+r0JsEByf2PAqrMGd0aCWU7+g2/RW+hn2rRWBSf7ehcv fK4L1uT1JI3vTdYm6XW9UUSUFN+TTK3+sMJSX+kYqVZhlrlIv+hKQN5SSe7ppcTQbAO9 XeINi5o0Iz+6FIgVo1J6FJ9+EIXa+0nydQzildtcjQicZJjDQld/SQXtWS24lafGiQV6 m+4Km8XdOn30IinRJPsJTW/grcCmi/41fLUBfDeAK5hV5NGVIpRbqgPN/IEOHgPCKTRm s66Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lZJOylr1gZr98EwfWR932Fp2FwArraNI7BsNa3DwKeM=; b=hS+njTov2GejekEEntA5DMNvh3IrS2+YV+1GrONZaRgRhfucggnVQwBSVVK4RhxIxT zIZVYCb84IZcrpIbcCyrKuifpAvCcJGwj2FAHliRamdGs9UUFABuT+FlH5SxhYgQn381 CiS3Iinz5m2hFAjBYQjTDH+UAc6xhxP7xZmv0AzxmtbrtuY6nfOIzFQVjG28NWmo73/j EQOVDS7ILUM5e4Gxk/moLvqTTZJn4uvj6H8IduUEKPp6BLtl3UljDAH0lL+eNJC6AgOx wDyJrgjU1Hjw87sqCewWTbk4IXxuKLexvqlwtnr1c8mtuKDKfLbmE8cp+MdAMdvnZfTS i2XA== X-Gm-Message-State: AOAM530C6Ckns/YDAXB/eDZigM5heRtkYOfauLpL2Sb6Rg6ywfifyyDW IFQ39RpYouExj5DRD1Q5+b8= X-Google-Smtp-Source: ABdhPJwY3kNrmcWMEOilTETE05NK/FeQksUIkmfoSXtxinuSjoGMx39y96ao+e5pr+ReJulfCisZyw== X-Received: by 2002:aa7:df10:: with SMTP id c16mr472587edy.336.1644793090964; Sun, 13 Feb 2022 14:58:10 -0800 (PST) Received: from morpheus.home.roving-it.com (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id g14sm3189163edb.55.2022.02.13.14.58.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Feb 2022 14:58:10 -0800 (PST) From: Peter Robinson To: Nicolas Saenz Julienne , Rob Herring , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Lee Jones , Emma Anholt , David Airlie , Daniel Vetter , Russell King , Arnd Bergmann , Catalin Marinas , Will Deacon Cc: Peter Robinson , Nicolas Saenz Julienne Subject: [PATCH v4 11/15] drm/v3d: Get rid of pm code Date: Sun, 13 Feb 2022 22:56:43 +0000 Message-Id: <20220213225646.67761-12-pbrobinson@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220213225646.67761-1-pbrobinson@gmail.com> References: <20220213225646.67761-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220213_145812_184588_F441979B X-CRM114-Status: GOOD ( 19.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Runtime PM doesn't seem to work correctly on this driver. On top of that, commit 8b6864e3e138 ("drm/v3d/v3d_drv: Remove unused static variable 'v3d_v3d_pm_ops'") hints that it most likely never did as the driver's PM ops were not hooked-up. So, in order to support regular operation with V3D on BCM2711 (Raspberry Pi 4), get rid of the PM code. PM will be reinstated once we figure out the underlying issues. Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Peter Robinson --- Changes since v3: - Minor updates for rebase drivers/gpu/drm/v3d/v3d_debugfs.c | 18 +----------------- drivers/gpu/drm/v3d/v3d_drv.c | 11 ----------- drivers/gpu/drm/v3d/v3d_gem.c | 12 +----------- 3 files changed, 2 insertions(+), 39 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_debugfs.c b/drivers/gpu/drm/v3d/v3d_debugfs.c index e76b24bb8828..e1d5f3423059 100644 --- a/drivers/gpu/drm/v3d/v3d_debugfs.c +++ b/drivers/gpu/drm/v3d/v3d_debugfs.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #include @@ -130,11 +129,7 @@ static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused) struct drm_device *dev = node->minor->dev; struct v3d_dev *v3d = to_v3d_dev(dev); u32 ident0, ident1, ident2, ident3, cores; - int ret, core; - - ret = pm_runtime_get_sync(v3d->drm.dev); - if (ret < 0) - return ret; + int core; ident0 = V3D_READ(V3D_HUB_IDENT0); ident1 = V3D_READ(V3D_HUB_IDENT1); @@ -187,9 +182,6 @@ static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused) (misccfg & V3D_MISCCFG_OVRTMUOUT) != 0); } - pm_runtime_mark_last_busy(v3d->drm.dev); - pm_runtime_put_autosuspend(v3d->drm.dev); - return 0; } @@ -217,11 +209,6 @@ static int v3d_measure_clock(struct seq_file *m, void *unused) uint32_t cycles; int core = 0; int measure_ms = 1000; - int ret; - - ret = pm_runtime_get_sync(v3d->drm.dev); - if (ret < 0) - return ret; if (v3d->ver >= 40) { V3D_CORE_WRITE(core, V3D_V4_PCTR_0_SRC_0_3, @@ -245,9 +232,6 @@ static int v3d_measure_clock(struct seq_file *m, void *unused) cycles / (measure_ms * 1000), (cycles / (measure_ms * 100)) % 10); - pm_runtime_mark_last_busy(v3d->drm.dev); - pm_runtime_put_autosuspend(v3d->drm.dev); - return 0; } diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c index bd46396a1ae0..82af16523843 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include @@ -43,7 +42,6 @@ static int v3d_get_param_ioctl(struct drm_device *dev, void *data, { struct v3d_dev *v3d = to_v3d_dev(dev); struct drm_v3d_get_param *args = data; - int ret; static const u32 reg_map[] = { [DRM_V3D_PARAM_V3D_UIFCFG] = V3D_HUB_UIFCFG, [DRM_V3D_PARAM_V3D_HUB_IDENT1] = V3D_HUB_IDENT1, @@ -69,17 +67,12 @@ static int v3d_get_param_ioctl(struct drm_device *dev, void *data, if (args->value != 0) return -EINVAL; - ret = pm_runtime_get_sync(v3d->drm.dev); - if (ret < 0) - return ret; if (args->param >= DRM_V3D_PARAM_V3D_CORE0_IDENT0 && args->param <= DRM_V3D_PARAM_V3D_CORE0_IDENT2) { args->value = V3D_CORE_READ(0, offset); } else { args->value = V3D_READ(offset); } - pm_runtime_mark_last_busy(v3d->drm.dev); - pm_runtime_put_autosuspend(v3d->drm.dev); return 0; } @@ -276,10 +269,6 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) return -ENOMEM; } - pm_runtime_use_autosuspend(dev); - pm_runtime_set_autosuspend_delay(dev, 50); - pm_runtime_enable(dev); - ret = v3d_gem_init(drm); if (ret) goto dma_free; diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c index c7ed2e1cbab6..c1e600a6f59b 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -367,9 +366,6 @@ v3d_job_free(struct kref *ref) dma_fence_put(job->irq_fence); dma_fence_put(job->done_fence); - pm_runtime_mark_last_busy(job->v3d->drm.dev); - pm_runtime_put_autosuspend(job->v3d->drm.dev); - if (job->perfmon) v3d_perfmon_put(job->perfmon); @@ -471,14 +467,10 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv, job->v3d = v3d; job->free = free; - ret = pm_runtime_get_sync(v3d->drm.dev); - if (ret < 0) - goto fail; - ret = drm_sched_job_init(&job->base, &v3d_priv->sched_entity[queue], v3d_priv); if (ret) - goto fail_job; + goto fail; if (has_multisync) { if (se->in_sync_count && se->wait_stage == queue) { @@ -509,8 +501,6 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv, fail_deps: drm_sched_job_cleanup(&job->base); -fail_job: - pm_runtime_put_autosuspend(v3d->drm.dev); fail: kfree(*container); *container = NULL; From patchwork Sun Feb 13 22:56:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12744730 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D0475C433F5 for ; Sun, 13 Feb 2022 23:03:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nZV++kqlw5zgUsJa1tdQRonU5Urzi3T5R9q3q6bbncs=; b=4RU8WIazRnw66e yX/XRO4yHQUbRczmVaW9CLCArQ+Gni82/g0z8me+Wji2kYJlDfwtREhiHLQsByq6fwb9YVtGdQmF+ j9rdPYXGsGqlCZCtr15xGOVO1eoB2xHDDr8/lFIXYRFaaIPJ4b3g9s8yan6RTfvHO7n7wEysS+e+2 jf+kSgppPQVV7NBf7NdgwvDVBmWIBWUsBkep7fcK0ehwks0JSdGjcV45Hn/igN152cuIaHcbrIhmT ofdbcOm/qoWOP81N9DIctAl2V6YJUH42f7m0r4WWLkjB0la9uzcthYFakwp8ModnXsrs81m8Xpit2 NVY7uFWGj6n4nBpAxWVg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNst-00Ck9s-07; Sun, 13 Feb 2022 23:02:23 +0000 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNor-00CiAN-Tm; Sun, 13 Feb 2022 22:58:15 +0000 Received: by mail-ed1-x52e.google.com with SMTP id y17so22609485edd.10; Sun, 13 Feb 2022 14:58:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NejYM/SCa/adQTW7MigR+R0AZ8Mjof70P4hDReGIkqw=; b=Pj0TyRueVaKWea76lADnqkyQk0FJ96Gh3fzpQdpLqI6EJAJ9Z0eeYCOeRhrODCnpff wV+9FYGxooHxyh2JvS20oGYqfz1k+bRIzszK6fV+HIWwyDl04WkPPm0ywtH5Xvzqkp3s znIauc+TyVEcw4lvpVNIDcFzbqsRJ8H81Udt76UnPtjx9YkxCRAFdoEEEU1FsnpE6y6N E7pAKTocjQ1vP+O9ZAf3PZ1S9UiieNhkco2iB7S9hNCExuM1wAcJkOBgdlnWlHgqll2I xToaFQTc6y4FSrY3nRMWZOmP8D2M7XaMYlPndBv2Onob6P4p66Hs++MOubAajYKPUJaw UnSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NejYM/SCa/adQTW7MigR+R0AZ8Mjof70P4hDReGIkqw=; b=c+tTftqf9JDcS4Esh9NISOWHo5AEMq8DCcp98XI/sGQkOdXRW/aRrPEifPNeqXkThE VjmmFzBSjMAfzLU9EY7rxOC98Mz47+aBIPmGYQ4nAqwrWr2VxWSlufNEgQIM/mGkDLNg R4Ov0Yoqem2vFdIp0T19qI4rqxZ2tWb8V5vQyBMQKkeWmj31Qgf9dYXDAXj6FxWFAk1s 4xE5CsBXIDIEC6CNYtUmqJhxqHqyGZsfRcPYg66C62785PZCwvkeRecMeW9YlW4ebh9F 1mACAOi1ljKbEYOXbeb0ju0K3koxuW0SqCv9UUwVHx6ixH+c7VEQirF/RIT/IYm2sq0F 8NBg== X-Gm-Message-State: AOAM533dJofLw1chVR751CAb2u9z/bsYs9PJeFYnFxqi/1WWl/iNbEgO iwnsQlOFgi1S1wuIUYdNirs= X-Google-Smtp-Source: ABdhPJxCeMxe71xsaWHClLlFyX4QlQOlzYsLbm/0woRoZB+8nGdWEGl3zXUZaTOTogbMT1gCeu2KcQ== X-Received: by 2002:aa7:da9a:: with SMTP id q26mr6131062eds.288.1644793092157; Sun, 13 Feb 2022 14:58:12 -0800 (PST) Received: from morpheus.home.roving-it.com (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id g14sm3189163edb.55.2022.02.13.14.58.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Feb 2022 14:58:11 -0800 (PST) From: Peter Robinson To: Nicolas Saenz Julienne , Rob Herring , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Lee Jones , Emma Anholt , David Airlie , Daniel Vetter , Russell King , Arnd Bergmann , Catalin Marinas , Will Deacon Cc: Peter Robinson , Nicolas Saenz Julienne Subject: [PATCH v4 12/15] drm/v3d: Add support for bcm2711 Date: Sun, 13 Feb 2022 22:56:44 +0000 Message-Id: <20220213225646.67761-13-pbrobinson@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220213225646.67761-1-pbrobinson@gmail.com> References: <20220213225646.67761-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220213_145813_986047_DF80EFD9 X-CRM114-Status: GOOD ( 15.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add compatible string and Kconfig options for bcm2711. Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Peter Robinson --- Changes since v3: - Minor updates for rebase drivers/gpu/drm/v3d/Kconfig | 2 +- drivers/gpu/drm/v3d/v3d_drv.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/v3d/Kconfig b/drivers/gpu/drm/v3d/Kconfig index e973ec487484..01d91c829107 100644 --- a/drivers/gpu/drm/v3d/Kconfig +++ b/drivers/gpu/drm/v3d/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_V3D tristate "Broadcom V3D 3.x and newer" - depends on ARCH_BCM || ARCH_BRCMSTB || COMPILE_TEST + depends on ARCH_BCM || ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST depends on DRM depends on COMMON_CLK depends on MMU diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c index 82af16523843..cec6e7858265 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -193,6 +193,7 @@ static const struct drm_driver v3d_drm_driver = { static const struct of_device_id v3d_of_match[] = { { .compatible = "brcm,7268-v3d" }, { .compatible = "brcm,7278-v3d" }, + { .compatible = "brcm,bcm2711-v3d" }, {}, }; MODULE_DEVICE_TABLE(of, v3d_of_match); From patchwork Sun Feb 13 22:56:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12744731 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9621FC433EF for ; Sun, 13 Feb 2022 23:04:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OhsoQJGdHBo5CsKq8by/sU3K9QQd0PO3HHuhOtwVPy0=; b=zFCMOtGcnE74Pr QlR5TzdllhNtOm3J6mfWfknzCl896SEC7Frf4VzBYokON9citPtkNMe+RIaTax6RnonNDErpLZDBp LW6vNbCYm6KmEPpaph+GDjvRNempgfjlAuPWPMDNcbEPA/Q19Zqo74cPFxzzyKQk0gjwj73ApIeMg 8a1tdFVyXhC4QkKFxbY8obEmn/A5HoQ0pMm+wQ9/qC7zp4l4SiqqHiu8wIq7Yk2VuujHiE0a/qAt6 S+eQoqZ5b5XjUsJbd2SGafDslWTiCVk9dFJfeJPFqsdP/7sWE2uxVWmsqeTaDOeIy8RU2eX6ARjeR ay11zxlFZf/WPwTMMYhQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNtc-00CkRK-BK; Sun, 13 Feb 2022 23:03:10 +0000 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNos-00CiAq-AM; Sun, 13 Feb 2022 22:58:15 +0000 Received: by mail-ej1-x629.google.com with SMTP id h8so7395489ejy.4; Sun, 13 Feb 2022 14:58:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ivZTnCer36jidFVyFQSe8jli8F6HVOlgrV0ncoMunP4=; b=BXiB0JZopaxdoC1803g5A+DWZq7uajcMVcVYnOWpUaOMo3zm5i8Hyj9hjtpBxzbj8S RgdypbHdhIs5j/9qSKoxpaEmFglkt0vkBZgg+YO3FwM2EexqempXPMf2aE5dBfYHMg8o 2oqau8hyn1LycZuBazvFgFbyrWkjZntCSEQ9Il68joSCy8K3fS81kvIjKxLNI8qR3mji fs5xp3SXCN4m/HnTjQymcznUSkNifdlwNRVIGWD9F+NJHM3qQW+moTqiJtmcqWqk8eAg d1yCN3V+FGbcdvp21GzndVWmXxcw5vjDhDKBR7I1asevS7oRm3ZwjfB0GcuSQntUV19M CmwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ivZTnCer36jidFVyFQSe8jli8F6HVOlgrV0ncoMunP4=; b=XUep9FDUAEM7iDCvONwgJNjShAoCAusQ2qAthJ75HsfeMuscbmOHsWMf3nCoE52iln G9eIMnMTxwZNNYKcB7oKw6mpd8a9gIKrkj0red9xdlHWz6snVn2/Et9wbOWK9jAUzfiv Z4xHJDDtw1iH5aRCeAm/LqwEaEk3yREb5YnLvD0jOx5WKu7fAUqvYyM8XQIInUqJ1HiR PTEtQ38R2ScOBPudxu31kgZRZrOcSrfgwCLtboU2bHJN/riM3VEgVjUyRHTcX2u3ydZ7 28fJwAZo2fEFyBRPQwdEorHub0Ah995QlZefQmXxFASXoaiavqJtOGmMJnLm+9tMoTWg 26EA== X-Gm-Message-State: AOAM531YDcOSG0Z063KRi3qkjqlTyFmoqGCAfdvtUECfvvNrPbOONvAh 8lGDvrWcpQQLaCp9Aoxry4g= X-Google-Smtp-Source: ABdhPJy1zgJHXR0xG+NxoKA/QqJCpy7K517B38I8JXVyJ+Vaa6qE0TSCVoiJKHHg4//tdK7D5GOW5g== X-Received: by 2002:a17:907:6298:: with SMTP id nd24mr9051878ejc.76.1644793093157; Sun, 13 Feb 2022 14:58:13 -0800 (PST) Received: from morpheus.home.roving-it.com (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id g14sm3189163edb.55.2022.02.13.14.58.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Feb 2022 14:58:12 -0800 (PST) From: Peter Robinson To: Nicolas Saenz Julienne , Rob Herring , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Lee Jones , Emma Anholt , David Airlie , Daniel Vetter , Russell King , Arnd Bergmann , Catalin Marinas , Will Deacon Cc: Peter Robinson , Nicolas Saenz Julienne Subject: [PATCH v4 13/15] ARM: dts: bcm2711: Enable V3D Date: Sun, 13 Feb 2022 22:56:45 +0000 Message-Id: <20220213225646.67761-14-pbrobinson@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220213225646.67761-1-pbrobinson@gmail.com> References: <20220213225646.67761-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220213_145814_403941_6362D7E1 X-CRM114-Status: GOOD ( 10.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This enables V3D for bcm2711 (used in the Raspberry Pi 4). Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Peter Robinson --- Changes since v3: - Minor updates for rebase Changes since v1: - Correct node's name address arch/arm/boot/dts/bcm2711.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi index 171fc5d2acef..9514c0ba481c 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -551,6 +551,18 @@ genet_mdio: mdio@e14 { #size-cells = <0x0>; }; }; + + v3d: gpu@7ec00000 { + compatible = "brcm,bcm2711-v3d"; + reg = <0x0 0x7ec00000 0x4000>, + <0x0 0x7ec04000 0x4000>; + reg-names = "hub", "core0"; + + power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>; + resets = <&pm BCM2835_RESET_V3D>; + clocks = <&firmware_clocks 5>; + interrupts = ; + }; }; }; From patchwork Sun Feb 13 22:56:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12744732 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ED94AC433EF for ; Sun, 13 Feb 2022 23:05:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=my7SleaXSTANSdCxqCcGSkNhD48RFzY2BiaGjKe4vzI=; b=wMMeQRJHn8+ojV KNeODxdMxTQeqKM13xTqDqdM4rD7eQp7inyN2QfUr8Ceu76+IHSrn+Sc4yUG9BqmKSygiWD6au9S1 A/Yi/LLS0N/f59pN+JjtaonQTZ+5tHxjZQZOJjevGGPDvL8WIZdW0kGAjl+7+S+TdKLykdkfnxREB LaEOPy+kG/ac3pEf0gpWF4agd13TnIZsvmha+SNRNIN6Mgtthhe/O4Qh9DfdOnwr/5hNT/4wKpR4H dJhS1bnHMyrWpimcPGzG/yks56xWMGsNGMVy44PISimCsNHrrZluu2T6waRLOA/lIA7waRp05fDbw dymI+kOf8JKpNmZjfAdA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNuI-00CkmK-Ra; Sun, 13 Feb 2022 23:03:52 +0000 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNot-00CiBl-BT; Sun, 13 Feb 2022 22:58:17 +0000 Received: by mail-ed1-x52a.google.com with SMTP id b13so24704705edn.0; Sun, 13 Feb 2022 14:58:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jQq/5Dh8W6JAfGKpRneZGJ1QMWx3eBuPlC7vcniS1Us=; b=Cjhw4u6ixFdzFPiBa4vUlu6gHXr9KnKSSTtmmp067Q7owC5JErVjkFvvhTp2sOFXYK m7ddyB6ls6+fgx3lCwxuKD83eYl6F1VWlX5KDhEzf/yzty/El2i/mToODicHmUYSoHBn sgzmyTd52UpmG/mzQuJi0tjsmhfrtUe1r4hPUuVD7n/Dr1/wlQCnjOsHhVVrhuRfVPsh DBKKUCEnn0JuuhKkssWgPYx05HLjVp+sOwQQTpi5D/vToT8fgleVT2WZtCVm9+jNtTTr KgLkrkm8CmnSDPMInp+eomU5rzsGWOPlN+YDTkKI/9lJ4bQUV44bvfAs7zUJc86aF2Iq MyUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jQq/5Dh8W6JAfGKpRneZGJ1QMWx3eBuPlC7vcniS1Us=; b=v8h8Yfd8S+dJcNoerzEmeQcLTv+0dMEjbV2AbLtYBh1u+CR+YN0EH+h2OwU+OtnAtc KDRifzcxaTepQ1xZzW9W5SQtM2tpfujYFnwRkuYyH0pW1YFcCVI+Zhe1VCO8xz13RMLl fiNbrJVaaaOKbLAA9Eq08YhtnSDVN9HD9ahQdGv/DxD2U7GmpLICix4b5NBi50q4HrD+ dPvzCMLbBpL6mPaKCsdey7Tma2e5c9pBqYMexmjO+QYMwEE9jtsZT2k4P+CzLOt90Oyr eTLkq/Y4HQn9x3JB/wus+lJ7kiVInX2xlEmVkMsGPqTodDXFrkeZXSerPT9TmxLqnyOk BCBA== X-Gm-Message-State: AOAM532anscs2a0qV/SFtHcdyGHYDhKuYss+1tMrNspH4Sm7orsd3Tzg vPNnbB2FVpP4PiHRgPBZcbQ= X-Google-Smtp-Source: ABdhPJwpbXvqTXPWfanIegqeSSXMc/D9nuYZSbPn6wO4ZrFisazGe1Lh+e6WfTkhT9/s/L+Urt2sZA== X-Received: by 2002:a05:6402:b44:: with SMTP id bx4mr8714266edb.59.1644793094192; Sun, 13 Feb 2022 14:58:14 -0800 (PST) Received: from morpheus.home.roving-it.com (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id g14sm3189163edb.55.2022.02.13.14.58.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Feb 2022 14:58:13 -0800 (PST) From: Peter Robinson To: Nicolas Saenz Julienne , Rob Herring , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Lee Jones , Emma Anholt , David Airlie , Daniel Vetter , Russell King , Arnd Bergmann , Catalin Marinas , Will Deacon Cc: Peter Robinson , Nicolas Saenz Julienne Subject: [PATCH v4 14/15] ARM: configs: Enable DRM_V3D Date: Sun, 13 Feb 2022 22:56:46 +0000 Message-Id: <20220213225646.67761-15-pbrobinson@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220213225646.67761-1-pbrobinson@gmail.com> References: <20220213225646.67761-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220213_145815_432802_731108F6 X-CRM114-Status: GOOD ( 10.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org BCM2711, the SoC used on the Raspberry Pi 4 has a different GPU than its predecessors. Enable it. Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Peter Robinson --- Changes since v1: - Correct node's name address arch/arm/configs/multi_v7_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 8863fa969ede..d203587194a1 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -706,6 +706,7 @@ CONFIG_DRM_IMX_PARALLEL_DISPLAY=m CONFIG_DRM_IMX_TVE=m CONFIG_DRM_IMX_LDB=m CONFIG_DRM_IMX_HDMI=m +CONFIG_DRM_V3D=m CONFIG_DRM_VC4=m CONFIG_DRM_ETNAVIV=m CONFIG_DRM_MXSFB=m From patchwork Sun Feb 13 22:56:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12744733 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 326EAC433F5 for ; Sun, 13 Feb 2022 23:05:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qtISvhDQ50eU7zdhGo/OfKgjW2ItUlgC2HZ5YS2Dhn8=; b=vA5MMnABkcCdb2 Voh8YJuOmKGSLTmTLN/CDYq4dvuZDgBG849kYUKRj64beMixx1N63s2Umy+FqQ3luPbu3LE2ElK6g SgYuBUv0+rYl8bikf4Sdwes/jCfqWnt87PcnfMbH3M6oOH4kAmeEiDzPW+Q+b/Ab6f4n+HoqkBh46 5LvCfdE11TnH4Yl5//l5c1IZpupBw6eZkG80JtONBIIBug2pKjvvVNLNteY1EV1I021GilGLk28BY EbEQr/AGX8rsj9zSckgKbwR8VS96usLJ+TQbNO7YUsagTJLKK3hsxfu0E6v4dn44f+nClRvJh4N7E 2BwlkvhX9eMsOThN7Atw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNus-00Cl1H-3X; Sun, 13 Feb 2022 23:04:27 +0000 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJNou-00CiCK-BP; Sun, 13 Feb 2022 22:58:17 +0000 Received: by mail-ed1-x52e.google.com with SMTP id h18so2284112edb.7; Sun, 13 Feb 2022 14:58:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DeA8sJTLeX1f23VP/qB2uKXNTXWzuAyJcUJkv7PfM7A=; b=Ii4P+2nMatW89/SB3uwml+dBUpj6exvUrq/VE4yXhtyGB/pmy3aiWeDV7JXm2VD7DW T+b+3he7diBJ6S1fDQoCZmGaIwPDW0QgNfIDecTYZClnqM1LB0MMMNLfNalKepkx+2Ug gVsxCHBfIbNxQt+wj0zeCbPgFEUPlV8a7CKoBDT/9fkJXYdQyV04lI1WS13Pc2YELk1J dY28YqIcpH78Oct3+CZQhD/tkVoaWwRtH7jLOIaJgyACI02wymu8Ln+o0mSBFuH6aPbz JWt0uKWETYMWVQWjRo2DrZeGvyJwF8F5Azl9JCIsjd1o9vxB/y1hmIemgRv1UcnNlLra 2vQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DeA8sJTLeX1f23VP/qB2uKXNTXWzuAyJcUJkv7PfM7A=; b=4JdgkWPsnkaKFDal+5dKOFMDhwmGxdQ68V98A7845OObFYwlvSxjZ47EDcWh9N3+zT Euyu0UoHpoTK8N3lgfHNwo6oprswGT9VYxiyXJNTwfHOCJBCnQCBLISXBwU7c3HUoLUp ARpe+D5koU4Ivb9+x9USp4HJs0F0a8Fq5rmuj8r9Omlv1sNaRDpnYULQaiYap6WhmcNS y0E3kmjl49b0MnVewuFgKy8Z4Ra/2Ctee20RRV2EJ1K5lifuIHWbknFg4fkuHfvgfWZI X9eYLOgclxnvGyQTVOXNku7suARyPB1NsakP2t1aLJMbWctJr0okqwYwNknRzUVOsPox krQA== X-Gm-Message-State: AOAM5314THqOXxLOEMiCstoWBgKVSqaqG70p9gHeleKgJZaC3I9SanBX R1KuVCa5L8WJk26wLKLp0Fk= X-Google-Smtp-Source: ABdhPJwSfACxl7vF/4R2z2dQcek4yNihS5ZSzklB/xs4DU0tywz09tFl9Z0HKnfYterJFz64JWO86Q== X-Received: by 2002:aa7:d1cb:: with SMTP id g11mr215973edp.400.1644793095189; Sun, 13 Feb 2022 14:58:15 -0800 (PST) Received: from morpheus.home.roving-it.com (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id g14sm3189163edb.55.2022.02.13.14.58.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Feb 2022 14:58:14 -0800 (PST) From: Peter Robinson To: Nicolas Saenz Julienne , Rob Herring , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Lee Jones , Emma Anholt , David Airlie , Daniel Vetter , Russell King , Arnd Bergmann , Catalin Marinas , Will Deacon Cc: Nicolas Saenz Julienne , Peter Robinson Subject: [PATCH v4 15/15] arm64: config: Enable DRM_V3D Date: Sun, 13 Feb 2022 22:56:47 +0000 Message-Id: <20220213225646.67761-16-pbrobinson@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220213225646.67761-1-pbrobinson@gmail.com> References: <20220213225646.67761-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220213_145816_481322_97F4814C X-CRM114-Status: GOOD ( 10.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Nicolas Saenz Julienne BCM2711, the SoC used on the Raspberry Pi 4 has a different GPU than its predecessors. Enable it. Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Peter Robinson --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 30516dc0b70e..0731ed941268 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -725,6 +725,7 @@ CONFIG_DRM_I2C_ADV7511_AUDIO=y CONFIG_DRM_DW_HDMI_AHB_AUDIO=m CONFIG_DRM_DW_HDMI_CEC=m CONFIG_DRM_IMX_DCSS=m +CONFIG_DRM_V3D=m CONFIG_DRM_VC4=m CONFIG_DRM_ETNAVIV=m CONFIG_DRM_HISI_HIBMC=m