From nobody Thu Oct 9 20:22:56 2025 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F2C302E7F08 for ; Mon, 16 Jun 2025 11:54:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750074862; cv=none; b=irktfL4b3Fxb+PUFtkunkOVJZGPK/bYiwKm/u45N9BgyDfOkLTtkq6eAeVxira9kjQWZpgQHoJqIsHRytLYtQxG97BNCFMZpRwrbiTtrtCZeSBYclC2UENLQGCzLjMeXUND9VSYJcMi00++4V/2UYvnkTSe1K7r9JfhJz/T4j1o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750074862; c=relaxed/simple; bh=W84ukinUJ51e433j/q7HBi699hZcbP1TxUuIsLTTSuw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OT/v00NKIZlgvMyWGn2/RpxBcqhbZTzEecyN0tvsEEGQLavrNF4Dzyn5Yzuo7nIz3EKOFrfnCO6KIZp2ZxqkjKC3qwAphU2Vwt6npVz8nVPQgxRuH1JOx7tfGwt7G8rqAUV90e8wTgneAMPotJG8EjfR5sPmKoxNFkhBy2o/XdY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=agsKQr77; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="agsKQr77" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-450d08e662fso2245335e9.0 for ; Mon, 16 Jun 2025 04:54:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750074859; x=1750679659; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=/UW8DtABN+4gWLwcxZoGbouWonY/5+M3DyOMQmabf+s=; b=agsKQr77RMc1ryWO+oMeX3TE9IBI8mWIC1XlHgv0oeVQtO0v78hU/Ly2P6hXSd+DK1 ErSBoMi6IzawMVpizvon8RQgxWPJgoY/Nyz1ZU5AFN6re1KcXJuGr9O3Can8kgKCEcfd G3lESaGeXv7fJ1ZSSAgDXrP2LMDuXOVWCNh1cuxgvUccpGSEjYFlw7zON4pcyiygD202 A9dCjCFPfKWAM9FJA/IbmQPq9VqreqU5Kln0v4rK2ZgO+4tANySdvqfwdChxf5luQYBu sGLsDxaBrlI+xjWjZwbkf3gnuamO+dAAmJyoEbJ0ky/v8sueEG4GT5SuUnoQYLnrK6H3 /gJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750074859; x=1750679659; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/UW8DtABN+4gWLwcxZoGbouWonY/5+M3DyOMQmabf+s=; b=FjykLXsUgclKJvrIH1Ee9JSOEKcJChr3beN0ETGCH1Kh1QlbCwW7owx6P1Wexezy8C fQv8aJPN9KmsvoIIXrZHA9cFzsbh1XjpB7f6OdOH61KAxAWB5NBVg+drTUnvIcoU+I7t WJjxMZcmVD7skG69aleuZkbzeoMa3uoFUJfc/s177I0KJFUQ/eCKVF5UAPW3OIWZ9Qs2 XlCpLfxXcezS/q+HMIBjtTnD47iyMA6mbWH1ZwaAr+UiQKMSwXYlIG7r4U6EnDBhVOlv zcce5tYnxT/Nu0Hn6XnzMnqY4vuL9Oy19MvtYrZidoYovUL9vXRFnGo0pIzchkvjLOOS dn0g== X-Forwarded-Encrypted: i=1; AJvYcCWfvVQqKUMH7AdCQemaWYVr+Bop4FuQmqUCUZ08MXFGI1uQ6VsE/gYasYotvHVA03LSUC+FokhWxqu1fmc=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9BkJz9RCsEVZThmGF6EAtZhmmrFizFN/pdkig1g/c006NJHXP P82UkN0ohPqIgQV0aUSQEj2iOQS58eodc37k1OiXoCO+guKyXyrJQN+eM8FkATOMPaELxtTwT/M zZnswnxF0+w== X-Gm-Gg: ASbGncuWQNZDEMIAAARmtau14ERhKHIvIG1lpqOKvUk/Gmn6Wj7X30ehBUwr6ksnb3J KpphZe9YwBJ1h92cyxxarDvqTeVWyHWysNTvPmACjf1otix+wsu4PfShoiURkGNEN9WZYNqroxw cJI1DJ/PcUyb+f0PS6eylXO8bTM9R8SZqQaQZY9OxLBug9kVwmAppnDyJa9yAOv70i+raxI82FK Wa9wGF/JnRh1goSpscj39OkDSOpTWsPqAds/n2s+zmFZdsMrtvXUPyEIc5P40HerjjKj9A4aEmd LyYx1Lq7RUNG7h3vH17eJ4w/NDvKfvkjMESVu9XY2FL7m+zTAvTpA2ZRhEczvbf3saewQAwvs/F ZgVFigCs= X-Google-Smtp-Source: AGHT+IGOeVJ7hItLg5CQ32p4wI1JoyTJsXl9AjQIR/wzWxC9zhhxkEHKpKD3ExHNiskXVW2Tx2rErA== X-Received: by 2002:a05:600c:a48:b0:43b:c844:a4ba with SMTP id 5b1f17b1804b1-4533ca57522mr30136775e9.3.1750074858974; Mon, 16 Jun 2025 04:54:18 -0700 (PDT) Received: from [192.168.1.29] ([178.197.223.125]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4534172d2b0sm73485315e9.35.2025.06.16.04.54.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 04:54:18 -0700 (PDT) From: Krzysztof Kozlowski Date: Mon, 16 Jun 2025 13:54:08 +0200 Subject: [PATCH 1/4] ASoC: codecs: wcd937x: Use simple defines for chipid register value Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250616-asoc-wcd93xx-enum-v1-1-a20a1b538509@linaro.org> References: <20250616-asoc-wcd93xx-enum-v1-0-a20a1b538509@linaro.org> In-Reply-To: <20250616-asoc-wcd93xx-enum-v1-0-a20a1b538509@linaro.org> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=927; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=W84ukinUJ51e433j/q7HBi699hZcbP1TxUuIsLTTSuw=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBoUAXk+l067ic4pERy8pOXfmZc2SFP5Zk3PoJq7 81En4HhsT2JAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCaFAF5AAKCRDBN2bmhouD 16FOD/0ZTGSCOltZ9CPLHSVGrcrND9/EAZxYyYNKS7n2lwRXCdv711TKFzklJGyEOPKtlhjNgGH /Dvjfbtx6vHTFEcz5MdZGN9vSVgRoWKl55pbOzxB6inkSdEUojs3/CSdYjlcyEJh4AR3er1ZG5r HuXK+5YFt3IQX/sbmhUodNP1jZP11zeA8stiggC/eIPv/HJXDbU1A8B9PM+8L/tn38UcrqpQ3B3 3RtYNcrgcvgQd7PlbVB9t2YubgMjwUFC0gC/ag+/y/eYMns1eKw5q3kPXngqHwRbSBUqsUzRXad 1keaiM89EaRst8l1pqPtK54hCrEHb19vmQFMDT0Pfu6QTiNJrIjVpdnoY6n9qKvo4/UR/4V+jmc qEj/8MW3s2K85Q4dgaVmNHXMgr0Rw7IbV16vzyt8xf2LZ1sUxdo4brq/+d2IsVZDhhveLdDB/EY bsn2JZBw1bfG1RmIRAHtXh5iBjNV2MsfoWeTjJd+miGNWkz9uYDdDUOimLyxsF4p0b7P8yj9v/P We+/G9qBHJkRJe2Z47wCLnBy7n8OUUU+jrAL+panlciAG+rHLNoFcQVoeaWpN5SrMe7OWXMS34e xOPNIw5Ctq00Oi5fBNUhuIjM8J94FSfEWMxlZkEkUqHki0CPveVOQDlRz7jZ95ytObU+dNHDeGw Pn9HC4FYijI5U2g== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B The value used to identify chip variant is not an enumeration, but raw value used to compare registers with. The 'enum' is not used in the code at all, so simplify and make it a raw hex value define, so intention will be explicit. Signed-off-by: Krzysztof Kozlowski --- sound/soc/codecs/wcd937x.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/wcd937x.c b/sound/soc/codecs/wcd937x.c index a5cf6015122cc9d30526dd4415a2b28353868d74..3b0a8cc314e05934bbffd38876b= 7ad7e0f444965 100644 --- a/sound/soc/codecs/wcd937x.c +++ b/sound/soc/codecs/wcd937x.c @@ -24,10 +24,8 @@ #include "wcd-mbhc-v2.h" #include "wcd937x.h" =20 -enum { - CHIPID_WCD9370 =3D 0, - CHIPID_WCD9375 =3D 5, -}; +#define CHIPID_WCD9370 0x0 +#define CHIPID_WCD9375 0x5 =20 /* Z value defined in milliohm */ #define WCD937X_ZDET_VAL_32 (32000) --=20 2.45.2 From nobody Thu Oct 9 20:22:56 2025 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4312B2EACFA for ; Mon, 16 Jun 2025 11:54:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750074864; cv=none; b=UJFT3xZLqdmmxYCUotGzIBJnII4j0YlbVOLOBKQceE+4icGDUBfVMMTb+FcNo/jtIeE4dY+fPqwAlgkYrV6j1yyYPygFfFpUpIS/zvN8g+vG3L1wzhi6U88S1mBU36D1na0yaP9xzI9NwrVr7d755X84xf5a2KDynHLjcg2gRu0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750074864; c=relaxed/simple; bh=dko5KYqPzySoU9RnyDxUu4yd2haGpVUPNa9DkKFt8i8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SVTEbgets/sucU3hUmVlIlFJ2oPz995ahTV8RBoXs0/6X+lpD1G1pjK5g+3d/mTnInMA/ZKQOldDgNZAbBbpZgYpZoFcRnDW9YnIfgn41v5lfi7zfjMGGF4xXxI82IaIRTqiHFZvquDKrD2uMbKueZp8EACsH3pYvzqwbFpCJq0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=oxTxTlc7; arc=none smtp.client-ip=209.85.221.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="oxTxTlc7" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-3a52878d37aso846778f8f.2 for ; Mon, 16 Jun 2025 04:54:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750074861; x=1750679661; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=s74Q0lewZDu4cRSnAqEZWy58R9g+TkWV9lfKe5cLOPw=; b=oxTxTlc7O4p869aojC80IEvQB+zc00aRohFibSj7/+ff6pEBDNb09u27hALoKebgjz +Y32GEb8MeTuNTxjqdqVhtPre6OZUYAS08tI+DMD2Q6GUXSxT6MXQut9iH+EjokFPwbY JBEpBdql2n6ShN/Y2kulKn6T4jDeVTu0giGCmQABdyK95siZ4fOca4o2XEMuSbOULSQT WQWYDk7bXS1ZB/XYm86hramaKfaKyp2ClCkXbooZh1x0bybUCrPLZu6gEsm1ixO43S3G d0meYzlrYyY3fJI0sdzefmNDFUBHSJLCEVOmkHuStHWSLPgUB0wzKUruiVE0FVnVKutH TaWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750074861; x=1750679661; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s74Q0lewZDu4cRSnAqEZWy58R9g+TkWV9lfKe5cLOPw=; b=FKKnPUWXQ1AHgPS1TgJFiLEH2ElYqkI9/bN4VdC6rlntgYgCObTBIMp3JvqW34ZVeV 7NKjL9oPE2qLDIQjVCtR2bA3Y0FWIqRQDWOWVHp9FTaePHhrIk+7jVDMtipQhx7RC5Po ZiQTZsGyxRrqMwzaZ6JaPMK/SPCkyxqoGEkwcxZWwl41LAqRT8ol3ink6F0MLuTMuA9v l2/r7dQvKHUOK9+b/bEtBHeGgSPRQkQ1Kr0VeIvJC/fYZpVKAMlR23zkGoGsHXhCsY7/ SDScCOAjib/HllL0AvmWHzmbgFivtvYZozsu6x/UzUKSBO6qZm3z8k9kQ753oHGvWAK2 rEDg== X-Forwarded-Encrypted: i=1; AJvYcCVHnodjk0XgS14ivv2uUMNnWttE9vhCZhPH6dXr9GHBxM60JlxgW41mFzaddEmNtphShOmrloy3KIN5CLc=@vger.kernel.org X-Gm-Message-State: AOJu0Yyt49Pb3Ls7l+Npyk5eohib/WnNSsFnT0qsxOORhxIoWkHx2bBK ii4Biy8+zovYe3LKi/myYXbagiqcQVbI3Jd2nHwkEkH0cL3QZIkKa8k53K/My2Q+Ki5VlV+aMnf LXrACeQiVLg== X-Gm-Gg: ASbGncup2159295cPN0TzbWXdZebAPxyCxYoFs7h4+9uAs3kvLHJecSBiJ2ZWMvLRl+ xHBEken/zLN7MTzFUn8ewAE2jm6h7TAnroFQbfGbQ2lJnDhReD0ZmRPcRvm2O8IUMpPOHwDm57f mC1aKKZAhgtWjQLtfkgf7Z9rvi0HRfdjDZG6XC0uDZjUh1KhIIDIQOMhFyN4xrG6rlEfkGceA2Q 260ytkE613rG69Eq/g/3kXVQiwUtQoVOR5mNe42Xtgca9CbC4yh7IwWRTVR2n61fpCzrs7SwvBe EQsE+pwJlKJUQhas+K+bDJDDeF4FHfg9ERSkYdfU92ZKimBwV8jguAKjgOMtZQgeZyq18/FIVnf sjpBGQ6k= X-Google-Smtp-Source: AGHT+IH/vzfxOQnDsyqXm63fWShGso3DWBAqEt/dm5FiwNVVuEADqgBlxqoRPMV7+O8LrNEllx46DA== X-Received: by 2002:a05:600c:1d0d:b0:43b:ca39:a9b8 with SMTP id 5b1f17b1804b1-4533ca48dffmr32383205e9.2.1750074861150; Mon, 16 Jun 2025 04:54:21 -0700 (PDT) Received: from [192.168.1.29] ([178.197.223.125]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4534172d2b0sm73485315e9.35.2025.06.16.04.54.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 04:54:20 -0700 (PDT) From: Krzysztof Kozlowski Date: Mon, 16 Jun 2025 13:54:09 +0200 Subject: [PATCH 2/4] ASoC: codecs: wcd938x: Use simple defines for chipid register value Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250616-asoc-wcd93xx-enum-v1-2-a20a1b538509@linaro.org> References: <20250616-asoc-wcd93xx-enum-v1-0-a20a1b538509@linaro.org> In-Reply-To: <20250616-asoc-wcd93xx-enum-v1-0-a20a1b538509@linaro.org> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1838; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=dko5KYqPzySoU9RnyDxUu4yd2haGpVUPNa9DkKFt8i8=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBoUAXlted2iMiPCTeysQRJKBzzICcgFBdB2+3IK vEOAmuPyx6JAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCaFAF5QAKCRDBN2bmhouD 163tD/49Fig44V6VoJDkbLhvhxrRXs53a768CECa0NdKIH2NbRwizSBrn8KZOK1OKAobQiOMT0w a33qwjLXDPIkZpbPlmHIu/if1bjbjzVJ6byO6X1sS2sqHdKSRj6qnIgymPCF/9DaTtS4WOrupDA 1kaNSiPWtquJr7kX23lZxJg+6WLEtfLxSov1Gy0KEJwjxaDtTtDiOc1TJbkgbix/OeAyml1PW9k JH/J78VjMJG8uE0/Be4g71ceCCKWJ7GgUjga9dX7St+X1I5RWppCO17PKGkLhuQpef5urdMeY/1 aZdRAM4PjMM5gFsUkIzI/N4y6LiNt3iEuszT9W8P4ZkhmzQfEy1NOTqJjRI8wTUobhnJW2qaB7O V7E70+OM9Ui5wcrI0cruNjeVh/AshnO1UEdqVZXtSWq0OVjWqlwxNNrBalwssQ4l/wZOceQ/ure q7NFjw5pgOnrz2tTyknK92ZgA7DSOuMsCTRWffsD7jE3hbA/QekgiGxt3pW837Zl4n1mVkc2HRP 6t8+4ZqlvlmOvMt8K1sx3HAlDPj68qkNwD+9m6Y9SYFHDEsTBB9jKdiCUpwdTEZOe/6UarU3MMu CqVF+R9oNvsWPbrcFoNtYTrbz+yqEMgdQDUlK3WeVTYFmJFtnLvLVcGXYbztKSaNaiY4YFnuVRQ r9pth7D/yp+vXIw== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B The value used to identify chip variant is not an enumeration, but raw value used to compare registers with. The 'enum' is not used in the code at all, so simplify and make it a raw hex value define, so intention will be explicit. Signed-off-by: Krzysztof Kozlowski --- sound/soc/codecs/wcd938x.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index 6401ac32d1b6faf3f8c97be62e51c809016a954d..711f373ece24cf4e0db73e9e9b8= 432b3ce3a1717 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -25,6 +25,9 @@ #include "wcd-mbhc-v2.h" #include "wcd938x.h" =20 +#define CHIPID_WCD9380 0x0 +#define CHIPID_WCD9385 0x5 + #define WCD938X_MAX_MICBIAS (4) #define WCD938X_MBHC_MAX_BUTTONS (8) #define TX_ADC_MAX (4) @@ -72,11 +75,6 @@ SOC_SINGLE_EXT_TLV(xname, reg, shift, max, invert, snd_soc_get_volsw, \ wcd938x_ear_pa_put_gain, tlv_array) =20 -enum { - WCD9380 =3D 0, - WCD9385 =3D 5, -}; - enum { /* INTR_CTRL_INT_MASK_0 */ WCD938X_IRQ_MBHC_BUTTON_PRESS_DET =3D 0, @@ -3119,7 +3117,7 @@ static int wcd938x_soc_codec_probe(struct snd_soc_com= ponent *component) disable_irq_nosync(wcd938x->aux_pdm_wd_int); =20 switch (variant) { - case WCD9380: + case CHIPID_WCD9380: ret =3D snd_soc_add_component_controls(component, wcd9380_snd_controls, ARRAY_SIZE(wcd9380_snd_controls)); if (ret < 0) { @@ -3129,7 +3127,7 @@ static int wcd938x_soc_codec_probe(struct snd_soc_com= ponent *component) goto err_free_aux_pdm_wd_int; } break; - case WCD9385: + case CHIPID_WCD9385: ret =3D snd_soc_add_component_controls(component, wcd9385_snd_controls, ARRAY_SIZE(wcd9385_snd_controls)); if (ret < 0) { --=20 2.45.2 From nobody Thu Oct 9 20:22:56 2025 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F66A2E92A1 for ; Mon, 16 Jun 2025 11:54:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750074866; cv=none; b=P2ITIBGNirLkhiOUe/DQBtewlimqHEvvKvvGpFU3hnATsY90wF14QPprapYfmsSNTLL+joI1IitjcnaRch6wWNlVgMTEosHn434IqvLMPD7kDvllCieLONOMuRDrkk0Jy8+WqrVpOR8Wfjy6PR7fqzAy38pFgTKd+7g+RU9jGmw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750074866; c=relaxed/simple; bh=wQD0VM9G7FvPvCnA3WbzQeuuI9ByecZFuAoduaJaoKM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Nx42hwYNpkZVf1qHRnFdpxGdXa30rbNzhRDczTMg2oXjEo0G3giIex/+4uzbC0nKU0zxyErEx4ghwL8h2iFHmRhiIYcKfqkCaG9JxAt2M5M29km4Sf/Mue+160dujecjJDwCWBxL7iyJRIDOI011GYUe/c/3RX7PfwNQ4ug9p8Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=DvYA5TF5; arc=none smtp.client-ip=209.85.221.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="DvYA5TF5" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-3a4f64cdc2dso356027f8f.1 for ; Mon, 16 Jun 2025 04:54:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750074862; x=1750679662; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=kxuY0rNktojawI74xu67ZDRUpldYQhaik2TjoTmqjhg=; b=DvYA5TF5zRVHBKwt/+p74aDuYjakaNutbVuUkUS8TjU49pNte123/Zs84K7IpDVG8e GehOewS54QWbEUUr/piSuxtUZ0qnmAyzISkIKOrEUTeWie1dymKZZhUHaK30jpiY+0as RpCIuONik6PzCeaktsNkM6NatMLp5olLqMdG8XCg6iOYLDo5lT8QVYuIjI1sfFv8kJBU TT8VVkGOOrkJc84LwCgfV1qlnVHmpkHFG+gqbZkos3z1WOUABU+hQnodPJ96OFIeJQYF qYpgQIQiZpRZ9OrUr/NfxwilqlyA8E/IUmDSR4ucRt7X9dQnmPAU/cTGofBksQlgOvfI q/Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750074862; x=1750679662; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kxuY0rNktojawI74xu67ZDRUpldYQhaik2TjoTmqjhg=; b=K1wEe7Bgpxw5e5VarIFslmHFLjWDSacvQsE18kAEkyneERTI931pbrW7nmbJsUgr/U e4OOY+mZuWJJN60BIvIbEJ7gx7qnLiQpvaPKD3UzHOVc6vfWxniunKnhgmYk0YKdqGsi Dwq3nk4gkhlgCoz+oantk0L6E77L9xjmcWW89sklWaBHkMFpSixX5AlX0EcC60o2CMU1 clfpFpVXWyv20QN/SKT83bJ5XiCZ41o1IZseQCalzTdZDyUhttGLdb+v3X+SOhxE+8Nu 2W7XISfrg5RToRfEC9cnuBBLs1ZqfseQ/bND2CqZekWyD002j6WNg6YR5mqT+kVcwGNp Oyog== X-Forwarded-Encrypted: i=1; AJvYcCW4THbYYI+uSrGj+qhwA9wBPgMbxYYPLWcMJ2QiZE9Zrz01eFc/NvUzWiuVub+9eK7zGlcF9iQ3RAH3p6A=@vger.kernel.org X-Gm-Message-State: AOJu0YyWhcFk4OEE0LquBnxeAVWa/jQZRjsW7fO/PoeXpkhBfPCl3TRg vaMwEXIUxH6F6RKwBwhsjnlTAajv6KiXXuyC87w+NvQPDNU/xwbJlin2Nm8frTwMJ9mOMZrHjIj uB/qUAvMqNA== X-Gm-Gg: ASbGncsvLpn7opASk7C5hkMewd1HVemZr0klg0WXg0TvjdW6N28xU1x/oa9tMhqMEJ4 OurlE6tVSNJJFM2RHfgA7cRyKZqKUH1jHMpzxsV+5nu+zAAWyc7C7ZaCdSpAkab7es2DOtC1NCe j9tnB7sZh/FBncLT64AVKRiC5WX92+ldL12xDgxLRoH5KKaM8AzS1jNbqe0OkLf+U3qiYPcQFBG fTXAINBMk3JA7r23HIJs+O8gDf6CE/o2EwJfPE6X/gfrtBn6XPkKCqe+X6wV7X4ZsMBvKoLKi/a fsrL0q0NfFh2Isru5KMF5o53fj/E4tYj55+5uY1SnM9J3sknrMZgSZh1Y7BMMZEtn3kCevWFPzw 2ATRbP2Q= X-Google-Smtp-Source: AGHT+IE/uypUYBrtwLuK0ZJnxv8FZRSLfV5+7+cqEFi6k+t+x3Cu8YNCPzj4gbCZ8ch/ks7SHt3yOA== X-Received: by 2002:a05:6000:188d:b0:3a5:28f9:7175 with SMTP id ffacd0b85a97d-3a572e7a00cmr2559415f8f.9.1750074862418; Mon, 16 Jun 2025 04:54:22 -0700 (PDT) Received: from [192.168.1.29] ([178.197.223.125]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4534172d2b0sm73485315e9.35.2025.06.16.04.54.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 04:54:21 -0700 (PDT) From: Krzysztof Kozlowski Date: Mon, 16 Jun 2025 13:54:10 +0200 Subject: [PATCH 3/4] ASoC: codecs: wcd939x: Use simple defines for chipid register value Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250616-asoc-wcd93xx-enum-v1-3-a20a1b538509@linaro.org> References: <20250616-asoc-wcd93xx-enum-v1-0-a20a1b538509@linaro.org> In-Reply-To: <20250616-asoc-wcd93xx-enum-v1-0-a20a1b538509@linaro.org> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2102; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=wQD0VM9G7FvPvCnA3WbzQeuuI9ByecZFuAoduaJaoKM=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBoUAXmUb0Sj8yAJGR79L6XHvLQKiPbQta/JCPr2 D+N1aJFX7qJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCaFAF5gAKCRDBN2bmhouD 11IzD/9fr45oouoUk9Yj6Z+upATb4MHF2Tk3Zv5A28ia88TOok0d6+TBtG5xn71dvYGmqEPlBMT qc1QZADj5tswjvAcsO5xDqhUIuKOlfcj8X5cbra+SGRG3wm6/LQ+dB8hQ/QUObWa1jYCqDYXU8O 0aR/Yn2xDAtI77BiWndxySOsccIAyuaWl3y+kOhCwXINctaYZ+C8GcF+i8/tLLesREiFUIAgVvO aRVUaAUftfYknyqpnXzccWPW+DU0FzCPVv0AIFyOaF1p7XofLvB9N86wXD9vzvbCl5A5wwUDpNr cfDWtIj/5dQskUwL5XGYKmGSQBSEzE4Q8pA1otnZBC9RgEvXcKokZyd7zUewDuO0lti2roQCaTn ET6BtDPjvX4l6GN1LDU544Wn6of4rm01rqUyVac3/mQAKk73FXHMm3HrAE7C67E2Cj9kPmHrZ+/ NdHK4/kf2BhTV8rLtQa3DBR87Gge1pC7B7DIalIHyfZOin6As6SneCLTXJqhiwjszetHX4M/BeD 2lpWEq0PYqdFWeTBDwRLuj0ieEFr8gguEB9Ilu+yNn8ikW3E2KANuxq5oWXnzxMvzzGEdFgFTTg VGGkSUckWcXVhX9lhRHIMrVwTdEmTu5//eKewlEAJ98lN3tpWiZSlT6mYVpQN6DXOMoJ/XuaPt4 CMl6Ny+sSr2vEsQ== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B The value used to identify chip variant is not an enumeration, but raw value used to compare registers with. The 'enum' is not used in the code at all, so simplify and make it a raw hex value define, so intention will be explicit. Signed-off-by: Krzysztof Kozlowski --- sound/soc/codecs/wcd939x.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/wcd939x.c b/sound/soc/codecs/wcd939x.c index 45645abe3085662f7c4c6d76a590b98ad71fc56f..7ec751a6cd2610dd3c4eb2bb655= 6e8700b62427c 100644 --- a/sound/soc/codecs/wcd939x.c +++ b/sound/soc/codecs/wcd939x.c @@ -36,6 +36,9 @@ #define TX_ADC_MAX (4) #define WCD_MBHC_HS_V_MAX 1600 =20 +#define CHIPID_WCD9390 0x0 +#define CHIPID_WCD9395 0x5 + enum { WCD939X_VERSION_1_0 =3D 0, WCD939X_VERSION_1_1, @@ -85,11 +88,6 @@ enum { /* Z value compared in milliOhm */ #define WCD939X_ANA_MBHC_ZDET_CONST (1018 * 1024) =20 -enum { - WCD9390 =3D 0, - WCD9395 =3D 5, -}; - enum { /* INTR_CTRL_INT_MASK_0 */ WCD939X_IRQ_MBHC_BUTTON_PRESS_DET =3D 0, @@ -1483,7 +1481,7 @@ static int wcd939x_rx_hph_mode_put(struct snd_kcontro= l *kcontrol, if (mode_val =3D=3D wcd939x->hph_mode) return 0; =20 - if (wcd939x->variant =3D=3D WCD9390) { + if (wcd939x->variant =3D=3D CHIPID_WCD9390) { switch (mode_val) { case CLS_H_NORMAL: case CLS_H_LP: @@ -3065,7 +3063,7 @@ static int wcd939x_soc_codec_probe(struct snd_soc_com= ponent *component) disable_irq_nosync(wcd939x->ear_pdm_wd_int); =20 switch (wcd939x->variant) { - case WCD9390: + case CHIPID_WCD9390: ret =3D snd_soc_add_component_controls(component, wcd9390_snd_controls, ARRAY_SIZE(wcd9390_snd_controls)); if (ret < 0) { @@ -3075,7 +3073,7 @@ static int wcd939x_soc_codec_probe(struct snd_soc_com= ponent *component) goto err_free_ear_pdm_wd_int; } break; - case WCD9395: + case CHIPID_WCD9395: ret =3D snd_soc_add_component_controls(component, wcd9395_snd_controls, ARRAY_SIZE(wcd9395_snd_controls)); if (ret < 0) { --=20 2.45.2 From nobody Thu Oct 9 20:22:56 2025 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA01F2EBDD5 for ; Mon, 16 Jun 2025 11:54:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750074867; cv=none; b=GL5D1DkiAeq/NyA8amcGejagnbVry/uoUYWO/3Qqgh94+xdZN6FOZHXc+c7+smE+QPFrChirXCopP6YuFsXMD53j1O9l91sBRhaTfCHEcFeQh/uFf0lUhhpnm4JYfVo/zuHU79DqcQDjcGRs/Re8tMCBrs+PsiC1oM3ZKUWQK5w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750074867; c=relaxed/simple; bh=ddclz8Y4tyEeomH+WWsEabbA3+O6bU2+U3UDS2VzqMw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IvLNBaDRh+hviWnTuKroBGvVujL9ksvGXsyubUbfnxzqsmoloPBcVkqjF8AcWq48R3WhP6BWLPp9nbABI4EXGEO6i37GprqQrbaIVHgugdkAxngv/QajdwX4D9D3DUWSmnG7oHpG85MqtvLYSYTKAuzyLj3mOUdPfZjPrReQq4Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=EUzBoQTd; arc=none smtp.client-ip=209.85.221.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="EUzBoQTd" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-3a4e62619afso361886f8f.1 for ; Mon, 16 Jun 2025 04:54:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750074864; x=1750679664; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=fktTiKLJcxcAabt7Z2x0w+wHenPcFx1mmVYaf7lNKSs=; b=EUzBoQTdIIPbdL1WA9EYfhppuxlQE0ALYUZgPyvyZOo4FCmckrnqgAtEGyXoGqd8ZI 7x+YmMNDPD3jVakDpT4w/4Q8paPLVzsjn5RPhR4tiPiOcjxLI69BwzJ+pVYsOV/0bctO BmYMyWYfW4OCMY0LUaCakfTqjARLB+Ri2qnzIMlK5VCAsaUcaIYOaKGgR4wA4+VBEtqI CgHJQj6j6Y4mieU6M34hPLGxc8ImEy5b4w6W5cY4JI9Mt2SrY45yCqoBgAFBqlId+hBe pC1o9N159migCiGK60NMq36kUOvYRHLiYA+a+v7wxM+5/qYfXUelRt1el/IHzXMVKYVc PSgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750074864; x=1750679664; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fktTiKLJcxcAabt7Z2x0w+wHenPcFx1mmVYaf7lNKSs=; b=Fto4V8Q968zpD1jMd39e+VdvwLYDXLImDYIkf0sRN1pcca4eo/Khh8lrfCm5O3OkFC uGskncU8xEdu48NPhuvbxnknQcQZqFi9r58cVH7FMmxhELvvjvrUUfxaxnzvGgMGXMjb jzSe2N5L5ozqxyqst1rmIA03oGZgWwvRe8d4d3Na/+2o0hMBy1fKVMJgkwOLi2r8+hpm NTVoKy5w6UrcAxfDJvW2f+h+KQDyor4POZCOGEb92YspQcOG4TeQPUJLE81tXrvv/kE8 fBY464b2BTMR1D9sO5/GNU1KfALzL6SdNJ6WnUjp7fm3DM7TaxeKWdmgXLN2NcjJzl1W 4MTQ== X-Forwarded-Encrypted: i=1; AJvYcCXsURsuXbNOZX9+bmlRZEsGJLYliiEGRwWtiGLVp9bOsbkUfr5ZM4jTT4cKNjvUHad8NbEooRoWeWqhhtQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwZbLHADq6vECy/U80tuzjV280/QOGCGYBiniPwUUI1up/XBI9q j4JvFLr7Jexgwj+1kKQYiHdA8QxvXltMXSsZbm5QEGNfyaxoRmV13z/l0hi/wY5NxSVCH8ZpQga BBrU9xilxlg== X-Gm-Gg: ASbGncvgFP9nFVt4d5latCPGZQT0hqWKyf7yIUxcjrwFHk0U4vPlaok3965825aAfXf qejI//lZY+XVhqwsNkqkCSYPUG2Udm+tHyAdbwcsxXQlL7QF1EqsXZZUBKYmZ9kUAXuSj/SSkar ncA3/kqXLmVkOU43C51m7zax4t+eGLMJM6FggOJMxWrqK0VlqGYNMGcuIjej34JtObUoX8TkDs3 vCtakD4VEcVtV1NA56KfGmGRtD33rzPGowHCE8Y5ZWaz5Psq3oK7o6Cvont7pqOBkekUGKoDXQO n19DprBiHCD3icyr9xNzBCuJW2qj0+QkugP1cLzpeRzc5Jn1rFHrdJ7Q1NRiQzDynuJ16AU/kHQ UWeXWo9Q= X-Google-Smtp-Source: AGHT+IFu5UZoYZbMgPHu5hESmLw4B9k4Utb2s+bTUbe+a2wXFn7qit0ncmJKeYKcClMQRSCfizYTsA== X-Received: by 2002:a05:6000:2207:b0:3a4:def8:1465 with SMTP id ffacd0b85a97d-3a5723ab6d3mr2358052f8f.9.1750074863756; Mon, 16 Jun 2025 04:54:23 -0700 (PDT) Received: from [192.168.1.29] ([178.197.223.125]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4534172d2b0sm73485315e9.35.2025.06.16.04.54.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 04:54:23 -0700 (PDT) From: Krzysztof Kozlowski Date: Mon, 16 Jun 2025 13:54:11 +0200 Subject: [PATCH 4/4] ASoC: codecs: wcd939x: Add defines for major/minor version decoding Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250616-asoc-wcd93xx-enum-v1-4-a20a1b538509@linaro.org> References: <20250616-asoc-wcd93xx-enum-v1-0-a20a1b538509@linaro.org> In-Reply-To: <20250616-asoc-wcd93xx-enum-v1-0-a20a1b538509@linaro.org> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1291; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=ddclz8Y4tyEeomH+WWsEabbA3+O6bU2+U3UDS2VzqMw=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBoUAXnVMtL7cm+NvV9zHJndqRa6XP/wwXYcWL4j CsswTFi+jOJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCaFAF5wAKCRDBN2bmhouD 1xQzD/9y1KbbWGk0FP235eMwYiaIgIv18PnU+8oI3TVbRkklt1utnwXfX8YgoKICdzJVtz+OmeA XX5oy22ITZobBBcE4A+FZ2a9L4L6IbyOQD09yCYB4zi3Qvg8qNNEkz/IqT9uA8Yh5rC+21sTBuq qPnRIvQXJZf5maGTk9Hw/tfBFHR/8SUYKGDawam6d4QNhoD8pVjP7tFKIN99vk/Qj9TvTEi2bag GzgDjVgXqrJphEkpG5PxOLk2+rzNfiQZnQ+ZOzJj864v2OO+QVv8Q0zNtPdA2iSC8J6hTicKJtj Mi0vhYIDvnpifIiXD7xa+5xH2bwCzbzh+QoNttcTA+lSVMN9EEQfliw99PrWd6axmMRDZkAm4NQ 592KLRFI5DKrYk9J3Aef0WJFq+qOBuehcTY149VcQSnOAW5oLCCdnDyqpNG20yPIer65uP6kVmd ZB9p4lhx6CGkejVknx91rgUeZEV/tQ66mV7TnBZOvn+D3QVkYiq/SA4W9icvkOU37+P2fJ1UhjT ViN85yXoJmh3D2RnHA218ZrKepNsiHBlDPg6RZ8RuSkgGMkECDJb4O5DYZkW5SXcPfehLzDGfmK BZYa8C1ZzGPdLISCTxs8cuvD9911eWlH/JTUGdUUdLzGPus1vpXtLEV8xOp1ym4kWc+5tHEuy03 gJStJwISFvzikPA== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Replace hard-coded register values with defines for checking major and minor versions of device. Signed-off-by: Krzysztof Kozlowski --- sound/soc/codecs/wcd939x.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wcd939x.c b/sound/soc/codecs/wcd939x.c index 7ec751a6cd2610dd3c4eb2bb6556e8700b62427c..64f082e474c1d404699e304743e= d1ada3481effb 100644 --- a/sound/soc/codecs/wcd939x.c +++ b/sound/soc/codecs/wcd939x.c @@ -39,6 +39,11 @@ #define CHIPID_WCD9390 0x0 #define CHIPID_WCD9395 0x5 =20 +/* Version major: 1.x */ +#define CHIPID_WCD939X_VER_MAJOR_1 0x0 +/* Version minor: x.1 */ +#define CHIPID_WCD939X_VER_MINOR_1 0x3 + enum { WCD939X_VERSION_1_0 =3D 0, WCD939X_VERSION_1_1, @@ -3449,8 +3454,8 @@ static int wcd939x_bind(struct device *dev) regmap_read(wcd939x->regmap, WCD939X_DIGITAL_CHIP_ID1, &id1); regmap_read(wcd939x->regmap, WCD939X_EAR_STATUS_REG_1, &status1); =20 - if (id1 =3D=3D 0) - version =3D ((status1 & 0x3) ? WCD939X_VERSION_1_1 : WCD939X_VERSION_1_0= ); + if (id1 =3D=3D CHIPID_WCD939X_VER_MAJOR_1) + version =3D ((status1 & CHIPID_WCD939X_VER_MINOR_1) ? WCD939X_VERSION_1_= 1 : WCD939X_VERSION_1_0); else version =3D WCD939X_VERSION_2_0; =20 --=20 2.45.2