From patchwork Tue Mar 15 20:09:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Thierry X-Patchwork-Id: 12781816 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 435FBC433F5 for ; Tue, 15 Mar 2022 20:11:14 +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=mpOtEd13VnZ5H2 GFYHVu14TtW9TpnJ/lud/AqiWf+ijvHnPl32Uvu7fH698/dblCFya8r9RoSh7wCNHoUcstbKJvW4Q 0n8tUFbvqhmvpwIIczl+yCxaPhajQRBYs9nVB6jvsYK2g1bA9H9ED19UuSbaObbnON/+lEtsrmY2h 7mC3O+nxj08gedmSpBJe1DcVcvafyDESTOPRIzfc8gm7OePKa11cfDn45IL+5r/THZL3sqwNaqfed mY2/nnkm0dsl2AY5D3pJpzdUZKkx7ANFs8tuotehZ98NIzJK39z00VMSAofyELckYVRzOOYSlzKu7 sjt2YF1KFD0XXJA+5/vA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nUDUf-00AX7G-Vm; Tue, 15 Mar 2022 20:10:10 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nUDUI-00AX0J-El for linux-arm-kernel@lists.infradead.org; Tue, 15 Mar 2022 20:09:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647374985; 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=Ff9tdyuDJjRBkAuu+qtygmkcchQold0QRyQVQOrepJSziLRlWAAewmtEVwKRVE/NQMOsiB qsT+fLEAEQJnnYQxLxv43xMXhVMmNBFLvoq+UxjAbwXVMPrd4r96LD7ZuqW9QoCl0gS7KY 0/hFZvan6YeK4Vh0Cd6bRNdhyTEcEA0= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-226-waNTEjXEMeOhuNqssq4Ezw-1; Tue, 15 Mar 2022 16:09:44 -0400 X-MC-Unique: waNTEjXEMeOhuNqssq4Ezw-1 Received: by mail-qt1-f198.google.com with SMTP id h11-20020a05622a170b00b002e0769b9018so106802qtk.14 for ; Tue, 15 Mar 2022 13:09:44 -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=p2g0UHailmsBDoNjO2waopAv1+6u3qMh5dlDrwTX7ygm2r7G5TKWVDWRHL6cPiP03l FBGDDr5g4h34Tw8u5qll03ssWLIxtwerlwv1o7IRsgDlXFno5CyCRIP58LJ2Xmj9FiX+ E4DdhIuNQGe0+pZXucBAyEDHehjThWeZZiR3n64GjtMvGrk6qEW8NLUqYuTjRmx4QUMV +rNUBT3cZYLJw0TttvMQr4bkAqD6W1oeB6c23Vctlqe8bC+pYqsyh/7zaXFAtYIwWLj8 bY7/ig4gV0zyNuJsubv7Sqt1ujQkzA4dXRCO1QIvIzzO8IbQpiMvaNkMLngmQ0Ce+UOp HSqA== X-Gm-Message-State: AOAM530fGkJ2kD7b4ZijL5km/fmgTMzLYQ7OPwjWmh8HZQLRQzuw+g+c 4ebObuSr01hleVx3Qpw8nmB7mNEgjKa4JH1bZsuvDr7v8WQj/+y9SnBblOqLAgPtqC8wU6NqpmR aGVn/VdaAO6vl9ZxefBiySZUYCb2RtVoN8DE= X-Received: by 2002:a05:6214:27c6:b0:438:ff55:f2ad with SMTP id ge6-20020a05621427c600b00438ff55f2admr19812284qvb.14.1647374984300; Tue, 15 Mar 2022 13:09:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBAm8qJM4uO8E8XkhhgJ83X1MYV1taiReK2amKwIwz+dojqDUprSq/T2eq8pIQxnEiC+JolA== X-Received: by 2002:a05:6214:27c6:b0:438:ff55:f2ad with SMTP id ge6-20020a05621427c600b00438ff55f2admr19812260qvb.14.1647374984094; Tue, 15 Mar 2022 13:09:44 -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 197-20020a3703ce000000b0067af869ffa6sm9582433qkd.127.2022.03.15.13.09.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Mar 2022 13:09:43 -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 2/2] staging: vchiq_arm: Use bcm2711 compatible string for bcm2711-based RPi Date: Tue, 15 Mar 2022 16:09:29 -0400 Message-Id: <20220315200929.74952-3-athierry@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220315200929.74952-1-athierry@redhat.com> References: <20220315200929.74952-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-20220315_130946_647254_81549BAD X-CRM114-Status: GOOD ( 15.26 ) 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);