From patchwork Wed Feb 26 01:37:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13991347 Received: from TY3P286CU002.outbound.protection.outlook.com (mail-japaneastazon11010059.outbound.protection.outlook.com [52.101.229.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD44F19C57C for ; Wed, 26 Feb 2025 01:37:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.229.59 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740533876; cv=fail; b=q6CUO05AmUDoNH0HDK7uRDL4mUyQOe2d6G3Slx3pBYy4ct+ADtrzW7HuJqpCTN9JV9OVayQPCnRAkxTO8rL47fO23Kd4pmh3cDBCh4yMHOr8Dt+1tvkuJBQjV6s2Z9kDy6PhTmdRoKK9Lbeq1js95U/vqaz54rWBYxYd/Ye3GGg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740533876; c=relaxed/simple; bh=D7PGRGzd0TOpPrAl4WDNVRls2evdWEVOeAGxx8abo+c=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=Au2MbBVH04ioTw58FRda3EUonRe4MpYw7snaFaKsaSqshCDo9JjgQdln/IusH4D+ZIUhLavY3vAFFaRslr11autF1Fa7bmMPqvVOc8tHG6J0ooHfSVi2Z6WMbeCJ/reYnygbd/ApaWzzRJ7yZOq4Q185tAqqTGj2a2LRP75P33Q= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=cGNVbsru; arc=fail smtp.client-ip=52.101.229.59 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="cGNVbsru" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pAXO6EcLVK6kjDHcNtyIBnT92bCHOH9+A58qQZrwIjJexI8T860fhQwo0ebfagYFxx5KRz6BAOErCDOmz5SiRtyO/an3BTLO7/M7LXXEs4tj9rPxb/R2xt8d6GRlGbFOEFe5VBZpSLYP4/enFhM/U22ycN44y2Lzzi8aaL/LPppsbCuDtpZ0vtpQla7czaXgQcAByqrxt3sBKm/Z4biVsKG6/ckEg6ZkOI2IcRV+YIOeimUL1muRx9elYap/QcvyeL9QZebZp54k6GpDuBjTbFpZnZ0+IBtpvrgbVcw+J56uXRtVkrvYTt3ZEnn2bKJXJP+6uF/vx2WYjOpkRUMhVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BtJuToLd4GEYbj/c9o0iVSIA3F4jhk/FF7ZZc3TtwX8=; b=DY7tdzdJFKiNaMF+EDIYLd01jQKLOhC7WHLeXr8Ao5iHPP3Xca38yE6d/kXPJOJwLUyKPEITBYx6kKClkSkk11iiGCLVVRpvg7jT1y6lt0JJi19utbdeuODVnF5ZnSJJELqU+f5WlFpL2kET0xrp3ycMor7XjgQLtrQ5WMtVtAAHXt5o7+fHkUh0A07NFopchImMMI/EgBEYud7lKNizwHZyiUKzrOZ84zPsn1aV/nqxZFnGrseIJ7vODXs9o+eC7rFs+6sONlijh5JQUUrlUkXkGTqeRskLTpzpyXJuUxFko9JOxdpQZLsTlcdbzk+g+PzMiFz1T3/jHOcPR63A5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BtJuToLd4GEYbj/c9o0iVSIA3F4jhk/FF7ZZc3TtwX8=; b=cGNVbsru6JXcen9rL0429/e0lCvG4naFQCuKZ03FdgfMDQoUbwdSVgQVknPFvth5GqDjvt+D8k2B487JtwTLTq5J+AfYslqr09QD+At+E3SLuFXNI8T2W0dMnZF3Hcg+XpZNIzEgSDCuZ2kcJHTxzvHSEY/Pkz9OZ76RvVqBI2Y= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) by OSYPR01MB5511.jpnprd01.prod.outlook.com (2603:1096:604:87::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.21; Wed, 26 Feb 2025 01:37:53 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8489.018; Wed, 26 Feb 2025 01:37:53 +0000 Message-ID: <87frk1a3kf.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 125/157] ASoC: samsung: bells: use inclusive language for SND_SOC_DAIFMT_CBx_CFx User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: linux-sound@vger.kernel.org In-Reply-To: <87frk1h4sn.wl-kuninori.morimoto.gx@renesas.com> References: <87frk1h4sn.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 26 Feb 2025 01:37:52 +0000 X-ClientProxiedBy: TYCP286CA0262.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:455::9) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSYPR01MB5511:EE_ X-MS-Office365-Filtering-Correlation-Id: 3390b39c-84e7-4f53-469f-08dd56062fe1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: XPpvfMtZQRCJAYabjqzm9sRmIB5GvF0vGJ3teZt70XVAEjkDYln8JETXNL01C43du26geDSfcksf791KE+c98S0EQNX2NXL1zHO1n2fcPq6pMaPYg92XjWiDgLXyWcOdOz69FF0VSGZFDdWZgsUX8O5VykrhXa+GlMlBof14M56tN0M+GgEhptPRKmNGwzSQnXMUa0OkcKYnPEFFsm+G0D5RKAK19DH/+o/CzD74ukTKJ6BpujOFE6XBO556YFlD8pSVnjHPdW40EoTf+gXNVhMBOuGV+g8FTwL4b68q+7E3UZOSqHOLJadh0QrobVmOkkLd2ECGEC5qmQNzEzl8tKEih4EaHvC2mU0lC/6qQKQcQylimug+xH+xhzeD/AFo2wse5mXxGtaZdbaRF9u1jek6DL8Pjq/pyTJWZ423MLWG6EVVBlnBVce4UH7YNDLAtoJ931lRgkKElxHyFLKBGQtBscznydRpzFCWThZtZNeIoiKEV3JGoXXAF+1MNg4Nu2L9vE0gpOzeTFpiMY3sSxKdd/wa6ZrT69tqUnX2V64gKSZ1JPxOQH33nhm1iHLMGi8qC4kQSREUj7GCSQrau1IjWn5/js/k3QMl2tMRre5DqH7c6DlK3cp1YsbAAudXJQDbaQGtThrNoQrL6vQcVikMSSdFFlEnjEvhEssTVd6hrGw8oGk+Y6vk8e/+Vxb1K/vO0qaIxy+lt9aQ1hXYSUOeTmueDX+OpkIAa70SGYOI9gSum6G2Zz+brP7L4rNG4Ck+LV/1ty8+IwEhwSC74V606oa/6t+Ydk4f+7NEI3/DG2Z4W+WCuueBbg6niMajab31oeWS4np4Z/0wQuEvZNtIVo9JCT6n34Z4S9cl+2OhzsSTNrfHVufdWI0Uw6BkSbvPX3gIXCSnhNO+PvVTpHw8PchEyKKlwQJWtE1fLoeY9U4f9VHM4uDI5evnIvMR67TGbC9J8AGaQq5riusTzkbKfiKGuHBbuROCzxlAEeBUmp4/naGxpliMOGO8VEPOvHZNxgxJzVbJLhPbeQXgKLP1R3g96fOebIEvHCUvWmgJ8mPYfMWLn/QNtYLkjOnevxeLzGI8YyqZjv6shfifrB3p6HFxW1qF8kP1ETqOVGC9PBcl+aSGBCAYY+5CEDjYCiY/Ik3ioTHVM8nxoMMFer7kL8L2aIwmCxRVk0i4GxTTRN//3sygBbDKx19140XAdeG5wAUYSYW3aPzBgpWvmWkvDScpBTCo0yDPOSxAF+XcEOHkIPKcYnXft5DgSMC9p8CGgpWqoOGRKUb9AOUWf5DHMDpf2rZQQgHTPPZzBGpKVluWxIGps+qS1lr+2kPX1K05Ifuy6CY+VW7nzHi4RibVxQJVAa9QUSAP4RzYoRXpPeFa9OrjtiNFhnEsEXIfhQbyyj2u/y2mKsYQLwGGrwKQnodlSeoBzqYISdGrkmslt+INdIqqLoCZdqCFR2zK X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Gy91SOIMhufRyiMyl0ocfe4cDnMfx4bLnmvK213bVADlXK9LWzaacL63OUJ3jxS6FaEZH5yPEvlMUrGNkb92F46CVAQ64ttV+xAxj5AkgC0DSLIcP18mr7+b6tt3PXF1yApFE9yjvrumudtxXhaIL+n4Ru0UDh2squK+TsbPT+vHj6XEHOlwYEdDtZr9KMG1N1HQmAZW1mFkrch/+BZHNcm0DVTJfek0poi3Dkgvh68maD6VK7prXsBv5S4QCAmk5gedVUod77NR074b2M+8Kg3LOaO6PrybIEP1QXaNdxt6+GmYLkNddz22tGPJVMExljLFoPoiAaNzjwJ6+k8ZyVdMgXVARs4zY6y8fouByl/KgFBTN1a1hHVkVIci9gHIxwmh4QSIXdcKzcHkeYzFYIgRKbzFhkOFBuwvIz3PTZJr8B23c/GgvfT7PONmVZdPw8GOTudy8uOGu7ygcpD/GuWF6oR8PZi4QknW4Q6LDaWQAy9H4tQsRNt6BC7pxs+ixPxMH7EX5nOYNOIXxx73wOrT+Rg+HAzxqwkOcv5+vrwJhLkpx1EzKHE3WxYBpt8l+jdsHigooUtuwO3koIwnTnd+uj6lvvpyisNnMPPyYj0jqoZO5dbxJu/EoNclJRxHAbnjrAwhTYE3xGd5WRNRa76c++rrDJuzp5H1KgtMOIWNvRXqeYH5yI2WUgoO6Z6vNrcKBdCevix/O+QifpLvQ/yboTm3rVxvcaEyftjrwqAE+9lTdu9Zc94Lu4AtOMGGn9e/4Hm3SSzIco9AGxSrU717r+OfMmcMFX2YtRItM+ZJpc4tOYYmz7Uk4TyHqr+Xi0bb8WFY5mdeD+LjmzfsnAWycdpVLI9wnS/MOODfvsiMlOR8JCokxV/v6Wqnb/Ise7bZyx9+5POm0Zyv3RVTblCscc5bMy6aL50rWNieaepLEAEY/LOcsUQ1KKa3SgUh5/kpWyYbuGaClKcEC3CVf3QtRD6dQ5glY3+VtqkpDqz1Ks5M3xwLzZakquXXoWS8YVGfDRrUfRCv5N4OHjoO78S/jUAc2WeN4rbfgeX4P5FsFVvSeoNQfuLvfYMiW4A7m7vMVWQ93cdxRKlcBoOYyXAXrQc3ud17zcK0UMsPUNwbinT2mG08E4uNxLJmtbIvfn+fXFzRUYglxS0MqdQxPwsmE15zA3lXC9kFlYfdRAMQ90dkxiSPANzlt4tlK0X7A+e7tzvvzsbI1izQPdP3vXJGEVj1BW7dCa2qcyBdpl0T5vv2qrJH6LF1zgjsRvl/3Zu+JKbMJWHXkrY0OCjBEXaW/BQskzub9p5SC/T0983KhHQ7LTYs2qLNNiuQq9+zSj6+A97TyXMCYuU8Rswp1UJOr/D1w9ynbIvo67k0X1BIVPYoXQSTVbKKZRmjSOHHhbmE8YfAaQ43PiEw+3KRyoy2p79gSdc9hxajDCyOfSprp2SXiEtbci4ljLy4zjuFqAjEy1CKfkJvEp53QtmkiP2uyXWobXIsdtXhAzxwTiJcnLB7WrxR4xqqOs+xd2+ikglTU0OvY22dPwXv0mAvNBIcC2TKp1TQ3e35k2IelgUo5Vn/9IapuwpONdXydwjj/eFzWdBr502gf5kd4ru8xdsVB08R6mTxMw5ZlcmBFSA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3390b39c-84e7-4f53-469f-08dd56062fe1 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2025 01:37:53.0658 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Hb3B3V0Y2RMg9s9hLHBWIWIzPvCtO806uS+qBkeEO5jth7vLIWBJFYnp/pE9CsCISEafdxiFM2XGbs2EDXpujsdT3At6AlljzNScY6dEKu5MtaheDrYqw6Tkua0ANC2G X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSYPR01MB5511 In SND_SOC_DAIFMT_CBx_CFx, M/S are no longer used. use P/C. Signed-off-by: Kuninori Morimoto --- sound/soc/samsung/bells.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c index 365b1aca4855..ba9b0b1fba03 100644 --- a/sound/soc/samsung/bells.c +++ b/sound/soc/samsung/bells.c @@ -256,14 +256,14 @@ static struct snd_soc_dai_link bells_dai_wm2200[] = { .name = "CPU-DSP", .stream_name = "CPU-DSP", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF - | SND_SOC_DAIFMT_CBM_CFM, + | SND_SOC_DAIFMT_CBP_CFP, SND_SOC_DAILINK_REG(wm2200_cpu_dsp), }, { .name = "DSP-CODEC", .stream_name = "DSP-CODEC", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF - | SND_SOC_DAIFMT_CBM_CFM, + | SND_SOC_DAIFMT_CBP_CFP, .c2c_params = &sub_params, .num_c2c_params = 1, .ignore_suspend = 1, @@ -293,14 +293,14 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = { .name = "CPU-DSP", .stream_name = "CPU-DSP", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF - | SND_SOC_DAIFMT_CBM_CFM, + | SND_SOC_DAIFMT_CBP_CFP, SND_SOC_DAILINK_REG(wm5102_cpu_dsp), }, { .name = "DSP-CODEC", .stream_name = "DSP-CODEC", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF - | SND_SOC_DAIFMT_CBM_CFM, + | SND_SOC_DAIFMT_CBP_CFP, .c2c_params = &sub_params, .num_c2c_params = 1, .ignore_suspend = 1, @@ -310,7 +310,7 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = { .name = "Baseband", .stream_name = "Baseband", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF - | SND_SOC_DAIFMT_CBM_CFM, + | SND_SOC_DAIFMT_CBP_CFP, .ignore_suspend = 1, .c2c_params = &baseband_params, .num_c2c_params = 1, @@ -320,7 +320,7 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = { .name = "Sub", .stream_name = "Sub", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF - | SND_SOC_DAIFMT_CBS_CFS, + | SND_SOC_DAIFMT_CBC_CFC, .ignore_suspend = 1, .c2c_params = &sub_params, .num_c2c_params = 1, @@ -351,14 +351,14 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = { .name = "CPU-DSP", .stream_name = "CPU-DSP", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF - | SND_SOC_DAIFMT_CBM_CFM, + | SND_SOC_DAIFMT_CBP_CFP, SND_SOC_DAILINK_REG(wm5110_cpu_dsp), }, { .name = "DSP-CODEC", .stream_name = "DSP-CODEC", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF - | SND_SOC_DAIFMT_CBM_CFM, + | SND_SOC_DAIFMT_CBP_CFP, .c2c_params = &sub_params, .num_c2c_params = 1, .ignore_suspend = 1, @@ -368,7 +368,7 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = { .name = "Baseband", .stream_name = "Baseband", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF - | SND_SOC_DAIFMT_CBM_CFM, + | SND_SOC_DAIFMT_CBP_CFP, .ignore_suspend = 1, .c2c_params = &baseband_params, .num_c2c_params = 1, @@ -378,7 +378,7 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = { .name = "Sub", .stream_name = "Sub", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF - | SND_SOC_DAIFMT_CBS_CFS, + | SND_SOC_DAIFMT_CBC_CFC, .ignore_suspend = 1, .c2c_params = &sub_params, .num_c2c_params = 1,