From patchwork Sat Jun 2 10:11:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 10444705 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ADC69602BD for ; Sat, 2 Jun 2018 10:14:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F18428A5F for ; Sat, 2 Jun 2018 10:14:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 92A6C28A28; Sat, 2 Jun 2018 10:14:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A2FB28A28 for ; Sat, 2 Jun 2018 10:14:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751838AbeFBKMh (ORCPT ); Sat, 2 Jun 2018 06:12:37 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:34532 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751037AbeFBKMT (ORCPT ); Sat, 2 Jun 2018 06:12:19 -0400 Received: by mail-wr0-f196.google.com with SMTP id a12-v6so3547630wro.1; Sat, 02 Jun 2018 03:12:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yLDZ+cjBZ6qPwW4Z903uGIY2eDUZlttE+u2kJ3p3j/o=; b=OVDYNyM4q0ZpltsmtQKXX8S8Yf4yjkb3qB3Da+Bw8W6zw13/SMGObsd0XuJ3j59bZx 5+yIP6f1i7CYhrDIpzpc6e7HPBh4qZunZpXeOtPMN3HKIJd2ZhumtFryAZwKqFz41BOu bK1Yc5njJrmberkOU0yI2jBaPET+h35e76N6SY4S+kwMYSQnpuPKuaWHfaB73ANo1rcF A7zICoesiKjZ0sXlFUYZcEYspzTKG1NqKSjElKxWPIZ7dgRHVTSgoViIrAZAmYtF9PjN UXhNr4mzuEIICiddyjMTsSbBbeokmDeOTi0NiwJKDmR+41ovE3iMV0yCGAKCD5rnvuy8 udSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yLDZ+cjBZ6qPwW4Z903uGIY2eDUZlttE+u2kJ3p3j/o=; b=tE/nJ1NuSHPQNvVLDkNUzk4Rk5FCrk92yBKeu+BZIrmBex2zU0vuRnp6ErlsT2ClCL tmPbP7sGpNxLIBwo2qJob8Ji/KotJL/vKuyK2sPp90PPKX3TrWSKH4Sk2p4by/bZvjQs 1kI6TahxaDs3dERcneG80wG8avK02hgyPwA8wJ4SdGD4UR33l13wBtgjKmx4RiRshsYW pXzidDUjToSRDiHqthn6wyHbf/yDFvMgwGQiLQsj4nOxV6un2pcWuFK4/r0GeZt5akBX eIG51glkP5M2LJu02CH07Fa9uCop72B59Kb8AZBHYmEvxaP2kHh/j9xBWQ/hMtFFnE3j te/Q== X-Gm-Message-State: ALKqPwcw6P7CbXHMbxs0aQEbIO6tTll30yLLawowl82M7C0FTNE7WH+d 1B1aX/75h8OHO7VLaNC32q76ohA5 X-Google-Smtp-Source: ADUXVKJxe7zXa3ZobSRk1paWG3VR00yGjUiu0bjzubdtKfP90pFjDB9b/s8TAGPEKe/LTsT2u52u1A== X-Received: by 2002:adf:e542:: with SMTP id z2-v6mr11391293wrm.111.1527934337277; Sat, 02 Jun 2018 03:12:17 -0700 (PDT) Received: from kurokawa.lan (ip-86-49-107-50.net.upcbroadband.cz. [86.49.107.50]) by smtp.gmail.com with ESMTPSA id b16-v6sm38624797wrm.89.2018.06.02.03.12.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Jun 2018 03:12:16 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: linux-kernel@vger.kernel.org Cc: Marek Vasut , Geert Uytterhoeven , Lee Jones , Mark Brown , Steve Twiss , Wolfram Sang , linux-renesas-soc@vger.kernel.org Subject: [PATCH v3 03/10] mfd: da9063: Rename PMIC_DA9063 to PMIC_CHIP_ID_DA9063 Date: Sat, 2 Jun 2018 12:11:48 +0200 Message-Id: <20180602101155.26375-3-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180602101155.26375-1-marek.vasut+renesas@gmail.com> References: <20180602101155.26375-1-marek.vasut+renesas@gmail.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The PMIC_DA9063 is a complete misnomer, it denotes the value of the DA9063 chip ID register, so rename it as such. It is also the value of chip ID register of DA9063L though, so drop the enum as all the DA9063 "models" share the same chip ID and thus the distinction will have to be made using DT or otherwise. Signed-off-by: Marek Vasut Cc: Geert Uytterhoeven Cc: Lee Jones Cc: Mark Brown Cc: Steve Twiss Cc: Wolfram Sang Cc: linux-renesas-soc@vger.kernel.org Acked-by: Mark Brown Reviewed-by: Geert Uytterhoeven Acked-by: Steve Twiss --- V2: No change V3: No change --- drivers/mfd/da9063-core.c | 2 +- drivers/mfd/da9063-i2c.c | 2 +- drivers/regulator/da9063-regulator.c | 2 +- include/linux/mfd/da9063/core.h | 4 +--- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/mfd/da9063-core.c b/drivers/mfd/da9063-core.c index 8226ebd8b96d..fb122316c421 100644 --- a/drivers/mfd/da9063-core.c +++ b/drivers/mfd/da9063-core.c @@ -192,7 +192,7 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq) dev_err(da9063->dev, "Cannot read chip model id.\n"); return -EIO; } - if (model != PMIC_DA9063) { + if (model != PMIC_CHIP_ID_DA9063) { dev_err(da9063->dev, "Invalid chip model id: 0x%02x\n", model); return -ENODEV; } diff --git a/drivers/mfd/da9063-i2c.c b/drivers/mfd/da9063-i2c.c index 981805a2c521..7f84030c8d53 100644 --- a/drivers/mfd/da9063-i2c.c +++ b/drivers/mfd/da9063-i2c.c @@ -280,7 +280,7 @@ static int da9063_i2c_remove(struct i2c_client *i2c) } static const struct i2c_device_id da9063_i2c_id[] = { - {"da9063", PMIC_DA9063}, + { "da9063", PMIC_CHIP_ID_DA9063 }, {}, }; MODULE_DEVICE_TABLE(i2c, da9063_i2c_id); diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c index 6a8f9cd69f52..87c884ae0064 100644 --- a/drivers/regulator/da9063-regulator.c +++ b/drivers/regulator/da9063-regulator.c @@ -585,7 +585,7 @@ static struct da9063_dev_model regulators_models[] = { { .regulator_info = da9063_regulator_info, .n_regulators = ARRAY_SIZE(da9063_regulator_info), - .dev_model = PMIC_DA9063, + .dev_model = PMIC_CHIP_ID_DA9063, }, { } }; diff --git a/include/linux/mfd/da9063/core.h b/include/linux/mfd/da9063/core.h index f3ae65db4c86..664f650d0086 100644 --- a/include/linux/mfd/da9063/core.h +++ b/include/linux/mfd/da9063/core.h @@ -29,9 +29,7 @@ #define DA9063_DRVNAME_RTC "da9063-rtc" #define DA9063_DRVNAME_VIBRATION "da9063-vibration" -enum da9063_models { - PMIC_DA9063 = 0x61, -}; +#define PMIC_CHIP_ID_DA9063 0x61 enum da9063_variant_codes { PMIC_DA9063_AD = 0x3,