From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.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 9E7C63E716A for ; Sat, 28 Feb 2026 19:08:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772305739; cv=none; b=kmL74YhW19v4EHwIbf5E2JX7+N0l/1QVlFVh3+Nnb0C2cDacfn/xnKUsfbBCxymXTomXtMFZjT81xM3EYQgJg4fordWJKi8SJzeONtjcajk9uUBKLH1wIQVKerQKJ8eFHvmpsqtHCXpxVZ7UknBFvS8+VKp48xrftsoGGLw9QGA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772305739; c=relaxed/simple; bh=PtAq7uarH7FYg2lCwUWUEgt0lruxDsd5ZYmLbU+9L4c=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=PHwfV/PhEWOohJFy8GEVQ2VSkLfl62FGSDEakJ8nzo2DgMkqJ88dVcgtO150NOMUQdDCXqUPogWl9xmESvDFPdeRwFE5gtSrAXMTi4f8DUZnPCkw/5+XmCWmptvBDj8oq62wxeUdqVlGnwxT3jZJewCNVvNNiArQGJSUdlAwDLM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lC3SNZvV; arc=none smtp.client-ip=209.85.216.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lC3SNZvV" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-3590042fa8eso1807283a91.1 for ; Sat, 28 Feb 2026 11:08:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772305738; x=1772910538; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=FQMm92FyAQJT+uBQvsnjueB09ZieXbwDxF1QO9oPOOM=; b=lC3SNZvVZCJ0q/8N3HW1Ogb2eWnNQ6KDv1yxIDvk67DGMlI0+gsVEg1NT+UuD6w4yk BZ1JgypQCVzLoY2MLbsaOQjcD84D79HhH4wN27+wywWXTfBIqtMRIr1vDW7fn4lvYFk1 P80SPzXB8TEWBt0VgkeZhnzLAWigq+9HBqTeYthMGxtUFPZcOXPuUbt1yof7Stv2xC0V xwC0Y4gyosst68GIMTErGIGZId79qC7h4Iq7Zf8NQ1O3MsicV0bYHBvcW89jyXWLeL8E HRZIYg7GYCZ8CRZ61TqofSMeVvl0RVHRfFQtrmUAwEFb5KwDbL7lL7gFGOzfjnut0K25 RixA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772305738; x=1772910538; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=FQMm92FyAQJT+uBQvsnjueB09ZieXbwDxF1QO9oPOOM=; b=GX/JyFM6yoSLPwqt8T/bN7eEfjTi2Lp0Yu67byu8tCwXTw09iJN0Dk0D1kBN50SH4O gIae2tlrSeHBY8fUccUpf/JVYlvVmgZOzAivXrz6XqRgA/Tt+ZL8XvgTB9XE8H2WKNDf ToCWhYsJ5Vv29FGc3oaJyyBUL1Ee7uDCkcXuV0ZAvdOnp7lLe5X6Z95fpqch9BIYRVOW sfCA5rjDBSYlL0bfFO8ukN80VL/VL3XhCitmM+cqOCANPhZQyXubGKX9D/6hMxhDSC6t WzlQdQ/yCVwmEs9kcZTOW6R0XqFZszx9mZ5sA6CjcrcvZdzPZzoe+qMtOmrL1NP4SX2q eINA== X-Forwarded-Encrypted: i=1; AJvYcCWhAJKz/rvW/qG8gaccjE52gMVm9YVn6L8ta9NrKZFvsskaUypQsJmwQ15If7GVv44YymBF+j9vknxN6oI=@vger.kernel.org X-Gm-Message-State: AOJu0YyxjrMhZ1tAfzQBwUFoasg8W3QWTHoGaZcv3PsyqG8M5cZijBrU ZU0guGBIdJQH5VvBbkaJ+pbg2JvVTTdVo4Jsi4TidtrdggLiLRrFNJKl X-Gm-Gg: ATEYQzwFgQx7xfK2RvwoQLm+rZh87eV4Fx+acLHxJNcHcKG2x6UOKXz6jIrzsEAaeeC kI9Vi+uE/YjbBQcAswg29gK6HLWpn/NnoZlEU5t9dIT1sBK5dqMfDO4Pf3DPntnFgWKNF3dx5GH nLBFzVlanvsoH4LXbUGDN9hKSgwUL3PTTEJ908qnUAuVIwm56fLbgG+STg0x9pt1wTq0yw2jvOE LXtsTYQzoIDCUX63uwxO3fYGmkYf4SfJ20rg4Sx6N/C3bc+L4xMpfPhhAFuH5pp7mPGf5U6wr40 REmhSK6TLf/4/sxTKOf0K9JFLMQ4pzuC3Ti58v0NRpa/e9B2q8cZFkbo+SEL3UgqLObnK3ak9mV wwW/dg7MlnVoDw5VSauLMjmZzUt9OnQeGXrFCudVITPyxbm5JpB38zwg4jIDHYP64oNXhbPfNrZ gL6+33wmwyM2oXION8qXMKCPgZN2ubnbewujoeQ4eTv5T8ZiH8gdpy9kDHpg6/HUO7Xt/XKhzYY hwhlyQ= X-Received: by 2002:a17:90b:3c4b:b0:349:3fe8:170d with SMTP id 98e67ed59e1d1-35965c24309mr6728918a91.3.1772305737797; Sat, 28 Feb 2026 11:08:57 -0800 (PST) Received: from buffalo-ssd.taila54753.ts.net (M014013071096.v4.enabler.ne.jp. [14.13.71.96]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359037af175sm11303251a91.13.2026.02.28.11.08.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Feb 2026 11:08:57 -0800 (PST) From: Akari Tsuyukusa To: lee@kernel.org Cc: matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, akkun11.open@gmail.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, y.oudjana@protonmail.com Subject: [PATCH] mfd: mt6397: Properly fix CID of MT6328, MT6331 and MT6332 Date: Sun, 1 Mar 2026 04:08:20 +0900 Message-ID: <20260228190820.357538-1-akkun11.open@gmail.com> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit CIDs set for MT6328, MT6331 and MT6332 are not appropriate. Many Android downstream kernels define CID as below, MT6328: #define PMIC6328_E1_CID_CODE 0x2810 #define PMIC6328_E2_CID_CODE 0x2820 #define PMIC6328_E3_CID_CODE 0x2830 MT6331/MT6332: #define PMIC6331_E1_CID_CODE 0x3110 #define PMIC6331_E2_CID_CODE 0x3120 #define PMIC6331_E3_CID_CODE 0x3130 #define PMIC6332_E1_CID_CODE 0x3210 #define PMIC6332_E2_CID_CODE 0x3220 #define PMIC6332_E3_CID_CODE 0x3230 The current configuration incorrectly uses the revision code as the CID. Therefore, the driver cannot detect the same PMIC of different revisions. (E1/E2 for MT6328, E1/E3 for MT6331/MT6332) Based on these, the CID of MT6328, MT6331 and MT6332 should be corrected. Additionally, the incorrect MT6331/MT6332 CID overlaps with the MT6320's actual CID: #define PMIC6320_E1_CID_CODE 0x1020 #define PMIC6320_E2_CID_CODE 0x2020 This causes a conflict in the switch-case statement of mt6397-irq.c, this prevents adding support for MT6320. Link: https://github.com/parthibx24/android_kernel_mediatek_k35/blob/4853d1fd9e40563573fa6d6b32b75d571a95e2b7/drivers/misc/mediatek/power/mt6735/pmic.h#L10-L12 Link: https://github.com/meizuosc/m75/blob/80ef1d26c5d73e131d064138ed09ff5a2be2bed8/mediatek/platform/mt6595/kernel/core/include/mach/pmic_mt6331_6332_sw.h#L9-L15 Link: https://github.com/toffyjan/android_Ticwatch_S_mooneye/blob/4f2a73b26f3821afc452cdce660cdbc73daf4e4a/arch/arm/mach-mt2601/include/mach/pmic_mt6320_sw.h#L29-L30 Signed-off-by: Akari Tsuyukusa --- drivers/mfd/mt6397-core.c | 4 ++-- include/linux/mfd/mt6397/core.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c index 3e58d0764c7e..1bdacda9a933 100644 --- a/drivers/mfd/mt6397-core.c +++ b/drivers/mfd/mt6397-core.c @@ -297,7 +297,7 @@ static const struct chip_data mt6323_core = { static const struct chip_data mt6328_core = { .cid_addr = MT6328_HWCID, - .cid_shift = 0, + .cid_shift = 8, .cells = mt6328_devs, .cell_size = ARRAY_SIZE(mt6328_devs), .irq_init = mt6397_irq_init, @@ -313,7 +313,7 @@ static const struct chip_data mt6357_core = { static const struct chip_data mt6331_mt6332_core = { .cid_addr = MT6331_HWCID, - .cid_shift = 0, + .cid_shift = 8, .cells = mt6331_mt6332_devs, .cell_size = ARRAY_SIZE(mt6331_mt6332_devs), .irq_init = mt6397_irq_init, diff --git a/include/linux/mfd/mt6397/core.h b/include/linux/mfd/mt6397/core.h index b774c3a4bb62..340fc72e22aa 100644 --- a/include/linux/mfd/mt6397/core.h +++ b/include/linux/mfd/mt6397/core.h @@ -12,9 +12,9 @@ enum chip_id { MT6323_CHIP_ID = 0x23, - MT6328_CHIP_ID = 0x30, - MT6331_CHIP_ID = 0x20, - MT6332_CHIP_ID = 0x20, + MT6328_CHIP_ID = 0x28, + MT6331_CHIP_ID = 0x31, + MT6332_CHIP_ID = 0x32, MT6357_CHIP_ID = 0x57, MT6358_CHIP_ID = 0x58, MT6359_CHIP_ID = 0x59, -- 2.52.0