From patchwork Wed Jun 1 12:53:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 12866894 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 35071C433F5 for ; Wed, 1 Jun 2022 12:58:19 +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=uIU09euvkPGHr00kQbBBFLvMpavOHDm5ndkHmdK2H1g=; b=hdoaIHOpiUcuxM u0vO0OmuY0MjNMyJEt6DaIm4mpHmGmZ/Ngv/XfW2TpjdevJHJx5Frf/uKBkotm03C8/HiogOESxBP ktyV6gciEMX6yKWceJhSrbx50+pZ2uwzKqOjk9p6jk9hRfl6TjjUiwAEFAmoMpnUsCM7TaQ6XfVjf wpwQRpj4ynXWH2v3jZolCr43+oYV4Td2jQgb1PoQ+r2yGlCXkM6dlwx19tmOgQzsQHDjNlfmztUtl Wf8566e2Lm12wNHcCbepm/+HllhNFHoZQD0GgcWy1huUGogHIHumfm7PJB7P/e9M/V4TNY2BwsBrz usR/wRpOXr71+NPPLm1w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwNuB-00G8nR-MV; Wed, 01 Jun 2022 12:56:56 +0000 Received: from mout.kundenserver.de ([212.227.17.24]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwNrc-00G7Zy-QP; Wed, 01 Jun 2022 12:54:19 +0000 Received: from localhost.localdomain ([37.4.249.170]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M89TB-1nrB4J0sTr-005Ggx; Wed, 01 Jun 2022 14:54:04 +0200 From: Stefan Wahren To: Florian Fainelli , Ray Jui , Scott Branden , Nicolas Saenz Julienne , Lee Jones Cc: Peter Robinson , Melissa Wen , Phil Elwell , bcm-kernel-feedback-list@broadcom.com, Maxime Ripard , devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren Subject: [PATCH V2 07/11] mfd: bcm2835-pm: Add support for BCM2711 Date: Wed, 1 Jun 2022 14:53:40 +0200 Message-Id: <20220601125344.60602-8-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220601125344.60602-1-stefan.wahren@i2se.com> References: <20220601125344.60602-1-stefan.wahren@i2se.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:eoCMsoXQgaQCbqLEG+0vcMzD3Q3Cof38P0qGymrgLmHtCmtN5WL 5fMLWYzXHiEITgTcgCV3o2OHBasBX2KXNCrWUNEAtXmP5O+xiLwobrX01OksgY2Cad2rICg OWP8B1LGkstwJilWUJEFQKPuJUfFEzANODpKQrkrBnBaj77qZp4SlefXh2h1PqV1lCM3be6 NVEsnDwG79+anVFXTmUFg== X-UI-Out-Filterresults: notjunk:1;V03:K0:sMHrttctx/E=:tWlTZd2Y5d9iI/3U+HZREv K3N8VlvGp8lNV1rZ//TRC7tY/HpebMynZPJmNEV9YTlDc3XQWi3eE5LVjcnvQ+CEDtdghfZ7k /mHiBFkvVPbW7f4C3InyI4QGOyubV+3tuG1PFYhTZ3P9pWTzsjUmJC7C8Yd4yowFShbg5xlGg Esa3Ei6jr0chrJcUzvMPyt93oMs1wV1Xe0t/F3bGCbJ+4gebDPNafFJEl1fGqZad5aMV3OUz+ b7q+RF5WtKP8OxhLWGJDwbtWr4SEAPu0rzXkjWLfpaBKE0ORZgTTmnL9or6UoRLaMWusOv6hj fVlnunQ9O6dVM7zNz9th4AJfjPw8EkAD/Ns1/mXhfK/0tx+rbDIItaCu4ZmX+kkQi2HzQ2A6h tQK2uSA7boL41D2A4V7hKUgolSOpbUDEfsBzGUGH4vhqReSTIRdy+3wkhz683Sr+fMIQPql9O g8npVOFsTe4BUpN4AppPDmBjgAmrVguTOa6En/HO5PYvjbY0Nl9sXFN1eWxeyiiBgMPa9tAXS t2lSDIchyEI2SPUP0gwQOghTW8VlSbz0RXv6jCgmxexy5pTeI1JWoUXByYGv3qqx2zmooU90n 1VGcMqH4pnIVAus0Eb15VXcHbvVhojHrdOfRFZRfTa27iAjGAINe0ai+xvmeNzstqsztDm04q gZlS11DbVioklmJ4ndAM06vXMNbKTuJTMTHJ1nMXAr0sQjihDcX6Tvnlhuj4mukVq1J5KvxFD y1zAuypbn165Q7h87Leb2Cr7ogscz7uZmIU/rC7IQqU0iitZmC8cYuUo2J0= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220601_055417_255420_2724A6CD X-CRM114-Status: GOOD ( 20.07 ) 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 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 DT files that didn't use 'reg-names.' Signed-off-by: Stefan Wahren [1] See: 7dbe8c62ceeb ("ARM: dts: Add minimal Raspberry Pi 4 support") Reviewed-by: Peter Robinson --- drivers/mfd/bcm2835-pm.c | 21 +++++++++++++++++++++ include/linux/mfd/bcm2835-pm.h | 1 + 2 files changed, 22 insertions(+) diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c index c1e81a4541d7..e65aee6f9b84 100644 --- a/drivers/mfd/bcm2835-pm.c +++ b/drivers/mfd/bcm2835-pm.c @@ -28,6 +28,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 = of_device_is_compatible(pm->dev->of_node, "brcm,bcm2711-pm"); + /* If no 'reg-names' property is found we can assume we're using old * firmware. */ @@ -39,6 +41,7 @@ static int bcm2835_pm_get_pdata(struct platform_device *pdev, return PTR_ERR(pm->base); pm->asb = devm_platform_ioremap_resource(pdev, 1); + pm->rpivid_asb = devm_platform_ioremap_resource(pdev, 2); } else { struct resource *res; @@ -50,11 +53,28 @@ static int bcm2835_pm_get_pdata(struct platform_device *pdev, "asb"); if (res) pm->asb = devm_ioremap_resource(&pdev->dev, res); + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, + "rpivid_asb"); + if (res) + pm->rpivid_asb = devm_ioremap_resource(&pdev->dev, + res); } if (IS_ERR(pm->asb)) pm->asb = NULL; + if (IS_ERR(pm->rpivid_asb)) + pm->rpivid_asb = NULL; + + /* Ensure that rpivid_asb is set only for BCM2711, so subsequent + * driver can rely on this and don't get confused by broken DTB. + */ + if (pm->rpivid_asb && !is_bcm2711) { + dev_err(pm->dev, "Unexpected rpivid_asb register, please fix your DTB.\n"); + return -EINVAL; + } + return 0; } @@ -95,6 +115,7 @@ 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,bcm2711-pm", }, {}, }; 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 */