From patchwork Tue Jan 30 09:56:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 13537123 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 32822C47DDF for ; Tue, 30 Jan 2024 09:57:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=sMxRirpa263d6PmLZyC9XRaAp28SbobvUK5ST0uEzHo=; b=TWC9J8DszLxLO0YOElwLfTPRPg 7X9oqqaSRqp13+8KOytD5goNG2QvUC/bsCO9J4sIPQI8UFR5jovNpEecQC8lHALOyzOdgtG2PeR7N TnWHUdOmlqXXOO+FaUupOHJZ2xXL0gbcy4BoKQ2SDengbc4N1kD4QfWVoUXf7hAMH6Sq+taKF8uaw GF7iej4G1P/2u1xUWcP3EnLJnNZNQiviXb4GB5iZM3hbcrPZ98mM8VLWMrW3LCXAwdacgKe+GnkJy UTEXQ9M4+VLdmVVyJisdY3pNC5S0zMHd1YFUM77jj03yx8jQ5OJl49XgceaZSXymCPHQNU4IDKKiu Qsu7XBHA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rUkrc-0000000G3iK-35S0; Tue, 30 Jan 2024 09:57:08 +0000 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rUkrY-0000000G3eX-1pdw for linux-mediatek@lists.infradead.org; Tue, 30 Jan 2024 09:57:06 +0000 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1d8e7df6abcso10590375ad.1 for ; Tue, 30 Jan 2024 01:57:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1706608622; x=1707213422; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sMxRirpa263d6PmLZyC9XRaAp28SbobvUK5ST0uEzHo=; b=Fm7DidgWtVfQ1I698rhCQEmpYlhfLmjPsVHTUAMDbl1tyTb5nIspNoYpDQnWCeaWW2 wMFgYMKoWh4S1PJxv098+hzQXXch8Z+tbWa7wBjAgtV1aWP+3JdYFfofRNW0SnsomoDO 3E9HhC39wegdgLcjoEfTv53OcGcEgty1h8710= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706608622; x=1707213422; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sMxRirpa263d6PmLZyC9XRaAp28SbobvUK5ST0uEzHo=; b=qfHMTd980MEDwA0xq++z9AK4rYSSwpyTynckeLiJx5UtUeI27P/DBcM1xB+CikQ6Yl sAjuKN3/lrK3+O2pEL8x8KaqoHHJh8eeM5FJr1DWderJfLnu3hvKHf1wuhlrgMT8dCf1 Z8D7775+PsBd3KBICF82piQ5T26w607NH/q14F0idup38fh2mOA2dxsknw4/IwM/MYn9 0Az5IdjzI4mdNQ4SWMqY7kdkjXR8MjusqikB/0LZeM2DmZdNgc8SxRFsuUqbg2DyUGN9 IPyVYpCJ1finF17RO7oatWM2nH7bO2ciuzxmQOoI91JuLTFM+fKdPEslB8wKESn5ubpi /aaw== X-Gm-Message-State: AOJu0YxlHu7E90zSWEbW3DBwQnNKI8K8ZMHnddyVfJNeq3oMAYoihv1V iR9NgGHj4u45OQ2mhSH2WulSoRxjIllcmf2YuZNdUyrUndEn9HtKLiVNJn0qsA== X-Google-Smtp-Source: AGHT+IHjRn3nfznyOhQX8l8ftcqqS1VpyZkxitaxKAKHRGb39QcMRCBeDFEsnLCSu5ZRIaRQd6A10w== X-Received: by 2002:a05:6a20:3f95:b0:199:c8f1:58 with SMTP id ay21-20020a056a203f9500b00199c8f10058mr4049745pzb.41.1706608622688; Tue, 30 Jan 2024 01:57:02 -0800 (PST) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:469:110f:d748:6896]) by smtp.gmail.com with ESMTPSA id sm5-20020a17090b2e4500b0028ffea988a2sm8069810pjb.37.2024.01.30.01.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 01:57:02 -0800 (PST) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno , Srinivas Kandagatla Cc: Chen-Yu Tsai , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, William-tw Lin Subject: [PATCH 1/3] soc: mediatek: mtk-socinfo: Clean up NVMEM cell read Date: Tue, 30 Jan 2024 17:56:51 +0800 Message-ID: <20240130095656.3712469-2-wenst@chromium.org> X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog In-Reply-To: <20240130095656.3712469-1-wenst@chromium.org> References: <20240130095656.3712469-1-wenst@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240130_015704_534414_1AC8FA0E X-CRM114-Status: GOOD ( 18.37 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org The mtk-socinfo grabs the NVMEM device devm_nvmem_device_get(), but then proceeds to put the device directly with nvmem_device_put() if the read is successful. If the device fails to probe and goes through the devres release path, the device would be put a second time, triggering a use-after-free error from KASAN. Fix this by dropping the devres part. Since the NVMEM cell data is read only once, there is no need to keep the reference around. While at it, clean up the function to directly reference the NVMEM device node and use that to find the NVMEM device, instead of finding it by name, which is more fragile. The cell node is always a direct child of the NVMEM device node, courtesy of the legacy NVMEM cell layout. Thus of_get_child_by_name() is a better way of finding the cell. Last, correctly put the device node once its use is over. Fixes: 423a54da3c7e ("soc: mediatek: mtk-socinfo: Add driver for getting chip information") Signed-off-by: Chen-Yu Tsai Reviewed-by: AngeloGioacchino Del Regno --- drivers/soc/mediatek/mtk-socinfo.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/soc/mediatek/mtk-socinfo.c b/drivers/soc/mediatek/mtk-socinfo.c index 0094f43e1e08..3909d22062ce 100644 --- a/drivers/soc/mediatek/mtk-socinfo.c +++ b/drivers/soc/mediatek/mtk-socinfo.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -82,25 +83,28 @@ static int mtk_socinfo_create_socinfo_node(struct mtk_socinfo *mtk_socinfop) static u32 mtk_socinfo_read_cell(struct device *dev, const char *name) { struct nvmem_device *nvmemp; - struct device_node *np = dev->of_node; + struct device_node *np, *nvmem_node = dev->parent->of_node; u32 offset; u32 cell_val = CELL_NOT_USED; - nvmemp = devm_nvmem_device_get(dev, "mtk-efuse0"); + /* should never fail since the nvmem driver registers this child */ + nvmemp = nvmem_device_find(nvmem_node, device_match_of_node); if (IS_ERR(nvmemp)) goto out; - np = of_find_node_by_name(NULL, name); + np = of_get_child_by_name(nvmem_node, name); if (!np) - goto out; + goto put_device; if (of_property_read_u32_index(np, "reg", 0, &offset)) - goto out; + goto put_node; nvmem_device_read(nvmemp, offset, sizeof(cell_val), &cell_val); +put_node: + of_node_put(np); +put_device: nvmem_device_put(nvmemp); - out: return cell_val; } From patchwork Tue Jan 30 09:56:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 13537124 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0F730C46CD2 for ; Tue, 30 Jan 2024 09:57:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=FAWe64W2NwnFAQiXHeHZ8EMU8gr37Jq34GIw0wUlRAI=; b=zzUeHibBszDSwqCZrV+IKCQVn2 lb7xo64wphu/ULCXybkZUjmpBb/5cBNccoOwhrmBgKuLO5r5z0jq/njrgGrcVUNwROXS4yXB7anIn dYSyFYvIwDwoxtUWdTWRJlbB1WrAICWq6NdM2JnQggD4c31uG9cA+s/D9/s/m7C09xhnADY/i6xgG 5Lrb+R7voCzd0LZsRxu85RIIIklbhmbQXQQVnhXnZPderAuu3YQWP5rrkIGYnOhULbgLxdnZ5fE/w 2fkr/PcOeGUvcMzo696FY+fK8uymo9rtdBgrGJu8+xb+gKYtEumSwMTHcvcDM1ZR5QsXgK0KRI5SR 3lBz3V7A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rUkrm-0000000G3n8-2XlK; Tue, 30 Jan 2024 09:57:18 +0000 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rUkrZ-0000000G3fX-1HxY for linux-mediatek@lists.infradead.org; Tue, 30 Jan 2024 09:57:06 +0000 Received: by mail-pg1-x530.google.com with SMTP id 41be03b00d2f7-5d8df2edd29so597343a12.2 for ; Tue, 30 Jan 2024 01:57:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1706608624; x=1707213424; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FAWe64W2NwnFAQiXHeHZ8EMU8gr37Jq34GIw0wUlRAI=; b=gFgipmO8N2vQH0hj7eN97zhGH8pUqwbWhaHqEOR5KPhEaQxkuw74V6P04eadmT62zv 2v/lSmI6KdxvHE8n+mApSYlrog/UjWgFcDBRXCfGB3rTBL26BncKOfpAp5mygTTsKREf EfpmpXmwvxIV50+JctyYC6d3ctQxKoKHlgX/I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706608624; x=1707213424; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FAWe64W2NwnFAQiXHeHZ8EMU8gr37Jq34GIw0wUlRAI=; b=cXT8zrlWWfLp5WQ3D+fPD50M9e7/V81LUzWMO9YiZIm2B/3mfAM2CSvmQ0wV/JLAnB b+9LVjiWeAzOzbH5xHOVSPNu+rTKH9KX+6QzmceBNMkcBPAt85KP8b9HYjdGQ5xkPPWs Q3IRK1jfrODaWuZu7mOloaW4JeGS2Np617V52wjPEG6+T2xJNTJoLA18FIu7tRkK7mBj J9cY2a3zaRUZXvSsdJo3t0Bh/uYHNsuvRSH8oLLR0TYIolUCwPLSZJ7HyurbcwEx+DYo Hgjt2z95UMplJ7r4tcd5LDsHlpd9b5OAjYHFDV/hY3vH8JkrJH6I/nMnj4wt/OXUe8DY 0SmQ== X-Gm-Message-State: AOJu0YzxaSlPcrF7Djf0Dzik6+C1XqumJbeF5zWXroGooDF1NQfrKNOq p9mgioijmw1xDuhsrlD4CWFwCNym8AdlVMvCh2HypSuGU7E7T4JvJDR92BpWJw== X-Google-Smtp-Source: AGHT+IFsG8Y80ah1dIgzlZvXYiG5Z2lLgwRHRKU6R8YE9ltRgG2UNVPQyVsusIsxO+y6QwQmac6yuA== X-Received: by 2002:a05:6a20:2d0f:b0:19c:a389:dd6b with SMTP id g15-20020a056a202d0f00b0019ca389dd6bmr4272695pzl.20.1706608624676; Tue, 30 Jan 2024 01:57:04 -0800 (PST) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:469:110f:d748:6896]) by smtp.gmail.com with ESMTPSA id sm5-20020a17090b2e4500b0028ffea988a2sm8069810pjb.37.2024.01.30.01.57.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 01:57:04 -0800 (PST) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno , Srinivas Kandagatla Cc: Chen-Yu Tsai , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, William-tw Lin Subject: [PATCH 2/3] soc: mediatek: mtk-socinfo: Add extra entry for MT8183 Date: Tue, 30 Jan 2024 17:56:52 +0800 Message-ID: <20240130095656.3712469-3-wenst@chromium.org> X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog In-Reply-To: <20240130095656.3712469-1-wenst@chromium.org> References: <20240130095656.3712469-1-wenst@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240130_015705_391388_A3FAE975 X-CRM114-Status: GOOD ( 10.29 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org The MT8183 has another socinfo match, with the second cell only differing by one bit. Add it to the driver. Fixes: 423a54da3c7e ("soc: mediatek: mtk-socinfo: Add driver for getting chip information") Signed-off-by: Chen-Yu Tsai Acked-by: William-tw Lin --- drivers/soc/mediatek/mtk-socinfo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/soc/mediatek/mtk-socinfo.c b/drivers/soc/mediatek/mtk-socinfo.c index 3909d22062ce..42572e8c1520 100644 --- a/drivers/soc/mediatek/mtk-socinfo.c +++ b/drivers/soc/mediatek/mtk-socinfo.c @@ -45,6 +45,7 @@ static const char *cell_names[MAX_CELLS] = {"socinfo-data1", "socinfo-data2"}; static struct socinfo_data socinfo_data_table[] = { MTK_SOCINFO_ENTRY("MT8173", "MT8173V/AC", "MT8173", 0x6CA20004, 0x10000000), MTK_SOCINFO_ENTRY("MT8183", "MT8183V/AZA", "Kompanio 500", 0x00010043, 0x00000840), + MTK_SOCINFO_ENTRY("MT8183", "MT8183V/AZA", "Kompanio 500", 0x00010043, 0x00000940), MTK_SOCINFO_ENTRY("MT8186", "MT8186GV/AZA", "Kompanio 520", 0x81861001, CELL_NOT_USED), MTK_SOCINFO_ENTRY("MT8186T", "MT8186TV/AZA", "Kompanio 528", 0x81862001, CELL_NOT_USED), MTK_SOCINFO_ENTRY("MT8188", "MT8188GV/AZA", "Kompanio 830", 0x81880000, 0x00000010), From patchwork Tue Jan 30 09:56:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 13537125 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 452C9C46CD2 for ; Tue, 30 Jan 2024 09:57:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=gdC3n49f3pUPNsrcBA7Bt2BGENrWBIomL/x/RasR6Lw=; b=nh8jyv1TO7+m0aetSDIB2kBJ5N xp1PWcdit7nkcEgYJ7LpPjKBjPh/jWZTVuB50b2VfIFkpMbgPmdKD1mhRyh6sSHX19/zaiK9JT69L P+TTEFs9S589OuDVjsRyE3HOuRJkDjPb/KGOLfJZtIZKB2AG6r+KqSy9sRj/UGQa2DwBTqa7VOTXA ERWje2BDlJ5GsS5TnR/cO09wIYJLGYiDuhmB6Z2YyExTPtrzzvfndeW1Avfk5EWO3tJDpOjK2zpVC cl0Ldu7ItlllVdYpx87oplV8ZYg9q+hLoBLHU+pSvmwFOfTDQOC9OsxiA65Z2xEHswXhq1la3nljX icjnSWhw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rUkru-0000000G3rC-42gd; Tue, 30 Jan 2024 09:57:26 +0000 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rUkrb-0000000G3h0-10mN for linux-mediatek@lists.infradead.org; Tue, 30 Jan 2024 09:57:08 +0000 Received: by mail-pj1-x1029.google.com with SMTP id 98e67ed59e1d1-295c8b1cd4fso3630a91.0 for ; Tue, 30 Jan 2024 01:57:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1706608627; x=1707213427; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gdC3n49f3pUPNsrcBA7Bt2BGENrWBIomL/x/RasR6Lw=; b=jtT/QvICZU4DUSwd9XmrrH53E8KmlCLowtXnWe95ekbeVlwJXxgd2/SOoCCxy0+POr TrKXvHm6Y/zSf+qfyNlH4WPVMeXugWqFzesUC8rAZJiN0gcEVCHH9MaJe503xG5SuDBS qrGMTQuzpMtK4ryV2ARouTl8DjWlna9Q1trLc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706608627; x=1707213427; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gdC3n49f3pUPNsrcBA7Bt2BGENrWBIomL/x/RasR6Lw=; b=huzJz7lUwpab0QLKAFNpongS1aKhgI/bSY1LI2Ilb6wfuAcse7VRM3izDtqBWtwUBq GRyJ5Ls1JFOxs4SjN0Av5L7rGNyykubgPxEJSPcqGTC7Xmt7THpg1rvvf162KwX2t7JR RBvGibwyjhO2NOaaqI39w/e5ZbtcHg8WIQNJX7U3QxC28vqrkxs7nA6cgypyrB3wXz7d zhqMtr2IGxvfumDp/AD4GXmUIjoZVgPF11Wt/x1QNmp4eKIUw6i78qbK0Q7bx5vtzGJG H59R+2HCibgp7yQwXY12IvGJ608h0C65pD8vB0uHiISkGMmIIbMD5yzVCld8/G5cT6sj uwLw== X-Gm-Message-State: AOJu0YxqFX3io3dhega0ZHWLpe/+ERGiwSoQ42KAwm/OJ66WKCG+WfrC Nb4930EL5rOkOJZteeG2vbK094IdBDKK/D946mGuTXCnHA69HnFDs7AOPpAV5A== X-Google-Smtp-Source: AGHT+IGlxSqsMuF9m2bnctGlj48RdUWW+c4ToCBn1TGjF/x6IAqZ5PbEFfSDJkkT532DsO+oYz2DtQ== X-Received: by 2002:a17:90b:696:b0:28d:1581:29e6 with SMTP id m22-20020a17090b069600b0028d158129e6mr1136268pjz.13.1706608626736; Tue, 30 Jan 2024 01:57:06 -0800 (PST) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:469:110f:d748:6896]) by smtp.gmail.com with ESMTPSA id sm5-20020a17090b2e4500b0028ffea988a2sm8069810pjb.37.2024.01.30.01.57.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 01:57:06 -0800 (PST) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno , Srinivas Kandagatla Cc: Chen-Yu Tsai , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, William-tw Lin Subject: [PATCH 3/3] nvmem: mtk-efuse: Drop NVMEM device name Date: Tue, 30 Jan 2024 17:56:53 +0800 Message-ID: <20240130095656.3712469-4-wenst@chromium.org> X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog In-Reply-To: <20240130095656.3712469-1-wenst@chromium.org> References: <20240130095656.3712469-1-wenst@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240130_015707_373202_3F136F69 X-CRM114-Status: GOOD ( 11.32 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org The MT8183 has not one but two efuse devices. The static name and ID causes the second efuse device to fail to probe, due to duplicate sysfs entries. With the rework of the mtk-socinfo driver, lookup by name is no longer necessary. The custom name can simply be dropped. Fixes: 4e6102d60d88 ("nvmem: mtk-efuse: Register MediaTek socinfo driver from efuse") Signed-off-by: Chen-Yu Tsai Reviewed-by: AngeloGioacchino Del Regno Tested-by: Nícolas F. R. A. Prado --- drivers/nvmem/mtk-efuse.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/nvmem/mtk-efuse.c b/drivers/nvmem/mtk-efuse.c index f5bebcecf9bd..9caf04667341 100644 --- a/drivers/nvmem/mtk-efuse.c +++ b/drivers/nvmem/mtk-efuse.c @@ -86,7 +86,6 @@ static int mtk_efuse_probe(struct platform_device *pdev) econfig.size = resource_size(res); econfig.priv = priv; econfig.dev = dev; - econfig.name = "mtk-efuse"; if (pdata->uses_post_processing) econfig.fixup_dt_cell_info = &mtk_efuse_fixup_dt_cell_info; nvmem = devm_nvmem_register(dev, &econfig);