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 */ From patchwork Thu Apr 27 11:30:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 88212 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp206150vqo; Thu, 27 Apr 2023 04:48:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7lcQBJGPduw0hFL25A33QH5J79N1H0D0/scH9Ej/h/73mQqzCiPfLc1h4C4zSGxW7WjIc/ X-Received: by 2002:a17:90a:5582:b0:246:97d2:dc27 with SMTP id c2-20020a17090a558200b0024697d2dc27mr1465025pji.42.1682596122396; Thu, 27 Apr 2023 04:48:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682596122; cv=none; d=google.com; s=arc-20160816; b=IiC/XAdcV+j/w/vvqpng6uCiNe42VKHoCPwL1GOtkLvY3Qpdzgt2nvZRAEB+dxMMN3 zGCHRm5iTR1cecwltjbaUvvGUIqoDJmB4tbbJc12zE/6ADsOHtx1AOs6rGFbPlBEHmd3 WL8EfEHlmX0lS+VBpqtetfI+0gjMkiiz6zb/gYJfvxgOfMreNU7kJX+nRJPE6g5RgL8o GiNeUiOTv4u7CXcOehyZAqlcBQtm7LIBfKfsUM3g5zqs96Pbou9V6zoqmA+uCMjl2g4j WC/JbpaCy3CGa1t1EC7kQIx4jO0LPEdLj/3Z0157HhLfFEOjDVQdMa1LmsjeR+acrc1u O22A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NHrfSHgqSP98gjaXIh1zuaySE0uqFkESE6BbB3tZSac=; b=j7NtDkaH0Y++aC3uMeKaUZR/KKkkzy5onpUIxvoFc7/T5lGoWPs+XGaP+avbreObKP i7tKc4PZ8yrx0okpj0gzNDD0dmGPD1T2gRQnBfivYH1RfnbNrOtgSBjWdXuLwNaImE1W 785yx4Z4OTI8vYEFECLzW4g2cbbioLH+NOHnXVIOpN7Vqsxkv/eJXekLULonca8yyjvb xwrAS/iLeYGXnKWtPyAfkZQq0cBmQx3klyUSFw+xkhORGqJNXJqy/3WO+XokpLtJuGHk wL6v4NAVR6Ai27+j/mKg0g7w+SC4tuoeS1VZed/f8pWe4EobM63Msp/4dSDKVo3vAHVD xDRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=VxGZQtQM; 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.48.28; Thu, 27 Apr 2023 04:48:42 -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=VxGZQtQM; 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 S243743AbjD0Laz (ORCPT + 99 others); Thu, 27 Apr 2023 07:30:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243711AbjD0Lay (ORCPT ); Thu, 27 Apr 2023 07:30:54 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16C4B120 for ; Thu, 27 Apr 2023 04:30:52 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-2f7c281a015so5203932f8f.1 for ; Thu, 27 Apr 2023 04:30:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1682595050; x=1685187050; 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=NHrfSHgqSP98gjaXIh1zuaySE0uqFkESE6BbB3tZSac=; b=VxGZQtQMQSCWRp6gGabPMxlxDQNfn50Fs0JlV5ZpXktcRX51CA3cHmBbuRMZPamfjX vG82pv5si32W8jI9yL36Xc0TGijfj5hmczwTLw9uNr4neuv41ohwtbOIWqMwF7wuIcdP WOH+Vrdp7xcYR64Zu/up5ftjdQjlEPuVvPvBFetvqpuo6Et5VS9dtADSsVeBXmWULLGG +ccw1BdqbvNvWKcHUV0gGktOj8ahELQ1qAgsBBKhNDt8M/ycbNB5zJehYrRlvh4RPigx Zzs47WEhwZJ6+AcxWVESxHdukrS5TWopGVNqYtDFZ4O7YXn9mJjg3ORQIQHMSpHzY1d6 BLWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682595050; x=1685187050; 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=NHrfSHgqSP98gjaXIh1zuaySE0uqFkESE6BbB3tZSac=; b=QwX1UTFWGaH0RZlkX1SM2hNLvUzo2JI1n5UavHNc03SzTRAYYJ9iD2ET43KPu1OiQ7 HTkLdofz+CGvaUiDaEY0azUv40nf1U6npmm2nEASGyPNk4Eycl/47qJ3tRMZpKgpUNXe LaEh2XqVbBJXhgGwIVtcUOcidnQuH5RSa2CKvaYqKbT3fWgOb05JrCguZN+BdI3jICgN 0tPtknZqpdxIi/Rk152Cpa3Udag/83XWoI3bZX2/YepmVModH+7mDGlIRq4BJlsm0Ikd mSkE0bBKNExwoO57fFTivBFLDFM4o/fk6X353+Jk7mrvxuEsDFdCADYSPS6reLBC0xtp eHQg== X-Gm-Message-State: AC+VfDy7Lajc/RwhwUnHkz/Ms2ESrPooSds5MNH5xxhlwcRYsKgJIRaT 4h026TJQ62SS3QtCQDx9ATQA6mYbpZ1FqvXVs/Ebow== X-Received: by 2002:a5d:4e12:0:b0:2ce:a8e9:bb3a with SMTP id p18-20020a5d4e12000000b002cea8e9bb3amr1076653wrt.4.1682595050484; Thu, 27 Apr 2023 04:30:50 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Apr 2023 04:30:50 -0700 (PDT) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: Liam Girdwood , Mark Brown Cc: Lee Jones , Naresh Solanki , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] regulator: max5970: Rename driver and remove wildcard Date: Thu, 27 Apr 2023 13:30:46 +0200 Message-Id: <20230427113046.3971425-2-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230427113046.3971425-1-Naresh.Solanki@9elements.com> References: <20230427113046.3971425-1-Naresh.Solanki@9elements.com> 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?1764329911406780056?= X-GMAIL-MSGID: =?utf-8?q?1764329911406780056?= 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 Acked-by: Mark Brown --- drivers/regulator/Kconfig | 6 +- drivers/regulator/Makefile | 2 +- ...ax597x-regulator.c => max5970-regulator.c} | 126 +++++++++--------- 3 files changed, 67 insertions(+), 67 deletions(-) rename drivers/regulator/{max597x-regulator.c => max5970-regulator.c} (76%) diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index aae28d0a489c..36465aeb4e21 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -546,11 +546,11 @@ config REGULATOR_MAX1586 regulator via I2C bus. The provided regulator is suitable for PXA27x chips to control VCC_CORE and VCC_USIM voltages. -config REGULATOR_MAX597X - tristate "Maxim 597x power switch and monitor" +config REGULATOR_MAX5970 + tristate "Maxim 5970/5978 power switch and monitor" depends on I2C depends on OF - depends on MFD_MAX597X + depends on MFD_MAX5970 help This driver controls a Maxim 5970/5978 switch via I2C bus. The MAX5970/5978 is a smart switch with no output regulation, but diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index ee383d8fc835..aed1b7c2eb78 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -67,7 +67,7 @@ obj-$(CONFIG_REGULATOR_LTC3589) += ltc3589.o obj-$(CONFIG_REGULATOR_LTC3676) += ltc3676.o obj-$(CONFIG_REGULATOR_MAX14577) += max14577-regulator.o obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o -obj-$(CONFIG_REGULATOR_MAX597X) += max597x-regulator.o +obj-$(CONFIG_REGULATOR_MAX5970) += max5970-regulator.o obj-$(CONFIG_REGULATOR_MAX77620) += max77620-regulator.o obj-$(CONFIG_REGULATOR_MAX77650) += max77650-regulator.o obj-$(CONFIG_REGULATOR_MAX8649) += max8649.o diff --git a/drivers/regulator/max597x-regulator.c b/drivers/regulator/max5970-regulator.c similarity index 76% rename from drivers/regulator/max597x-regulator.c rename to drivers/regulator/max5970-regulator.c index 648e3641885a..08c8eb7b1ed6 100644 --- a/drivers/regulator/max597x-regulator.c +++ b/drivers/regulator/max5970-regulator.c @@ -20,19 +20,19 @@ #include #include -#include +#include -struct max597x_regulator { +struct max5970_regulator { int num_switches, mon_rng, irng, shunt_micro_ohms, lim_uA; struct regmap *regmap; }; -enum max597x_regulator_id { - MAX597X_SW0, - MAX597X_SW1, +enum max5970_regulator_id { + MAX5970_SW0, + MAX5970_SW1, }; -static int max597x_uvp_ovp_check_mode(struct regulator_dev *rdev, int severity) +static int max5970_uvp_ovp_check_mode(struct regulator_dev *rdev, int severity) { int ret, reg; @@ -54,11 +54,11 @@ static int max597x_uvp_ovp_check_mode(struct regulator_dev *rdev, int severity) return 0; } -static int max597x_set_vp(struct regulator_dev *rdev, int lim_uV, int severity, +static int max5970_set_vp(struct regulator_dev *rdev, int lim_uV, int severity, bool enable, bool overvoltage) { int off_h, off_l, reg, ret; - struct max597x_regulator *data = rdev_get_drvdata(rdev); + struct max5970_regulator *data = rdev_get_drvdata(rdev); int channel = rdev_get_id(rdev); if (overvoltage) { @@ -96,7 +96,7 @@ static int max597x_set_vp(struct regulator_dev *rdev, int lim_uV, int severity, return 0; } -static int max597x_set_uvp(struct regulator_dev *rdev, int lim_uV, int severity, +static int max5970_set_uvp(struct regulator_dev *rdev, int lim_uV, int severity, bool enable) { int ret; @@ -108,14 +108,14 @@ static int max597x_set_uvp(struct regulator_dev *rdev, int lim_uV, int severity, if ((lim_uV && !enable) || (!lim_uV && enable)) return -EINVAL; - ret = max597x_uvp_ovp_check_mode(rdev, severity); + ret = max5970_uvp_ovp_check_mode(rdev, severity); if (ret) return ret; - return max597x_set_vp(rdev, lim_uV, severity, enable, false); + return max5970_set_vp(rdev, lim_uV, severity, enable, false); } -static int max597x_set_ovp(struct regulator_dev *rdev, int lim_uV, int severity, +static int max5970_set_ovp(struct regulator_dev *rdev, int lim_uV, int severity, bool enable) { int ret; @@ -127,20 +127,20 @@ static int max597x_set_ovp(struct regulator_dev *rdev, int lim_uV, int severity, if ((lim_uV && !enable) || (!lim_uV && enable)) return -EINVAL; - ret = max597x_uvp_ovp_check_mode(rdev, severity); + ret = max5970_uvp_ovp_check_mode(rdev, severity); if (ret) return ret; - return max597x_set_vp(rdev, lim_uV, severity, enable, true); + return max5970_set_vp(rdev, lim_uV, severity, enable, true); } -static int max597x_set_ocp(struct regulator_dev *rdev, int lim_uA, +static int max5970_set_ocp(struct regulator_dev *rdev, int lim_uA, int severity, bool enable) { int val, reg; unsigned int vthst, vthfst; - struct max597x_regulator *data = rdev_get_drvdata(rdev); + struct max5970_regulator *data = rdev_get_drvdata(rdev); int rdev_id = rdev_get_id(rdev); /* * MAX5970 doesn't has enable control for ocp. @@ -187,7 +187,7 @@ static int max597x_set_ocp(struct regulator_dev *rdev, int lim_uA, return regmap_write(rdev->regmap, reg, val); } -static int max597x_get_status(struct regulator_dev *rdev) +static int max5970_get_status(struct regulator_dev *rdev) { int val, ret; @@ -208,21 +208,21 @@ static int max597x_get_status(struct regulator_dev *rdev) return REGULATOR_STATUS_OFF; } -static const struct regulator_ops max597x_switch_ops = { +static const struct regulator_ops max5970_switch_ops = { .enable = regulator_enable_regmap, .disable = regulator_disable_regmap, .is_enabled = regulator_is_enabled_regmap, - .get_status = max597x_get_status, - .set_over_voltage_protection = max597x_set_ovp, - .set_under_voltage_protection = max597x_set_uvp, - .set_over_current_protection = max597x_set_ocp, + .get_status = max5970_get_status, + .set_over_voltage_protection = max5970_set_ovp, + .set_under_voltage_protection = max5970_set_uvp, + .set_over_current_protection = max5970_set_ocp, }; -static int max597x_dt_parse(struct device_node *np, +static int max5970_dt_parse(struct device_node *np, const struct regulator_desc *desc, struct regulator_config *cfg) { - struct max597x_regulator *data = cfg->driver_data; + struct max5970_regulator *data = cfg->driver_data; int ret = 0; ret = @@ -236,26 +236,26 @@ static int max597x_dt_parse(struct device_node *np, } -#define MAX597X_SWITCH(_ID, _ereg, _chan, _supply) { \ +#define MAX5970_SWITCH(_ID, _ereg, _chan, _supply) { \ .name = #_ID, \ .of_match = of_match_ptr(#_ID), \ - .ops = &max597x_switch_ops, \ + .ops = &max5970_switch_ops, \ .regulators_node = of_match_ptr("regulators"), \ .type = REGULATOR_VOLTAGE, \ - .id = MAX597X_##_ID, \ + .id = MAX5970_##_ID, \ .owner = THIS_MODULE, \ .supply_name = _supply, \ .enable_reg = _ereg, \ .enable_mask = CHXEN((_chan)), \ - .of_parse_cb = max597x_dt_parse, \ + .of_parse_cb = max5970_dt_parse, \ } static const struct regulator_desc regulators[] = { - MAX597X_SWITCH(SW0, MAX5970_REG_CHXEN, 0, "vss1"), - MAX597X_SWITCH(SW1, MAX5970_REG_CHXEN, 1, "vss2"), + MAX5970_SWITCH(SW0, MAX5970_REG_CHXEN, 0, "vss1"), + MAX5970_SWITCH(SW1, MAX5970_REG_CHXEN, 1, "vss2"), }; -static int max597x_regmap_read_clear(struct regmap *map, unsigned int reg, +static int max5970_regmap_read_clear(struct regmap *map, unsigned int reg, unsigned int *val) { int ret; @@ -270,14 +270,14 @@ static int max597x_regmap_read_clear(struct regmap *map, unsigned int reg, return 0; } -static int max597x_irq_handler(int irq, struct regulator_irq_data *rid, +static int max5970_irq_handler(int irq, struct regulator_irq_data *rid, unsigned long *dev_mask) { struct regulator_err_state *stat; - struct max597x_regulator *d = (struct max597x_regulator *)rid->data; + struct max5970_regulator *d = (struct max5970_regulator *)rid->data; int val, ret, i; - ret = max597x_regmap_read_clear(d->regmap, MAX5970_REG_FAULT0, &val); + ret = max5970_regmap_read_clear(d->regmap, MAX5970_REG_FAULT0, &val); if (ret) return REGULATOR_FAILED_RETRY; @@ -302,7 +302,7 @@ static int max597x_irq_handler(int irq, struct regulator_irq_data *rid, } } - ret = max597x_regmap_read_clear(d->regmap, MAX5970_REG_FAULT1, &val); + ret = max5970_regmap_read_clear(d->regmap, MAX5970_REG_FAULT1, &val); if (ret) return REGULATOR_FAILED_RETRY; @@ -320,7 +320,7 @@ static int max597x_irq_handler(int irq, struct regulator_irq_data *rid, } } - ret = max597x_regmap_read_clear(d->regmap, MAX5970_REG_FAULT2, &val); + ret = max5970_regmap_read_clear(d->regmap, MAX5970_REG_FAULT2, &val); if (ret) return REGULATOR_FAILED_RETRY; @@ -357,7 +357,7 @@ static int max597x_irq_handler(int irq, struct regulator_irq_data *rid, return 0; } -static int max597x_adc_range(struct regmap *regmap, const int ch, +static int max5970_adc_range(struct regmap *regmap, const int ch, u32 *irng, u32 *mon_rng) { unsigned int reg; @@ -391,14 +391,14 @@ static int max597x_adc_range(struct regmap *regmap, const int ch, return 0; } -static int max597x_setup_irq(struct device *dev, +static int max5970_setup_irq(struct device *dev, int irq, struct regulator_dev *rdevs[MAX5970_NUM_SWITCHES], - int num_switches, struct max597x_regulator *data) + int num_switches, struct max5970_regulator *data) { - struct regulator_irq_desc max597x_notif = { - .name = "max597x-irq", - .map_event = max597x_irq_handler, + struct regulator_irq_desc max5970_notif = { + .name = "max5970-irq", + .map_event = max5970_irq_handler, .data = data, }; int errs = REGULATOR_ERROR_UNDER_VOLTAGE | @@ -410,7 +410,7 @@ static int max597x_setup_irq(struct device *dev, void *irq_helper; /* Register notifiers - can fail if IRQ is not given */ - irq_helper = devm_regulator_irq_helper(dev, &max597x_notif, + irq_helper = devm_regulator_irq_helper(dev, &max5970_notif, irq, 0, errs, NULL, &rdevs[0], num_switches); if (IS_ERR(irq_helper)) { @@ -423,11 +423,11 @@ static int max597x_setup_irq(struct device *dev, return 0; } -static int max597x_regulator_probe(struct platform_device *pdev) +static int max5970_regulator_probe(struct platform_device *pdev) { - struct max597x_data *max597x; + struct max5970_data *max5970; struct regmap *regmap = dev_get_regmap(pdev->dev.parent, NULL); - struct max597x_regulator *data; + struct max5970_regulator *data; struct i2c_client *i2c = to_i2c_client(pdev->dev.parent); struct regulator_config config = { }; struct regulator_dev *rdev; @@ -438,25 +438,25 @@ static int max597x_regulator_probe(struct platform_device *pdev) if (!regmap) return -EPROBE_DEFER; - max597x = devm_kzalloc(&i2c->dev, sizeof(struct max597x_data), GFP_KERNEL); - if (!max597x) + max5970 = devm_kzalloc(&i2c->dev, sizeof(struct max5970_data), GFP_KERNEL); + if (!max5970) return -ENOMEM; - i2c_set_clientdata(i2c, max597x); + i2c_set_clientdata(i2c, max5970); if (of_device_is_compatible(i2c->dev.of_node, "maxim,max5978")) - max597x->num_switches = MAX597x_TYPE_MAX5978; + max5970->num_switches = MAX5978_NUM_SWITCHES; else if (of_device_is_compatible(i2c->dev.of_node, "maxim,max5970")) - max597x->num_switches = MAX597x_TYPE_MAX5970; + max5970->num_switches = MAX5970_NUM_SWITCHES; else return -ENODEV; - i2c_set_clientdata(i2c, max597x); - num_switches = max597x->num_switches; + i2c_set_clientdata(i2c, max5970); + num_switches = max5970->num_switches; for (i = 0; i < num_switches; i++) { data = - devm_kzalloc(&i2c->dev, sizeof(struct max597x_regulator), + devm_kzalloc(&i2c->dev, sizeof(struct max5970_regulator), GFP_KERNEL); if (!data) return -ENOMEM; @@ -464,12 +464,12 @@ static int max597x_regulator_probe(struct platform_device *pdev) data->num_switches = num_switches; data->regmap = regmap; - ret = max597x_adc_range(regmap, i, &max597x->irng[i], &max597x->mon_rng[i]); + ret = max5970_adc_range(regmap, i, &max5970->irng[i], &max5970->mon_rng[i]); if (ret < 0) return ret; - data->irng = max597x->irng[i]; - data->mon_rng = max597x->mon_rng[i]; + data->irng = max5970->irng[i]; + data->mon_rng = max5970->mon_rng[i]; config.dev = &i2c->dev; config.driver_data = (void *)data; @@ -482,12 +482,12 @@ static int max597x_regulator_probe(struct platform_device *pdev) return PTR_ERR(rdev); } rdevs[i] = rdev; - max597x->shunt_micro_ohms[i] = data->shunt_micro_ohms; + max5970->shunt_micro_ohms[i] = data->shunt_micro_ohms; } if (i2c->irq) { ret = - max597x_setup_irq(&i2c->dev, i2c->irq, rdevs, num_switches, + max5970_setup_irq(&i2c->dev, i2c->irq, rdevs, num_switches, data); if (ret) { dev_err(&i2c->dev, "IRQ setup failed"); @@ -498,14 +498,14 @@ static int max597x_regulator_probe(struct platform_device *pdev) return ret; } -static struct platform_driver max597x_regulator_driver = { +static struct platform_driver max5970_regulator_driver = { .driver = { - .name = "max597x-regulator", + .name = "max5970-regulator", }, - .probe = max597x_regulator_probe, + .probe = max5970_regulator_probe, }; -module_platform_driver(max597x_regulator_driver); +module_platform_driver(max5970_regulator_driver); MODULE_AUTHOR("Patrick Rudolph ");