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, ryans.lee@maximintegrated.com,
        steves.lee.maxim@gmail.com
Subject: [PATCH 2/2] ASoC: max98390: Update dsm init sequence and condition.
Date:   Fri, 24 Jul 2020 15:01:49 +0900
Message-Id: <20200724060149.19261-1-steves.lee@maximintegrated.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost.localdomain (2001:2d8:e716:8b4b:b4b1:36e4:d148:7e35) by SL2PR04CA0022.apcprd04.prod.outlook.com (2603:1096:100:2d::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.18 via Frontend Transport; Fri, 24 Jul 2020 06:02:46 +0000
X-Mailer: git-send-email 2.17.1
X-Originating-IP: [2001:2d8:e716:8b4b:b4b1:36e4:d148:7e35]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 3d46de89-761e-44e3-3ebe-08d82f97327c
X-MS-TrafficTypeDiagnostic: MWHPR11MB1646:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <MWHPR11MB1646B29943BD89C41342F24C92770@MWHPR11MB1646.namprd11.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:2331;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: oApkqOozfGWLl8kZM2fPYCZ7j1I5q3MRywWYTz9VWKDJQFY5Cs8xMrGlwHcpdKvuQFu08Ivdt4R1myTiuLMfcuKdot0/GJknQa0Q5LQoUz3THQTbilWXfdUO7t43Ac4nXRx71PHk/ooUo8VXRRFWs1XfraL61aiYdHjF2i1qkp9DnPwo4L7Vj9Mz+LmzL/DimRwrEv8jB0XffI0VC6d1yT7IPe7pQzs2E48Tn7ZCaKiE5vMY1je4V+YnFkncXzfeKi7CimG6ZHG8FnOG1cjMg/dJIFZQX3pMtupzg8K/thy7WvfsfaveGs6xI2gJ7jyMbFbVhV7hTFqU7HASzlNeOhh8vNeIBILmnLzUg05f3ywYwLKMTFfoY5YD6QjwP90ZsgbzQYfbzSg4BHq/cyB7NQ==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB2047.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(136003)(396003)(39860400002)(376002)(346002)(7416002)(186003)(2616005)(478600001)(52116002)(69590400007)(6512007)(6486002)(6506007)(66476007)(36756003)(66946007)(83380400001)(1076003)(15650500001)(316002)(4326008)(86362001)(16526019)(5660300002)(8936002)(66556008)(8676002)(2906002)(921003);DIR:OUT;SFP:1102;
X-MS-Exchange-AntiSpam-MessageData: jYNkumhiYx2nHC/8NY+HhNxU3QRmoMPRDCj0GkBLwC2WFjuvdvF97mnIvHmXtZF2TlVzJF8KswgK5Sp1tiVQFuV6QQpGhc68AK4CIfzQZSY8UcXV8oanuY/g2q8ykgBBdZsZuwg0Gs7ssQvnWd4nZAVwohNKtRx7+gYtTfRzNa9r0EpSXi7lSpi44sMyGMvOYsZ4QrSJqPMWOUJu4hz2eb+V2svzwjIv3D6zYGpmYUpo56kZYrQCJdJXlY2LbxBqbt+TMcMR/+0w59pAp4gy3q6rarRw48dSEMNYW8ZyLoK65hjUD4bTkyGWDi4KtOFRa+fX3pCTrjI4doAhcuzbBRd6d2srHcEyhcILr/MrKaf1WSAjJAXB1ljOBVoMHCkjTtbaPN5+ATFvp//sqLeJEA4KIJsr1habQk0oa3fBgY4s9co5Aj/ivqV+g1vfNbqvSEpq8iew5wRaXnmyDW9joxYWnEcY3hDbC1I4ordThszZSbRWVJE9hrI2ScqwL+Wy9mKdwGKVZ3fqg+ISWwE/6keSGctlfSnLWI8uWNWgUOc=
X-OriginatorOrg: maximintegrated.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3d46de89-761e-44e3-3ebe-08d82f97327c
X-MS-Exchange-CrossTenant-AuthSource: MWHPR11MB2047.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2020 06:02:51.1093
 (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: laCP4zNWzpY4dLBbvClGHyuBiSOt/K2Xx7mJiqwzeZnYPzBIq5W1oX3Va/Ht8I9jTCIa5an5/8J6vVr0GvCz3fZVBAWNAl7DWLgvtiu+VXQ=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1646
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

 Modify dsm_init sequence and dsm param bin check condition.
  - Move dsm_init() to after amp init setting to
    make sure dsm init is last setting.
  - dsm param bin check condition changed for extended register setting.

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

diff --git a/sound/soc/codecs/max98390.c b/sound/soc/codecs/max98390.c
index 44ffebac15ad..ff5cc9bbec29 100644
--- a/sound/soc/codecs/max98390.c
+++ b/sound/soc/codecs/max98390.c
@@ -790,7 +790,7 @@ static int max98390_dsm_init(struct snd_soc_component *component)
 	param_start_addr = (dsm_param[0] & 0xff) | (dsm_param[1] & 0xff) << 8;
 	param_size = (dsm_param[2] & 0xff) | (dsm_param[3] & 0xff) << 8;
 	if (param_size > MAX98390_DSM_PARAM_MAX_SIZE ||
-		param_start_addr < DSM_STBASS_HPF_B0_BYTE0 ||
+		param_start_addr < MAX98390_IRQ_CTRL ||
 		fw->size < param_size + MAX98390_DSM_PAYLOAD_OFFSET) {
 		dev_err(component->dev,
 			"param fw is invalid.\n");
@@ -864,11 +864,11 @@ static int max98390_probe(struct snd_soc_component *component)
 	regmap_write(max98390->regmap, MAX98390_SOFTWARE_RESET, 0x01);
 	/* Sleep reset settle time */
 	msleep(20);
-	/* Update dsm bin param */
-	max98390_dsm_init(component);
 
 	/* Amp init setting */
 	max98390_init_regs(component);
+	/* Update dsm bin param */
+	max98390_dsm_init(component);
 
 	/* Dsm Setting */
 	if (max98390->ref_rdc_value) {
-- 
2.17.1