From patchwork Fri Nov 12 12:04:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1554289 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=scaz2Hgl; 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 4HrHM41j23z9sX3 for ; Fri, 12 Nov 2021 23:04:32 +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 1mlVI7-0006tg-3k; Fri, 12 Nov 2021 12:04:23 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mlVI3-0006oK-2e for kernel-team@lists.ubuntu.com; Fri, 12 Nov 2021 12:04:19 +0000 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.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-1.canonical.com (Postfix) with ESMTPS id D607A3F19F for ; Fri, 12 Nov 2021 12:04:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1636718658; bh=a1VqVwa5T8soQgVBav9xueIaQv9IpQ5mCqjoJkVjqBM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=scaz2Hgl7FeZg2Z9PWkhxmrLlWb4WjfSikjrx5HTNhoa7M8ZUQPX8vdQhK95GpRJJ KCC1Vh9X/xgbpgDsHZO+yl8CTuUgMAlaNlXhSJS+oyMPXvlykBrJNk8ZVAhFwUSDvd ou5GHIcIAQJPUKxB5n0iPdTXR1B8KLqgp25aCJok22J0Fuz6YBvHI2aTbzeBGkKcEK CG4IW9vKwCknKZ/9JrQeXfNPj/fMz/8MFvwBT/sjwgyyjVX4RnUdzcMtEtiWDItQ9n N1HSDh5SYnqgpRZDa2lWMpQ0PqcmmBTcJ4ufxQBMvRniUh0FxNAmGv/kRmnw/HDKgC rP0dKwQAmMjOg== Received: by mail-ed1-f69.google.com with SMTP id f4-20020a50e084000000b003db585bc274so8021505edl.17 for ; Fri, 12 Nov 2021 04:04:18 -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=a1VqVwa5T8soQgVBav9xueIaQv9IpQ5mCqjoJkVjqBM=; b=J45kSP1gZgYXq+CEq9WJgEXZtBFPFAYr58T56fRHisng5F56vWyn3gai2aesCZWaPA 3WseicQY6P+pSuBDuPgH9WhDEsiRH6ZIcoABhFUm1xQyhBaS4HS7MMiyEZdv3dVYduMy nZw2u0WrZFlOspannlq5iZVo8GHx72eJmYcCmYKQw2XrePqoxuzuF5KOxHhZc58sPFZv HJq31ne74VCXWAOFTBztJ6r559NIjep+BJCvHqC1/H8rMiw7dAfeBes3K+JNEQ8bBojF xm+LDmIGWKde6ZjevoneYGbNLSimhlc4qBsc2W87CiXYpeXe0akuipTKaZfvLGR1sMI4 O0kQ== X-Gm-Message-State: AOAM53305e0C8cXPns2YpY6K2C7H0G3+4gRnUWF1WBLOYAjJ2TGtwsGY ZTpAA/v50FG92p31UiogJWsThtDG/fXZkv53HYX03eaKgcL59xI6ERbSp46/rRk7Y3bucWfiV7m Ryzs2KtH56FP7hwKYPcNvUg+kSu7CEsUrW/qPOafFTQ== X-Received: by 2002:a05:6402:5109:: with SMTP id m9mr20334557edd.15.1636718658228; Fri, 12 Nov 2021 04:04:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJxWYj88/JlcSiLww9aOo5Os4mbwPb+u15PhZYnX3TeNs2X318BPEBBu6lc4cyOXedZRmfd5ow== X-Received: by 2002:a05:6402:5109:: with SMTP id m9mr20334498edd.15.1636718657882; Fri, 12 Nov 2021 04:04:17 -0800 (PST) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id b2sm2961443edv.73.2021.11.12.04.04.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Nov 2021 04:04:17 -0800 (PST) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][H/raspi][PATCH 4/5] ARM: dts: bcm2835_audio missing firmware reference Date: Fri, 12 Nov 2021 13:04:10 +0100 Message-Id: <20211112120411.1541681-5-juergh@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211112120411.1541681-1-juergh@canonical.com> References: <20211112120411.1541681-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/1950064 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 linux-rpi) Signed-off-by: Juerg Haefliger --- 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"; };