From patchwork Thu Apr 27 11:30:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 88215 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp209695vqo; Thu, 27 Apr 2023 04:56:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4tTEgJryI3ILvdDJB7GLHT7+TI2+RkAbdhwbUkgM11fPjU54hOfVvvkYN5+xb68gqmK367 X-Received: by 2002:a05:6a20:938c:b0:f2:afd5:e52e with SMTP id x12-20020a056a20938c00b000f2afd5e52emr1748419pzh.33.1682596612462; Thu, 27 Apr 2023 04:56:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682596612; cv=none; d=google.com; s=arc-20160816; b=gVG/6RdGZEAF06LUSv6NU/Hl+gjC7NAYYOBOiuNii7YBRpoqQfZKytHloXa2RIFugp y4lLnjegwUgapxUYMiIujZnpXWg5QqsFU2RQULtlWuQTN1Jbf9vSqQYdtSs0re5T7c84 nPQKcRQYqAtnhP+8lbf9fdWU8YcB61Bmnhu5dz5O1dh7PWu5DZQ0rsZi2pcWv82Ivbgf aU1rNUWSyKobVNbcXhUKfjkA9AqAyBZgUll0c2KsTu8Dgj5JdD4Opu51w4Pdd+OVryg0 YEXHm+LsPyZP1pSnez2cOldXQ7VbzSLqRIXxtyjpmZDyFxHUBB71O0NHuWsg5TtIGzt3 gi8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=1CubuGcbwXeFBLcUNK4YyLRx2VBVqe+QN+l3sJog4zY=; b=Yr8T8kLJ0I1HqQECrd6GkRL+HA9k6Nsx4I9TvveiMroZhFUPDBtUyFXNCJxomLlGqu gPpOJFB0fJSAlXrkrjOvaICMnWuGBy8NdRgQBB77J1ByoKX7wn/XQOKdWbVJvnRjjkjL jQyJvArHaylNjFpmwTQViqhu/mSf12Zhj0Rz0P4iVa8JWr6pz/QVHOiv38NEZiCO9aew 3CHZUXwGolmeFEZX0ANcjiHwU7M+/5XkY8UnOhiYnsiucAcOo/gDsIm35sFnuLyHHS7x hCLWXDQ8DaHDDFLZO10eTdZ65wb7BU97+XbdmtDsYJtDkN+oE8PFYkNsXZpLjSH6h9Uc v4cA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=LVrp7vGF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f2-20020a63f742000000b005073e333addsi19039164pgk.390.2023.04.27.04.56.39; Thu, 27 Apr 2023 04:56:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=LVrp7vGF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243700AbjD0Lax (ORCPT + 99 others); Thu, 27 Apr 2023 07:30:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243416AbjD0Law (ORCPT ); Thu, 27 Apr 2023 07:30:52 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1ACDE4 for ; Thu, 27 Apr 2023 04:30:50 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-2f6401ce8f8so5239241f8f.3 for ; Thu, 27 Apr 2023 04:30:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1682595049; x=1685187049; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1CubuGcbwXeFBLcUNK4YyLRx2VBVqe+QN+l3sJog4zY=; b=LVrp7vGF3CUYyzvJGaEPnJ9qBMt8abFPt4qExoLXlGM6g4aRYNvJ3s0ffkxY6LEjD+ ot5guIIZZhHz5wTtl+f1sOzHPKgrXUKCqtSUfDlAQQXI+6+bEeuTOybhVUgnevc8/mrI vaMrPNRyy7Pp5H7GaeOBLM0dXhlkzJYUKFRz0HVTt/nFbdWMqNuUH4YzfZTkq3VUpBIx Kbk+BGcaNNZrARquNBVuyaVVkHD05n/nMSAJiaMJJEZIN/dlDScn1/MDcUhMbfR7V1lm WMHO0sRFNy5cNcFj5Ro1AXjXW4kHIf9iOQEAAs0dCXR02hyd8qd+8KUkEqZyASjc0AbV cTOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682595049; x=1685187049; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1CubuGcbwXeFBLcUNK4YyLRx2VBVqe+QN+l3sJog4zY=; b=AZTfQH6KYe+NF9imxnBWd7lRbeH+M2heMxXPEpWyUTXg8wlP9l9i99CL1PWqgedzhl p7rWBiW1FdYP3LGtGLyz4hrqVxB2ejDlF3Mv+wPh0fGITrW/KlIE/V6eY1PX1/OpzACd b00aOSJpb8aaxtJ/O/DpAjAeKV0yOCVpt4VgkLjepX9WLvIv1n4SGlQcY6PgnlsHtBlB 7wg29tt6JXmesU9q//pm1AEzKAzJngv+cvFeVFY7THauN12XufE1whNOuMvK80/6ityR Dkd/QKRcQLdnCurHD9CQWLWVgehYdvib15A7vFx4vKdqpUucQO6DU2p/NBMK2AxuoXab bogg== X-Gm-Message-State: AC+VfDx2VxL/Kn1JO+y/qAUbhAdz7hG+25dlGTfLozF8IgNA1oEfVCsr rizICFVGD9c2LIjDFVQ52L2YNQ== X-Received: by 2002:a5d:56ca:0:b0:2f9:c2ab:e1de with SMTP id m10-20020a5d56ca000000b002f9c2abe1demr1055366wrw.14.1682595049246; Thu, 27 Apr 2023 04:30:49 -0700 (PDT) Received: from stroh80.sec.9e.network (ip-078-094-000-051.um19.pools.vodafone-ip.de. [78.94.0.51]) by smtp.gmail.com with ESMTPSA id f8-20020a5d4dc8000000b002f9e04459desm18224499wru.109.2023.04.27.04.30.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Apr 2023 04:30:49 -0700 (PDT) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: Lee Jones Cc: Liam Girdwood , Mark Brown , Naresh Solanki , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] mfd: max5970: Rename driver and remove wildcard Date: Thu, 27 Apr 2023 13:30:45 +0200 Message-Id: <20230427113046.3971425-1-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764325950438033632?= X-GMAIL-MSGID: =?utf-8?q?1764330425483174842?= The previous version of this driver included wildcards in file names and descriptions. This patch renames the driver to only support MAX5970 and MAX5978, which are the only chips that the driver actually supports. Signed-off-by: Naresh Solanki --- drivers/mfd/Kconfig | 4 ++-- drivers/mfd/simple-mfd-i2c.c | 18 +++++++++--------- include/linux/mfd/{max597x.h => max5970.h} | 16 ++++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-) rename include/linux/mfd/{max597x.h => max5970.h} (92%) base-commit: b4c288cfd2f84c44994330c408e14645d45dee5b diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index e90463c4441c..71231388e03c 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -266,8 +266,8 @@ config MFD_MADERA_SPI Support for the Cirrus Logic Madera platform audio SoC core functionality controlled via SPI. -config MFD_MAX597X - tristate "Maxim 597x power switch and monitor" +config MFD_MAX5970 + tristate "Maxim 5970/5978 power switch and monitor" depends on (I2C && OF) select MFD_SIMPLE_MFD_I2C help diff --git a/drivers/mfd/simple-mfd-i2c.c b/drivers/mfd/simple-mfd-i2c.c index 20782b4dd172..1f1c007560d8 100644 --- a/drivers/mfd/simple-mfd-i2c.c +++ b/drivers/mfd/simple-mfd-i2c.c @@ -72,22 +72,22 @@ static const struct simple_mfd_data silergy_sy7636a = { .mfd_cell_size = ARRAY_SIZE(sy7636a_cells), }; -static const struct mfd_cell max597x_cells[] = { - { .name = "max597x-regulator", }, - { .name = "max597x-iio", }, - { .name = "max597x-led", }, +static const struct mfd_cell max5970_cells[] = { + { .name = "max5970-regulator", }, + { .name = "max5970-iio", }, + { .name = "max5970-led", }, }; -static const struct simple_mfd_data maxim_max597x = { - .mfd_cell = max597x_cells, - .mfd_cell_size = ARRAY_SIZE(max597x_cells), +static const struct simple_mfd_data maxim_max5970 = { + .mfd_cell = max5970_cells, + .mfd_cell_size = ARRAY_SIZE(max5970_cells), }; static const struct of_device_id simple_mfd_i2c_of_match[] = { { .compatible = "kontron,sl28cpld" }, { .compatible = "silergy,sy7636a", .data = &silergy_sy7636a}, - { .compatible = "maxim,max5970", .data = &maxim_max597x}, - { .compatible = "maxim,max5978", .data = &maxim_max597x}, + { .compatible = "maxim,max5970", .data = &maxim_max5970}, + { .compatible = "maxim,max5978", .data = &maxim_max5970}, {} }; MODULE_DEVICE_TABLE(of, simple_mfd_i2c_of_match); diff --git a/include/linux/mfd/max597x.h b/include/linux/mfd/max5970.h similarity index 92% rename from include/linux/mfd/max597x.h rename to include/linux/mfd/max5970.h index a850b2e02e6a..762a7d40c843 100644 --- a/include/linux/mfd/max597x.h +++ b/include/linux/mfd/max5970.h @@ -7,25 +7,25 @@ * Author: Patrick Rudolph */ -#ifndef _MFD_MAX597X_H -#define _MFD_MAX597X_H +#ifndef _MFD_MAX5970_H +#define _MFD_MAX5970_H #include #define MAX5970_NUM_SWITCHES 2 #define MAX5978_NUM_SWITCHES 1 -#define MAX597X_NUM_LEDS 4 +#define MAX5970_NUM_LEDS 4 -struct max597x_data { +struct max5970_data { int num_switches; u32 irng[MAX5970_NUM_SWITCHES]; u32 mon_rng[MAX5970_NUM_SWITCHES]; u32 shunt_micro_ohms[MAX5970_NUM_SWITCHES]; }; -enum max597x_chip_type { - MAX597x_TYPE_MAX5978 = 1, - MAX597x_TYPE_MAX5970, +enum max5970_chip_type { + TYPE_MAX5978 = 1, + TYPE_MAX5970, }; #define MAX5970_REG_CURRENT_L(ch) (0x01 + (ch) * 4) @@ -93,4 +93,4 @@ enum max597x_chip_type { #define MAX_REGISTERS 0x49 #define ADC_MASK 0x3FF -#endif /* _MFD_MAX597X_H */ +#endif /* _MFD_MAX5970_H */