From patchwork Mon Jan 17 08:12:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1580625 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=vnWgwM02; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jcl5F3yzrz9t56 for ; Mon, 17 Jan 2022 19:12:48 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1n9N82-00056h-Ha; Mon, 17 Jan 2022 08:12:38 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1n9N7z-00055l-7B for kernel-team@lists.ubuntu.com; Mon, 17 Jan 2022 08:12:35 +0000 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id E08563F19C for ; Mon, 17 Jan 2022 08:12:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1642407153; bh=picA8G/eCyuYL6Y7GyBqS6vAgzrHiJ5WVnyLd8K9jqg=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=vnWgwM02YpzbLorUuMkyk2+tL8r5RiL9wmEu7QYWlI5IMJ9Pm8ughQ4k3YvJDsc/M yxUDCcN9x4uZfk07QHfJAOQvfNEH99U0X03eiMO4Uz23Q/oUkCe2I0Ltv4DcDvugRv z1JMIPAsWko1zHTtguYmJM2WvNgeI3U+6BYwQS3oc0YH9C3nie+Y3T882XmyQ+uTt+ QdB3Z/PNs6/TXVOkyPNxseTRBfrwez+0THxwvjo8uolbLNaWbhopmD9thh7xLoQu8U xTPvwHPb0okQffMdy+uTuPjCKhvRbjyNsArL5pKYU1VIo2GCFGFCUbXdieKdlxPrTQ j+VHQbTXqXGtQ== Received: by mail-wm1-f69.google.com with SMTP id k36-20020a05600c1ca400b0034aeea679a5so3640288wms.0 for ; Mon, 17 Jan 2022 00:12:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=picA8G/eCyuYL6Y7GyBqS6vAgzrHiJ5WVnyLd8K9jqg=; b=Lb+kL41DddSb1ITjKwTiRtoDx9PHkN3ZT/Ec7z4YxjYTKwN7tP1IV7BpJHXe7A9jQ0 /QKbFrDpQwCM5mEBLsTpVXV9FHydqKLIF0Lzwz/mYoK4msQfwkEg2FSIzRQykoFlMkaG 7U4zXqyIXddjRaYsw1DfsnegwUOjg9YS8biKmKHuSEps7wAMnhyIeqteFtjJAeaKQjiV X8IdlUTEyyl747j26EZFyQ7+EFc8u+uRCTZVc7uXcRnuFQwGS8K91UhEmfIXKoc8VveV JgCk8SsInkCQLyS2W3uUdOtq+lJBR95h5oaCnIi2/o4SVjEND/HL5EjX+UvNjPJNHlHq 03ZQ== X-Gm-Message-State: AOAM532r+8q6YY/G8+4h//8GggRWKB1aZ5SaE9cvRq31ZbaNkCS/XnFr 5qQpn7VC1MinelFm5WwH9UQJl3cSPyRRrLOSu17mN/TX+N9PI9FHfFNkrNzCMqCCJDU9/LXxVCu T29Vz4wfJOQYx+P7xu3Gz+Tk5PYaG/WtEOC2/bc/FMA== X-Received: by 2002:a05:600c:5127:: with SMTP id o39mr8528021wms.81.1642407153593; Mon, 17 Jan 2022 00:12:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJxjqWlSHWTzi4PGnIrrYOcO/WaaQ3mqxXh4Ru7wLMNO7k5CEVYkenyqmAO+PQcjuzg9w6Y73A== X-Received: by 2002:a05:600c:5127:: with SMTP id o39mr8528010wms.81.1642407153435; Mon, 17 Jan 2022 00:12:33 -0800 (PST) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id g13sm3601880wmq.22.2022.01.17.00.12.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jan 2022 00:12:33 -0800 (PST) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][I/raspi][PATCH 1/1] ARM: dts: bcm2835_audio missing firmware reference Date: Mon, 17 Jan 2022 09:12:31 +0100 Message-Id: <20220117081231.104490-2-juergh@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220117081231.104490-1-juergh@canonical.com> References: <20220117081231.104490-1-juergh@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Phil Elwell BugLink: https://bugs.launchpad.net/bugs/1957198 The firmware driver has been changed to count its clients. An earlier commit removed the downstream patch permitting the hacky technique of passing NULL to rpi_firmware_get to pick up the last instace, but failed to add the necessary "firmware" property to the bcm2835_audio node. Correct that omission. See: https://github.com/raspberrypi/linux/issues/4634 https://github.com/raspberrypi/linux/issues/4635 Signed-off-by: Phil Elwell (cherry picked from commit 214bf6b3eeae500ac13887ce7b2cca576191f38e rpi-5.10.y) Signed-off-by: Juerg Haefliger Acked-by: Stefan Bader Acked-by: Krzysztof Kozlowski --- arch/arm/boot/dts/bcm270x-rpi.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi index 68a7e1c09db1..965eafbc383d 100644 --- a/arch/arm/boot/dts/bcm270x-rpi.dtsi +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi @@ -148,6 +148,7 @@ &vchiq { /* Onboard audio */ audio: bcm2835_audio { compatible = "brcm,bcm2835-audio"; + brcm,firmware = <&firmware>; brcm,pwm-channels = <8>; status = "disabled"; };