From nobody Fri Sep 20 08:40:52 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7BD44C4167B for ; Fri, 3 Nov 2023 09:54:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347470AbjKCJy7 (ORCPT ); Fri, 3 Nov 2023 05:54:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347380AbjKCJyz (ORCPT ); Fri, 3 Nov 2023 05:54:55 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8CCB1BD for ; Fri, 3 Nov 2023 02:54:49 -0700 (PDT) X-UUID: 029a1fa07a2f11eea33bb35ae8d461a2-20231103 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=1PNy4lQFDD/9P/cCBJ+oFYmFIxu9jH1NPA/0OOwYEBQ=; b=exflmBaW3pz4CX2PxrtXv6Ox93ybXp7gYvw0C2Hf/j+fmS20+kWNvHhUvRctBFoPr6UFcFvfBW/sOGZkhryEkqlFJxWagYg1nzRrrfIrNad1EdHdSzIXUoG/6C4APWhiIX3uWZB3w8lswXZMZKaTRlPBinusRfe3gTjnaSG4Cdo=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.33,REQID:84f5920e-a7b2-4fae-8d45-4a812c825796,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:-25 X-CID-META: VersionHash:364b77b,CLOUDID:a75ea55f-c89d-4129-91cb-8ebfae4653fc,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO, DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 029a1fa07a2f11eea33bb35ae8d461a2-20231103 Received: from mtkmbs14n1.mediatek.inc [(172.21.101.75)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 859796463; Fri, 03 Nov 2023 17:54:42 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs11n2.mediatek.inc (172.21.101.187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Fri, 3 Nov 2023 17:54:40 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Fri, 3 Nov 2023 17:54:40 +0800 From: Trevor Wu To: , , , , , , , , , , , CC: , , , , , , Subject: [PATCH 1/3] ASoC: SOF: mediatek: mt8195: clean up unused code Date: Fri, 3 Nov 2023 17:54:30 +0800 Message-ID: <20231103095433.10475-2-trevor.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20231103095433.10475-1-trevor.wu@mediatek.com> References: <20231103095433.10475-1-trevor.wu@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since there are some variables that are no longer being used, we remove the code that was implemented for those variables. Signed-off-by: Trevor Wu Reviewed-by: Yaochun Hung Reviewed-by: AngeloGioacchino Del Regno Tested-by: AngeloGioacchino Del Regno --- sound/soc/sof/mediatek/mt8195/mt8195.c | 49 -------------------------- 1 file changed, 49 deletions(-) diff --git a/sound/soc/sof/mediatek/mt8195/mt8195.c b/sound/soc/sof/mediate= k/mt8195/mt8195.c index cac0a085f60a..8ee7ee246344 100644 --- a/sound/soc/sof/mediatek/mt8195/mt8195.c +++ b/sound/soc/sof/mediatek/mt8195/mt8195.c @@ -96,29 +96,6 @@ static int platform_parse_resource(struct platform_devic= e *pdev, void *data) struct mtk_adsp_chip_info *adsp =3D data; int ret; =20 - mem_region =3D of_parse_phandle(dev->of_node, "memory-region", 0); - if (!mem_region) { - dev_err(dev, "no dma memory-region phandle\n"); - return -ENODEV; - } - - ret =3D of_address_to_resource(mem_region, 0, &res); - of_node_put(mem_region); - if (ret) { - dev_err(dev, "of_address_to_resource dma failed\n"); - return ret; - } - - dev_dbg(dev, "DMA %pR\n", &res); - - adsp->pa_shared_dram =3D (phys_addr_t)res.start; - adsp->shared_size =3D resource_size(&res); - if (adsp->pa_shared_dram & DRAM_REMAP_MASK) { - dev_err(dev, "adsp shared dma memory(%#x) is not 4K-aligned\n", - (u32)adsp->pa_shared_dram); - return -EINVAL; - } - ret =3D of_reserved_mem_device_init(dev); if (ret) { dev_err(dev, "of_reserved_mem_device_init failed\n"); @@ -238,26 +215,6 @@ static int adsp_memory_remap_init(struct device *dev, = struct mtk_adsp_chip_info return 0; } =20 -static int adsp_shared_base_ioremap(struct platform_device *pdev, void *da= ta) -{ - struct device *dev =3D &pdev->dev; - struct mtk_adsp_chip_info *adsp =3D data; - - /* remap shared-dram base to be non-cachable */ - adsp->shared_dram =3D devm_ioremap(dev, adsp->pa_shared_dram, - adsp->shared_size); - if (!adsp->shared_dram) { - dev_err(dev, "failed to ioremap base %pa size %#x\n", - adsp->shared_dram, adsp->shared_size); - return -ENOMEM; - } - - dev_dbg(dev, "shared-dram vbase=3D%p, phy addr :%pa, size=3D%#x\n", - adsp->shared_dram, &adsp->pa_shared_dram, adsp->shared_size); - - return 0; -} - static int mt8195_run(struct snd_sof_dev *sdev) { u32 adsp_bootup_addr; @@ -338,12 +295,6 @@ static int mt8195_dsp_probe(struct snd_sof_dev *sdev) } priv->adsp->va_dram =3D sdev->bar[SOF_FW_BLK_TYPE_SRAM]; =20 - ret =3D adsp_shared_base_ioremap(pdev, priv->adsp); - if (ret) { - dev_err(sdev->dev, "adsp_shared_base_ioremap fail!\n"); - goto err_adsp_sram_power_off; - } - sdev->bar[DSP_REG_BAR] =3D priv->adsp->va_cfgreg; =20 sdev->mmio_bar =3D SOF_FW_BLK_TYPE_SRAM; --=20 2.18.0 From nobody Fri Sep 20 08:40:52 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3123C4332F for ; Fri, 3 Nov 2023 09:55:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347441AbjKCJzE (ORCPT ); Fri, 3 Nov 2023 05:55:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347380AbjKCJy7 (ORCPT ); Fri, 3 Nov 2023 05:54:59 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D86E6D45 for ; Fri, 3 Nov 2023 02:54:50 -0700 (PDT) X-UUID: 02addc667a2f11eea33bb35ae8d461a2-20231103 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=I0Dqa79Xnh2YmZD1oFINboyDlJ0ERnJFDZ0JQm5t2bc=; b=PjnIbpzbkT/927symx1E6USn2UB70EDD0H6ovqxsTrlA1n3Fb4eI/umuJnddGUCuHtmhRwz5C0nTdc4M0pw/WxfgZN4C7mlB2PmpdvbeD09wKqdCkY3G4goVBFk7yuspuAkS56pRAPpaK+zuJkXp2OzkP23gaOdnDN5DhEszm8E=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.33,REQID:d46f80be-d5fe-41f3-aeb4-2719447a3f70,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:-25 X-CID-META: VersionHash:364b77b,CLOUDID:a85ea55f-c89d-4129-91cb-8ebfae4653fc,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO, DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 02addc667a2f11eea33bb35ae8d461a2-20231103 Received: from mtkmbs13n1.mediatek.inc [(172.21.101.193)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1817119744; Fri, 03 Nov 2023 17:54:42 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs13n2.mediatek.inc (172.21.101.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Fri, 3 Nov 2023 17:54:41 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Fri, 3 Nov 2023 17:54:41 +0800 From: Trevor Wu To: , , , , , , , , , , , CC: , , , , , , Subject: [PATCH 2/3] ASoC: SOF: mediatek: mt8186: clean up unused code Date: Fri, 3 Nov 2023 17:54:31 +0800 Message-ID: <20231103095433.10475-3-trevor.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20231103095433.10475-1-trevor.wu@mediatek.com> References: <20231103095433.10475-1-trevor.wu@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since there are some variables that are no longer being used, we remove the code that was implemented for those variables. Signed-off-by: Trevor Wu Reviewed-by: Yaochun Hung Reviewed-by: AngeloGioacchino Del Regno --- sound/soc/sof/mediatek/mt8186/mt8186.c | 49 -------------------------- 1 file changed, 49 deletions(-) diff --git a/sound/soc/sof/mediatek/mt8186/mt8186.c b/sound/soc/sof/mediate= k/mt8186/mt8186.c index b69fa788b16f..0d2d7d697de0 100644 --- a/sound/soc/sof/mediatek/mt8186/mt8186.c +++ b/sound/soc/sof/mediatek/mt8186/mt8186.c @@ -96,29 +96,6 @@ static int platform_parse_resource(struct platform_devic= e *pdev, void *data) struct mtk_adsp_chip_info *adsp =3D data; int ret; =20 - mem_region =3D of_parse_phandle(dev->of_node, "memory-region", 0); - if (!mem_region) { - dev_err(dev, "no dma memory-region phandle\n"); - return -ENODEV; - } - - ret =3D of_address_to_resource(mem_region, 0, &res); - of_node_put(mem_region); - if (ret) { - dev_err(dev, "of_address_to_resource dma failed\n"); - return ret; - } - - dev_dbg(dev, "DMA %pR\n", &res); - - adsp->pa_shared_dram =3D (phys_addr_t)res.start; - adsp->shared_size =3D resource_size(&res); - if (adsp->pa_shared_dram & DRAM_REMAP_MASK) { - dev_err(dev, "adsp shared dma memory(%#x) is not 4K-aligned\n", - (u32)adsp->pa_shared_dram); - return -EINVAL; - } - ret =3D of_reserved_mem_device_init(dev); if (ret) { dev_err(dev, "of_reserved_mem_device_init failed\n"); @@ -248,26 +225,6 @@ static int adsp_memory_remap_init(struct snd_sof_dev *= sdev, struct mtk_adsp_chip return 0; } =20 -static int adsp_shared_base_ioremap(struct platform_device *pdev, void *da= ta) -{ - struct device *dev =3D &pdev->dev; - struct mtk_adsp_chip_info *adsp =3D data; - - /* remap shared-dram base to be non-cachable */ - adsp->shared_dram =3D devm_ioremap(dev, adsp->pa_shared_dram, - adsp->shared_size); - if (!adsp->shared_dram) { - dev_err(dev, "failed to ioremap base %pa size %#x\n", - adsp->shared_dram, adsp->shared_size); - return -ENOMEM; - } - - dev_dbg(dev, "shared-dram vbase=3D%p, phy addr :%pa, size=3D%#x\n", - adsp->shared_dram, &adsp->pa_shared_dram, adsp->shared_size); - - return 0; -} - static int mt8186_run(struct snd_sof_dev *sdev) { u32 adsp_bootup_addr; @@ -324,12 +281,6 @@ static int mt8186_dsp_probe(struct snd_sof_dev *sdev) =20 priv->adsp->va_dram =3D sdev->bar[SOF_FW_BLK_TYPE_SRAM]; =20 - ret =3D adsp_shared_base_ioremap(pdev, priv->adsp); - if (ret) { - dev_err(sdev->dev, "adsp_shared_base_ioremap fail!\n"); - return ret; - } - sdev->bar[DSP_REG_BAR] =3D priv->adsp->va_cfgreg; sdev->bar[DSP_SECREG_BAR] =3D priv->adsp->va_secreg; sdev->bar[DSP_BUSREG_BAR] =3D priv->adsp->va_busreg; --=20 2.18.0 From nobody Fri Sep 20 08:40:52 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B83EC4167D for ; Fri, 3 Nov 2023 09:55:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347517AbjKCJzG (ORCPT ); Fri, 3 Nov 2023 05:55:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347474AbjKCJy7 (ORCPT ); Fri, 3 Nov 2023 05:54:59 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5838D47 for ; Fri, 3 Nov 2023 02:54:52 -0700 (PDT) X-UUID: 031945507a2f11ee8051498923ad61e6-20231103 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=SSxEHER9rgZJO6xVEezgZza82f7zlYSaeP4HD1Wipa4=; b=XhoycgLrsLIkL/p2GmDL7fcAKoFNp6bjCG/pe1I4D5iyUPDodFEcg6c6UW45Nk2jLjp18n2wZHxvtiwB3dypAvodZuVyMkohCj1DmydrzMW/IMn+911n1gUcj8+JhCNEZxZB8rMlsk680tAnFUhp7UGECUpLlWR/SvbL1hcJHt4=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.33,REQID:1725c5ad-4693-4078-9213-0098455aa642,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:364b77b,CLOUDID:9b5ea55f-c89d-4129-91cb-8ebfae4653fc,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO, DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 031945507a2f11ee8051498923ad61e6-20231103 Received: from mtkmbs11n2.mediatek.inc [(172.21.101.187)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1655944468; Fri, 03 Nov 2023 17:54:42 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Fri, 3 Nov 2023 17:54:41 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Fri, 3 Nov 2023 17:54:41 +0800 From: Trevor Wu To: , , , , , , , , , , , CC: , , , , , , Subject: [PATCH 3/3] ASoC: SOF: mediatek: remove unused variables Date: Fri, 3 Nov 2023 17:54:32 +0800 Message-ID: <20231103095433.10475-4-trevor.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20231103095433.10475-1-trevor.wu@mediatek.com> References: <20231103095433.10475-1-trevor.wu@mediatek.com> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-AS-Result: No-10--3.994200-8.000000 X-TMASE-MatchedRID: tbBnGR+nfu7HO8eAxCOj9uEbUg4xvs+wYKeVO7aMEHPfUZT83lbkEGOr KvsUT0pAXTvgb5xI7gVpnryVaiXugB8TzIzimOwPC24oEZ6SpSmcfuxsiY4QFDraVU6lwonzkc5 WVJ1GXnkS2VhzX+fgmBqqw4SleYJWMr1nDozz1oXRaxPVfNDWN0QrY6+5fQPAwAu7lS0AxFfi54 NN52oAEEma3zYT97IFAYfQIAUhBayZvmCbKVb49sZL6x5U/HriPpCuffGH9zI= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--3.994200-8.000000 X-TMASE-Version: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-SNTS-SMTP: 073E768117C1B0B82F8444E44C9CD65E3774C4004192C4ABD2DE76B85F9A1C532000:8 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" To prevent confusion on the follow-up platform, it is necessary to remove any unused variables within the struct mtk_adsp_chip_info. Signed-off-by: Trevor Wu Reviewed-by: Yaochun Hung Reviewed-by: AngeloGioacchino Del Regno --- sound/soc/sof/mediatek/adsp_helper.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sound/soc/sof/mediatek/adsp_helper.h b/sound/soc/sof/mediatek/= adsp_helper.h index d41e904e6614..35527567962e 100644 --- a/sound/soc/sof/mediatek/adsp_helper.h +++ b/sound/soc/sof/mediatek/adsp_helper.h @@ -15,17 +15,13 @@ struct mtk_adsp_chip_info { phys_addr_t pa_sram; phys_addr_t pa_dram; /* adsp dram physical base */ - phys_addr_t pa_shared_dram; /* adsp dram physical base */ phys_addr_t pa_cfgreg; u32 sramsize; u32 dramsize; u32 cfgregsize; - u32 shared_size; void __iomem *va_sram; /* corresponding to pa_sram */ void __iomem *va_dram; /* corresponding to pa_dram */ void __iomem *va_cfgreg; - void __iomem *shared_sram; /* part of va_sram */ - void __iomem *shared_dram; /* part of va_dram */ phys_addr_t adsp_bootup_addr; int dram_offset; /*dram offset between system and dsp view*/ =20 --=20 2.18.0