From patchwork Thu Mar 24 17:26:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Thierry X-Patchwork-Id: 12790937 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 585FAC433EF for ; Thu, 24 Mar 2022 17:28:43 +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=uvQde0NlqT7EkO+VJx3O2OLnlcm7Ss2N+lr+HnObKyo=; b=wyoKAZCt3/ryig zBJ7LKQSxA8yFpXRdzG0ANge1CnHJa0KGcz/omrcAWUw1zWkb6GrzZ+KCBMNtnwrAvftfix5rqR0r 3e/XCyJ8IwIKGKAE7svPncJ2SZHPuY8NXGHZ4vK1PJc3PgZhmes7uD6F0KMX/5vdGDD9C1Mv1sBMz ErT7kbRLsNChexTFshtsR338PE3xE1jZ2LZBl4SoJo4KIupuSLeMUmKoBZfBqtU3oRJ9eA2jlXLwm wDYTjuJHoxt5q4AgXymYrq4ogf7ZvlaRDpKpVeSS4o9nOe7VcVxXobaQDwnZxqc1RTLEd7yBW+/Ze HGkJ0ch4YAbheDa+6k8g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nXRFK-00HMkK-Gr; Thu, 24 Mar 2022 17:27:38 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nXREr-00HMam-WC for linux-arm-kernel@lists.infradead.org; Thu, 24 Mar 2022 17:27:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648142829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OIJlhxZQII2b1Vl5R2eePvHRFchgJiZqPqucMSOZBVI=; b=RbFDebPx9iJHNMSrurXpwAnAi0/kVpyXXd81U2UUY8HjjUjGc8LoUJgNNnTKCH5McRo7lg Qje1DphbE9DWnYU/BV2PKvGP/rX92tz6Yqp/eHA32qv/yNQptYoCZTuHzdvJUWWyiafqQs R1GgrHpz921Dn8eUgFGAaYJ2o2TSiz8= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-147-SijgS_HAPnqu8ICy40nuww-1; Thu, 24 Mar 2022 13:27:05 -0400 X-MC-Unique: SijgS_HAPnqu8ICy40nuww-1 Received: by mail-qt1-f199.google.com with SMTP id m12-20020ac807cc000000b002e05dbf21acso4162949qth.22 for ; Thu, 24 Mar 2022 10:27:05 -0700 (PDT) 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=OIJlhxZQII2b1Vl5R2eePvHRFchgJiZqPqucMSOZBVI=; b=a4kX6L+dFyKJp285co0nk2ohsDewF6jwnE3JoQ+2P+jAxPN5UCyT/PQLVDlGjr9txo 8swhdSU06tokwcU1B/3LbVrzwVqWO8kLg/1XEZxGSTXdGUkKyKNVOpljqY7luZuA7lDt LHTiFs2J5eeoW2NBa1/MRaAbS5tRpyMyLC8369w21wLWChHVGHA+naUheLMteloX1oEx jQfXurIqdFqUUEs+D9XckU22x+sLmNekSyLc0Ek5EMQvk38GY0WiZx5r1wX9/sK8viTP 7W0Q+aDvT95GH+OZbu4I5+J1w8ov67hlPPFxR2UXYhIa3hQ9ATobX1+hYtx7PNGJAekv mPbQ== X-Gm-Message-State: AOAM5337Y6nQjOMvMACxFMGJxfjIn89nbcPJmODn6o6saGQ3ZofltFAu B6aVtuSotkipQ1Y+SyPYvlDuY7X2Vt9BearCe8dSYyih2KAFExy/yFEQE94w951TwGPUnvQwHzu NlBW7TanubpKGN2R4wgfpo877zw2b4hByFMI= X-Received: by 2002:a05:620a:a57:b0:67d:396a:8a9d with SMTP id j23-20020a05620a0a5700b0067d396a8a9dmr4150360qka.322.1648142825405; Thu, 24 Mar 2022 10:27:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxB5F5wgV7J5cTSYxSXNzkylFEPJGtGrvg0qTVvsWiiJ29lM4a+bp0esEG2VaB8Mu4hX9z7ng== X-Received: by 2002:a05:620a:a57:b0:67d:396a:8a9d with SMTP id j23-20020a05620a0a5700b0067d396a8a9dmr4150351qka.322.1648142825215; Thu, 24 Mar 2022 10:27:05 -0700 (PDT) Received: from fedora.hitronhub.home (modemcable200.11-22-96.mc.videotron.ca. [96.22.11.200]) by smtp.gmail.com with ESMTPSA id bm21-20020a05620a199500b0067d5e6c7bd8sm1886515qkb.56.2022.03.24.10.27.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Mar 2022 10:27:04 -0700 (PDT) From: Adrien Thierry To: linux-kernel@vger.kernel.org Cc: Adrien Thierry , Rob Herring , Nicolas Saenz Julienne , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, Stefan Wahren , devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Greg Kroah-Hartman , Gaston Gonzalez , Ojaswin Mujoo , linux-staging@lists.linux.dev Subject: [PATCH v2 2/2] staging: vchiq_arm: Use bcm2711 compatible string for bcm2711-based RPi Date: Thu, 24 Mar 2022 13:26:47 -0400 Message-Id: <20220324172647.167617-3-athierry@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220324172647.167617-1-athierry@redhat.com> References: <20220324172647.167617-1-athierry@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=athierry@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220324_102710_174740_C4777669 X-CRM114-Status: GOOD ( 15.25 ) 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 Use bcm2711 compatible string in vchiq driver and device tree for bcm2711-based Raspberry Pi (Raspberry Pi 4). This is consistent with what the downstream device tree uses, and allows running the vchiq driver on the upstream kernel with the downstream device tree. Signed-off-by: Adrien Thierry --- arch/arm/boot/dts/bcm2711-rpi.dtsi | 1 + .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi index ca266c5d9f9b..c868d1dcaba7 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -70,5 +70,6 @@ blconfig: nvram@0 { }; &vchiq { + compatible = "brcm,bcm2711-vchiq"; interrupts = ; }; diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index 3a2e4582db8e..136c664132f4 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -81,6 +81,10 @@ static struct vchiq_drvdata bcm2836_drvdata = { .cache_line_size = 64, }; +static struct vchiq_drvdata bcm2711_drvdata = { + .cache_line_size = 64, +}; + struct vchiq_arm_state { /* Keepalive-related data */ struct task_struct *ka_thread; @@ -1748,6 +1752,7 @@ void vchiq_platform_conn_state_changed(struct vchiq_state *state, static const struct of_device_id vchiq_of_match[] = { { .compatible = "brcm,bcm2835-vchiq", .data = &bcm2835_drvdata }, { .compatible = "brcm,bcm2836-vchiq", .data = &bcm2836_drvdata }, + { .compatible = "brcm,bcm2711-vchiq", .data = &bcm2711_drvdata }, {}, }; MODULE_DEVICE_TABLE(of, vchiq_of_match);