From patchwork Thu Jul 22 19:02:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 12394499 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D60E4C4320E for ; Thu, 22 Jul 2021 19:05:20 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D95E660ED3 for ; Thu, 22 Jul 2021 19:04:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D95E660ED3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=i2se.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id: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:In-Reply-To:References: List-Owner; bh=wtIj8APRx3f1LkdX6TKzlLJw6hKg6hkZft4ykYDsX7w=; b=TLBbYGp3LwE2f4 5I0b9D/IeyJ/GgvZHps/JiwRMHQAz927utc4poPeJS0BoEPW8rJWLgyLoNU6UqUFlcswIp3lpSdWk gxfpTx+tyY63dIPz0+S0r7ZKUL6cZZPtKcjp59+jL/BAVHnXSaWRaBJGx5JhJoHohXA7K3y4mmaXP 6km0Fwuigc281KT4ce1EhyibCD8ykekx8zZFbjSRPzpFKB+FUedxsifuUsmvM+KEaywvxx+ULwvuS wyFESPMBUV905NZwOY7IPF/PtcF65QdiR3St59eldA4dJlJgwxBdfGY4EQUjhEJbH2HuJYgLlSN3m Af5Y66PxPKKjcpHpdIpg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6dyZ-002Tvr-Er; Thu, 22 Jul 2021 19:03:19 +0000 Received: from mout.kundenserver.de ([212.227.126.130]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6dyU-002Ts8-5p; Thu, 22 Jul 2021 19:03:15 +0000 Received: from localhost.localdomain ([37.4.249.97]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MiaLn-1lUJ9M2Eh5-00fkNc; Thu, 22 Jul 2021 21:03:03 +0200 From: Stefan Wahren To: Rob Herring , Nicolas Saenz Julienne , Florian Fainelli Cc: Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, Maxime Ripard , devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Mateusz Kwiatkowski , Stefan Wahren Subject: [PATCH] ARM: dts: bcm283x: Fix VEC address for BCM2711 Date: Thu, 22 Jul 2021 21:02:08 +0200 Message-Id: <1626980528-3835-1-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.7.4 X-Provags-ID: V03:K1:m+gtJAsQu3gGado4BZ0W8/gfi/o9zQQ8M74F6rwo3faScUMDQJr DOulsD9WkvkPZGnn4VFmR9zgy1MIe3yt9nla7Mv6GdpsqLoB4yvJ2i/21Y/PPhKHNi7G4UT ynn9SiKyJtcg9UjZc0mHEjRk2obecWlBSBiW7k2q621U6uGCgIo06kni2nBOmzGWSUb2Aoy uvc43oXQS8e3GU6QpTitg== X-UI-Out-Filterresults: notjunk:1;V03:K0:iZUQgPrQN+k=:uhn8RMjKCFTyqL3bIsQ4py ZKDO/0KxBFDypMeXVEMXYZPkGI9KrK8zm9v9omUM0UGXFrlwM/etMQRzlLnbyzhU/oXYQ3FPc X7p07YUvs+wonwJezsBL2I7sQXS2VM6fLdnB0BpxwWEeEBRWp4tBOlWCabF5WbcoB7RGezyJz 78OEYcW5VJHm2OKRmVTnBKyDS3HrpeFTApUyGn7QDegatdA4LlDB69XECRnYjvMtiaJNHjaCr ZoiDtTUXvs1nF1sbvEwjA7VtxxrwSLGyH8I8pWFmm3kaxIzNyzUZPODOFqXiWKAF5H7s97bEa tEwTneOQrtQ3NS6RtBqHz9mXfLHCAvky0nflcFlqzf75JBAyvAv0KemV+iQKsl/0Bt2RAzdbJ p/8Pz2rxTMlIOlykKoxm/FgIQMalXnIu6cSIg8EP93bsHSxIKa0RIvPfUPJsXMCZUFPNG8uWy qT5HReZ6OM4NrRrS2Yw11R56xHgqa84RV9dV2bPsld89+dMksW+1RFnGSXyLuMdBy9ykLZ+6x AIxf7/wIwJdiSu5HEhlwGKyGOjIpTsVdEB4kibIvu9DXQZUGD5+kcUsIXZisr8t81NGDmMxPc UZjE5K16kQJy/0/wLx74kl4v/5IA4P6tdAx4xwJ8Co0NvpD5SMDQWCfu1GxjaAjNpfUERWPOj wPkNWt7mtCCRojh/8dHlwqNXPLslBhAmn3gallhxVvtbAzDkwWY9CiZzhfDTzEQRaGX8iqOp4 TQYODbJYtzqyYnb5erU+FDvWcCYc5H5NYU4Gq4xcsQetghdijd/o5KD1yPTppJaVAkm7TnypF C5pyd3e6YWqzLxOxBngzsa5GOPztTJyMPeU9YjzgIWvGJ97Br/H7y3aVQHt8c0yx1MMVhscZF IW1MFBpHWSzEpFUyZHHQ== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210722_120314_559750_5A3263E5 X-CRM114-Status: GOOD ( 11.47 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Mateusz Kwiatkowski The VEC has a different address (0x7ec13000) on the BCM2711 (used in e.g. Raspberry Pi 4) compared to BCM283x (e.g. Pi 3 and earlier). This was erroneously not taken account for. Definition of the VEC in the devicetrees had to be moved from bcm283x.dtsi to bcm2711.dtsi and bcm2835-common.dtsi to allow for this differentiation. Fixes: 7894bdc6228f ("ARM: boot: dts: bcm2711: Add BCM2711 VEC compatible") Signed-off-by: Mateusz Kwiatkowski Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm2711.dtsi | 8 ++++++++ arch/arm/boot/dts/bcm2835-common.dtsi | 8 ++++++++ arch/arm/boot/dts/bcm283x.dtsi | 8 -------- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi index b8a4096..734342c 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -300,6 +300,14 @@ status = "disabled"; }; + vec: vec@7ec13000 { + compatible = "brcm,bcm2711-vec"; + reg = <0x7ec13000 0x1000>; + clocks = <&clocks BCM2835_CLOCK_VEC>; + interrupts = ; + status = "disabled"; + }; + dvp: clock@7ef00000 { compatible = "brcm,brcm2711-dvp"; reg = <0x7ef00000 0x10>; diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi index 4119271..c25e797 100644 --- a/arch/arm/boot/dts/bcm2835-common.dtsi +++ b/arch/arm/boot/dts/bcm2835-common.dtsi @@ -106,6 +106,14 @@ status = "okay"; }; + vec: vec@7e806000 { + compatible = "brcm,bcm2835-vec"; + reg = <0x7e806000 0x1000>; + clocks = <&clocks BCM2835_CLOCK_VEC>; + interrupts = <2 27>; + status = "disabled"; + }; + pixelvalve@7e807000 { compatible = "brcm,bcm2835-pixelvalve2"; reg = <0x7e807000 0x100>; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index 0f3be55..a3e06b6 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -464,14 +464,6 @@ status = "disabled"; }; - vec: vec@7e806000 { - compatible = "brcm,bcm2835-vec"; - reg = <0x7e806000 0x1000>; - clocks = <&clocks BCM2835_CLOCK_VEC>; - interrupts = <2 27>; - status = "disabled"; - }; - usb: usb@7e980000 { compatible = "brcm,bcm2835-usb"; reg = <0x7e980000 0x10000>;