From patchwork Tue Jun 27 20:16:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 113592 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8456962vqr; Tue, 27 Jun 2023 13:36:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4hIi4CfVccq7h9m0dJiVcHcHlSxKdIIpHu6hk09VWUl026eJMp2p5O4HbPCaBM464aTqyS X-Received: by 2002:a17:90a:4607:b0:262:a37a:e940 with SMTP id w7-20020a17090a460700b00262a37ae940mr8104851pjg.4.1687898189634; Tue, 27 Jun 2023 13:36:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687898189; cv=none; d=google.com; s=arc-20160816; b=DyUKEEVgoWCCJ7zYhGnQYLQFcA5VK4mBp9UQEsMITvSduRUUyZxy0/0CJ6Witgg+Is KWlZDsh4nCGcaEUrvEqJ8tP42p53pS1RIbxpg02BHkbLwHpVLdFhnb+wgvq50GgOqIHX LESDV44Flh/sObqUIZitir3Jgmn+cxDnSJMlMa/NAD1jga9m9bU5KeZO8abCM8+BlYAV IiMeDD1wqUlJ902ATgGeXzgAI8pfTIMAIwOWucPvLqLWYBvhFvibdvMzcdak+7tG2gfP a4H9ioESCkRbqB/KN3KAL9M0xzSklKpsZPyOrOHhfCKOt/XdebtJ9JAqLlgtLy/C4TYh yYvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wXh19+jRdNyJwViZDsuT1e6i0xU3XUKCy/LpPEk0q8U=; fh=KJ7fz4phEMuOPL/5CIrq/GEqblJHB3UXSqcptreppbo=; b=JqCmrH38QyyHUPCgaWhydPUxm093Mcps9GS+JoBYb9gOj+To6ReIHDH5v6cYu5Tits A4ZGYc0XZYS5fBc063+to0DzM3MxhjA+Z4F7MV1jGcNzp3UG389qT0AclXIUkxluqnB6 IiPq8w9UM7rRC46KxaHa1KSdpoqdU+P07kvpuxVrej1BukfOOZJN5Lb50eKjVkWQITJj LXFfy5eab7xcgwh+60lmU7YVVeBs1zYLP9maI23V3lPvueWI7ZjzbPG2A6yr6SmWx0tQ gAaU16PR7wEZUEwHqIvWQwhGTSsWbQVXZDNlBiA6V8bkFDtSuadL/RBiOywJe6p+SUd0 7AgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b="YgfQ/hYx"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d8-20020a170903230800b001b82a4d3ea7si1060251plh.249.2023.06.27.13.36.15; Tue, 27 Jun 2023 13:36:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b="YgfQ/hYx"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229482AbjF0UUR (ORCPT + 99 others); Tue, 27 Jun 2023 16:20:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231370AbjF0UT4 (ORCPT ); Tue, 27 Jun 2023 16:19:56 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9304130D5; Tue, 27 Jun 2023 13:19:28 -0700 (PDT) Received: from umang.jainideasonboard.com (85-160-38-115.reb.o2.cz [85.160.38.115]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B9B5A31FA; Tue, 27 Jun 2023 22:15:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1687896958; bh=XFgDh+fTQMRiqKvrJjuyeVA6evMq+BgXAzNfMVVf5k4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YgfQ/hYxACcrzpQ6qGDoqppJzlq4vaKzImYQQfZ4ZvOlo0JDSP6lEPNAvjz1Tm8GR TOfti7N/dvhd7b1xH2GDF5AWl2hMkm608zhAg1Gr8a37UYgEW5aaPUGTG+3WE4u6fu lF+bpcrTKzw5Ltx4hG3r1KLE/rPBl2KjF8A7KDC8= From: Umang Jain To: linux-staging@lists.linux.dev, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: stefan.wahren@i2se.com, gregkh@linuxfoundation.org, f.fainelli@gmail.com, athierry@redhat.com, error27@gmail.com, dave.stevenson@raspberrypi.com, kieran.bingham@ideasonboard.com, laurent.pinchart@ideasonboard.com, Umang Jain Subject: [PATCH v8 4/5] staging: bcm2835-audio: Register bcm2835-audio with vchiq_bus_type Date: Tue, 27 Jun 2023 22:16:27 +0200 Message-Id: <20230627201628.207483-5-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230627201628.207483-1-umang.jain@ideasonboard.com> References: <20230627201628.207483-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769889531949860630?= X-GMAIL-MSGID: =?utf-8?q?1769889531949860630?= Similar to how bcm2385-camera device is registered, register the bcm2835-audio with vchiq_bus_type as well. Signed-off-by: Umang Jain Reviewed-by: Kieran Bingham --- .../vc04_services/bcm2835-audio/bcm2835.c | 17 ++++++++--------- .../interface/vchiq_arm/vchiq_arm.c | 6 +----- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c index 00bc898b0189..f81a9a4fbd5d 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c @@ -1,12 +1,12 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright 2011 Broadcom Corporation. All rights reserved. */ -#include - #include #include #include +#include "../interface/vchiq_arm/vchiq_arm.h" +#include "../interface/vchiq_arm/vchiq_device.h" #include "bcm2835.h" static bool enable_hdmi; @@ -268,9 +268,9 @@ static int snd_add_child_devices(struct device *device, u32 numchans) return 0; } -static int snd_bcm2835_alsa_probe(struct platform_device *pdev) +static int snd_bcm2835_alsa_probe(struct vchiq_device *device) { - struct device *dev = &pdev->dev; + struct device *dev = &device->dev; int err; if (num_channels <= 0 || num_channels > MAX_SUBSTREAMS) { @@ -292,20 +292,20 @@ static int snd_bcm2835_alsa_probe(struct platform_device *pdev) #ifdef CONFIG_PM -static int snd_bcm2835_alsa_suspend(struct platform_device *pdev, +static int snd_bcm2835_alsa_suspend(struct vchiq_device *device, pm_message_t state) { return 0; } -static int snd_bcm2835_alsa_resume(struct platform_device *pdev) +static int snd_bcm2835_alsa_resume(struct vchiq_device *device) { return 0; } #endif -static struct platform_driver bcm2835_alsa_driver = { +static struct vchiq_driver bcm2835_alsa_driver = { .probe = snd_bcm2835_alsa_probe, #ifdef CONFIG_PM .suspend = snd_bcm2835_alsa_suspend, @@ -315,9 +315,8 @@ static struct platform_driver bcm2835_alsa_driver = { .name = "bcm2835_audio", }, }; -module_platform_driver(bcm2835_alsa_driver); +module_vchiq_driver(bcm2835_alsa_driver); MODULE_AUTHOR("Dom Cobley"); MODULE_DESCRIPTION("Alsa driver for BCM2835 chip"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:bcm2835_audio"); 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 79d4d0eeb5fb..75da37fa6372 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -67,8 +67,6 @@ int vchiq_susp_log_level = VCHIQ_LOG_ERROR; DEFINE_SPINLOCK(msg_queue_spinlock); struct vchiq_state g_state; -static struct platform_device *bcm2835_audio; - struct vchiq_drvdata { const unsigned int cache_line_size; struct rpi_firmware *fw; @@ -139,6 +137,7 @@ struct vchiq_pagelist_info { * the interface. */ static const char *const vchiq_devices[] = { + "bcm2835_audio", "bcm2835-camera", }; @@ -1849,8 +1848,6 @@ static int vchiq_probe(struct platform_device *pdev) goto error_exit; } - bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio"); - for (i = 0; i < ARRAY_SIZE(vchiq_devices); i++) { err = vchiq_device_register(&pdev->dev, vchiq_devices[i]); if (err) @@ -1868,7 +1865,6 @@ static int vchiq_probe(struct platform_device *pdev) static void vchiq_remove(struct platform_device *pdev) { - platform_device_unregister(bcm2835_audio); bus_for_each_dev(&vchiq_bus_type, NULL, NULL, vchiq_device_unregister); vchiq_debugfs_deinit(); vchiq_deregister_chrdev();