Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Steve Lee <steves.lee@maximintegrated.com>
To:     lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz,
        tiwai@suse.com, ckeepax@opensource.cirrus.com,
        geert@linux-m68k.org, rf@opensource.wolfsonmicro.com,
        shumingf@realtek.com, srinivas.kandagatla@linaro.org,
        krzk@kernel.org, dmurphy@ti.com, jack.yu@realtek.com,
        nuno.sa@analog.com, steves.lee@maximintegrated.com,
        linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org
Cc:     ryan.lee.maxim@gmail.com, steves.lee.maxim@gmail.com
Subject: [PATCH v2] ASoC: max98390: Add support change dsm param name
Date:   Mon,  9 Aug 2021 23:21:40 +0900
Message-Id: <20210809142140.9293-1-steves.lee@maximintegrated.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost.localdomain (125.129.66.126) by SL2P216CA0133.KORP216.PROD.OUTLOOK.COM (2603:1096:101:1::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15 via Frontend Transport; Mon, 9 Aug 2021 14:22:22 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: dc625349-d96f-4103-18cc-08d95b411cd4
X-MS-TrafficTypeDiagnostic: MWHPR11MB0078:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <MWHPR11MB0078E01FE99FA4F8F7B5330E92F69@MWHPR11MB0078.namprd11.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:167;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: wA/wShjL0J302IKV1umtcJmTywg51VWDFhSxUxJ3Tj31Ml8KYBg8MYlWEE25wnQOLan+w8VLy5mMmWJXsPQHvXBA7yPeG9jkvDRQztPpwGT3JCdHKaWFhVDpJzov41ox0TdYzRkd0gKANxMaaqk1J1/VDneTPyB4Xs9xzXhygkym+JKy7QgxR9mSkqWAqD32n1U7S/CvCWyZhEGtKFxaD28SDtgCrm7zxMmpM8K1csolZrV1DGL/z66AskloQQR1RNJoc0pDdsH8ej9TGnznB+YgGY4H7W1pfjNrtfrJRaeNsAO8mAZK/hrJob79UzcLpAQxKHqS1uvwex7lCjQ9qZ8O6z+E+unqF1BUgYSEImc7Moo7SrARlHUPAEkYWyth7zPnJkkj+pT4sTK+o0S8IOURAYRe2TtiyBg5k59mZiF2gIZ0+8UXV6cGcOM1liw5egDMrbSrM1xBnx5OugJMf+6OhQHKqY3rDpMEGY1fVPtczXorCr8mGr4fe1N3gawYuQCbI8jsAxoqoqlZ1t8kZ3wCnLqmIvkHV/U/8jQQNxzjtrXEnFC/2MmfR2rVjEZ10L9I8/hG98QPBKrOjM1520WS39d9/J5LwtiZUD8Q2BL6DMN/maC22mPxMaI0LSDljyejfm2ZzYQQAeD+/Ubmfe0Jo2fjE2tNk2y0qAMHXAm6TX2BxdVgNMJo3Xplgg5Zd5Yhbs2ewCnFpNIG6v0TCFpy6heiD9dvtjob1SuEjPk=
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB5089.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(136003)(366004)(376002)(346002)(39860400002)(2616005)(956004)(1076003)(478600001)(86362001)(7416002)(8676002)(52116002)(8936002)(921005)(316002)(38350700002)(38100700002)(6666004)(6512007)(66946007)(2906002)(66556008)(66476007)(6486002)(186003)(6506007)(26005)(36756003)(83380400001)(5660300002)(4326008);DIR:OUT;SFP:1102;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hlX2yw7Mo3sGeVazGYKtHOeoaJAUfjZcMaWhmuQELolh5KelgQnKa/IiAUGU?=
 =?us-ascii?Q?JqDqhR4bFU9sYhFYAv6JjzPX8PYeGU6CIxSofWm4uuBA9wzyWy8F/HRAoYcK?=
 =?us-ascii?Q?vSqgPpxYFX27W/OiSHiI/IhSJz4DdLE0xZzkeYAzR+f6kbghA7DEcwMXNA9Z?=
 =?us-ascii?Q?Tv4+qLtjzo3GYo8tQhFsFGncNFQptQGaAmJRXL39oC0l9h2Kcr/eKBlkYa2U?=
 =?us-ascii?Q?MXHifvdCIUdajqCJy/3ZVL7dwPq3LCKYsT1NCjAmRkINMU9YG9BmEzv/CtIe?=
 =?us-ascii?Q?LXNsXx5BX+hG+EJvt8Bwunew+/HC0P/Fz+N0NZFNuC2PD0k7Wflbvyb2lhOR?=
 =?us-ascii?Q?f6NG6lmcwVF/4wwAgYPW6JU+6/ezUAbipOxwSy3kGoqEi+ozqU0QcP1dno/K?=
 =?us-ascii?Q?OuQdbAaYxCe+sKfXW4g+0Y55ZXaS1y+UPWLBDxWAUNtC/t8+t08Z0JbIVzGU?=
 =?us-ascii?Q?EzA3N0U4QkFsLA0Rg+GfNiERUBpGh9fL104J9x6s2OR/ET99yr/Nz0CWLSyE?=
 =?us-ascii?Q?m+/vfT1lZJ7J2R5k6oQ2NLX2GfXDFAmxmWpfU4VdbbAkLrNyuWJVbC3QKqrF?=
 =?us-ascii?Q?HmFUWhkz2eoGVf8aVBJ7be0UNbB423h3myrO2D0EuH/zy2rk0nEFnesKRytc?=
 =?us-ascii?Q?sAZJbR6TnNhcteMmU9aFfyuv252lLU0RwJutyrwnZ1lavsAvjeIMALgug+BE?=
 =?us-ascii?Q?TV3F/Iwkey3kXCg39ULy6NjR5Tl2KQkTUcvprhCBW6g3MP8Gd2Y3G7jTkOAt?=
 =?us-ascii?Q?htjEEr9UL/wfu+0s9DAntzvyVhAj3AD+5kTNWPMVnaFEQLitK+CBT2C9NEws?=
 =?us-ascii?Q?HfI82wRBozhU4pOocd4uzl38pqGvNG59DPDVnOHUzUY71OA8Ar3x1ZEI6Spe?=
 =?us-ascii?Q?FLWlxbX+SbSsBl/C5VXc0h6cTk5NrgiBF99j/yXB2YXXvMKN2goZXWXNib/4?=
 =?us-ascii?Q?Jd76x2VlYocYrFehPIijShTIAH6Ymi+GnvlBA0EEnr3cxWYTy7xeK80JYoGQ?=
 =?us-ascii?Q?/kZ7/sMzYaMVmiIkMvcZHOsn9OgFlXfmZuu/TA5Czz6bbcyDZFsslaR8+xzN?=
 =?us-ascii?Q?gEhNVkugwts6S9tOxiu1BhlCiZKuhdfNzxyoAvRnth8JUl7zU5lQZ3YFooX+?=
 =?us-ascii?Q?tOFid4u5m9qOP+p2Lnz0mjmy55rfdlG3ppnScjHi98T+uXfLBYTVzebnmnim?=
 =?us-ascii?Q?DoHBZyEu+V5iU7CnOsDJTvo5knsE0S61DLOhHg4qOdByJoJN6ZPs1a4m/Qus?=
 =?us-ascii?Q?/5oIrFc7QQ9qU6q11VdIVzQH0WMeJ5eqngY1ihCKzbP/mcYjZDVwKVeR4aKP?=
 =?us-ascii?Q?o3vpcIVrOaqVcSYfOwJQ3dGD?=
X-OriginatorOrg: maximintegrated.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dc625349-d96f-4103-18cc-08d95b411cd4
X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB5089.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2021 14:22:26.6788
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: fbd909df-ea69-4788-a554-f24b7854ad03
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 17D+RV7/FGm1zBTXPmNsK8SG1vgnD22vs9mIgK1GX8gGUCL9Ui+2aWiaq6Yuxpc/bf+nagyxG5/cnFWXXO7m1Y1k+4r6Fjbbw43v7Pfy4NY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB0078
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

  In case of using different type of speaker, support
 using different dsm parameter bin file for each amp connected.

Signed-off-by: Steve Lee <steves.lee@maximintegrated.com>
---
 sound/soc/codecs/max98390.c | 26 ++++++++++++++++++++------
 sound/soc/codecs/max98390.h |  1 +
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/max98390.c b/sound/soc/codecs/max98390.c
index 94773ccee9d5..b392567c2b3e 100644
--- a/sound/soc/codecs/max98390.c
+++ b/sound/soc/codecs/max98390.c
@@ -765,17 +765,26 @@ static int max98390_dsm_init(struct snd_soc_component *component)
 	vendor = dmi_get_system_info(DMI_SYS_VENDOR);
 	product = dmi_get_system_info(DMI_PRODUCT_NAME);
 
-	if (vendor && product) {
-		snprintf(filename, sizeof(filename), "dsm_param_%s_%s.bin",
-			vendor, product);
+	if (!strcmp(max98390->dsm_param_name, "default")) {
+		if (vendor && product) {
+			snprintf(filename, sizeof(filename),
+				"dsm_param_%s_%s.bin", vendor, product);
+		} else {
+			sprintf(filename, "dsm_param.bin");
+		}
 	} else {
-		sprintf(filename, "dsm_param.bin");
+		snprintf(filename, sizeof(filename), "%s",
+			max98390->dsm_param_name);
 	}
 	ret = request_firmware(&fw, filename, component->dev);
 	if (ret) {
 		ret = request_firmware(&fw, "dsm_param.bin", component->dev);
-		if (ret)
-			goto err;
+		if (ret) {
+			ret = request_firmware(&fw, "dsmparam.bin",
+				component->dev);
+			if (ret)
+				goto err;
+		}
 	}
 
 	dev_dbg(component->dev,
@@ -1047,6 +1056,11 @@ static int max98390_i2c_probe(struct i2c_client *i2c,
 		__func__, max98390->ref_rdc_value,
 		max98390->ambient_temp_value);
 
+	ret = device_property_read_string(&i2c->dev, "maxim,dsm_param_name",
+				       &max98390->dsm_param_name);
+	if (ret)
+		max98390->dsm_param_name = "default";
+
 	/* voltage/current slot configuration */
 	max98390_slot_config(i2c, max98390);
 
diff --git a/sound/soc/codecs/max98390.h b/sound/soc/codecs/max98390.h
index e31516717d3b..c250740f73a2 100644
--- a/sound/soc/codecs/max98390.h
+++ b/sound/soc/codecs/max98390.h
@@ -662,5 +662,6 @@ struct max98390_priv {
 	unsigned int i_l_slot;
 	unsigned int ref_rdc_value;
 	unsigned int ambient_temp_value;
+	const char *dsm_param_name;
 };
 #endif
-- 
2.17.1