From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47D03C5CFEB for ; Wed, 11 Jul 2018 15:30:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0BAA620883 for ; Wed, 11 Jul 2018 15:30:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0BAA620883 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nvidia.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389172AbeGKPfE (ORCPT ); Wed, 11 Jul 2018 11:35:04 -0400 Received: from hqemgate14.nvidia.com ([216.228.121.143]:9765 "EHLO hqemgate14.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732425AbeGKPfE (ORCPT ); Wed, 11 Jul 2018 11:35:04 -0400 Received: from hqpgpgate102.nvidia.com (Not Verified[216.228.121.13]) by hqemgate14.nvidia.com (using TLS: TLSv1, AES128-SHA) id ; Wed, 11 Jul 2018 08:30:08 -0700 Received: from HQMAIL101.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Wed, 11 Jul 2018 08:30:08 -0700 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Wed, 11 Jul 2018 08:30:08 -0700 Received: from [10.21.132.122] (172.20.13.39) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Wed, 11 Jul 2018 15:30:08 +0000 Subject: Re: [PATCH v2 6/7] soc/tegra: pmc: Remove public pad voltage APIs To: Aapo Vienamo , Rob Herring , Mark Rutland , Thierry Reding , Mikko Perttunen , Laxman Dewangan CC: , , References: <1531317693-3520-1-git-send-email-avienamo@nvidia.com> <1531317938-4099-1-git-send-email-avienamo@nvidia.com> From: Jon Hunter Message-ID: <7a769dbb-c863-8103-16a4-a39395b55ff8@nvidia.com> Date: Wed, 11 Jul 2018 16:30:06 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <1531317938-4099-1-git-send-email-avienamo@nvidia.com> X-Originating-IP: [172.20.13.39] X-ClientProxiedBy: HQMAIL103.nvidia.com (172.20.187.11) To HQMAIL101.nvidia.com (172.20.187.10) Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adding Laxman ... On 11/07/18 15:05, Aapo Vienamo wrote: > Make tegra_io_pad_set_voltage() and tegra_io_pad_get_voltage() static > and remove the prototypes from pmc.h. Remove enum tegra_io_pad_voltage > and use the defines from > instead. > > These functions aren't used outside of the pmc driver and new use cases > should use the pinctrl interface instead. > > Signed-off-by: Aapo Vienamo > --- > drivers/soc/tegra/pmc.c | 17 ++++++++--------- > include/soc/tegra/pmc.h | 13 ------------- > 2 files changed, 8 insertions(+), 22 deletions(-) > > diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c > index f68dbfa..8926831 100644 > --- a/drivers/soc/tegra/pmc.c > +++ b/drivers/soc/tegra/pmc.c > @@ -45,6 +45,8 @@ > #include > #include > > +#include > + > #define PMC_CNTRL 0x0 > #define PMC_CNTRL_INTR_POLARITY BIT(17) /* inverts INTR polarity */ > #define PMC_CNTRL_CPU_PWRREQ_OE BIT(16) /* CPU pwr req enable */ > @@ -1093,8 +1095,7 @@ int tegra_io_pad_is_powered(enum tegra_io_pad id) > } > EXPORT_SYMBOL(tegra_io_pad_is_powered); > > -int tegra_io_pad_set_voltage(enum tegra_io_pad id, > - enum tegra_io_pad_voltage voltage) > +static int tegra_io_pad_set_voltage(enum tegra_io_pad id, int voltage) > { > const struct tegra_io_pad_soc *pad; > u32 value; > @@ -1110,7 +1111,7 @@ int tegra_io_pad_set_voltage(enum tegra_io_pad id, > > if (pmc->soc->has_impl_33v_pwr) { > value = tegra_pmc_readl(PMC_IMPL_E_33V_PWR); > - if (voltage == TEGRA_IO_PAD_1800000UV) > + if (voltage == TEGRA_IO_PAD_VOLTAGE_1V8) > value &= ~BIT(pad->voltage); > else > value |= BIT(pad->voltage); > @@ -1124,7 +1125,7 @@ int tegra_io_pad_set_voltage(enum tegra_io_pad id, > /* update I/O voltage */ > value = tegra_pmc_readl(PMC_PWR_DET_VALUE); > > - if (voltage == TEGRA_IO_PAD_1800000UV) > + if (voltage == TEGRA_IO_PAD_VOLTAGE_3V3) > value &= ~BIT(pad->voltage); > else > value |= BIT(pad->voltage); > @@ -1138,9 +1139,8 @@ int tegra_io_pad_set_voltage(enum tegra_io_pad id, > > return 0; > } > -EXPORT_SYMBOL(tegra_io_pad_set_voltage); > > -int tegra_io_pad_get_voltage(enum tegra_io_pad id) > +static int tegra_io_pad_get_voltage(enum tegra_io_pad id) > { > const struct tegra_io_pad_soc *pad; > u32 value; > @@ -1158,11 +1158,10 @@ int tegra_io_pad_get_voltage(enum tegra_io_pad id) > value = tegra_pmc_readl(PMC_PWR_DET_VALUE); > > if ((value & BIT(pad->voltage)) == 0) > - return TEGRA_IO_PAD_1800000UV; > + return TEGRA_IO_PAD_VOLTAGE_1V8; > > - return TEGRA_IO_PAD_3300000UV; > + return TEGRA_IO_PAD_VOLTAGE_3V3; > } > -EXPORT_SYMBOL(tegra_io_pad_get_voltage); > > /** > * tegra_io_rail_power_on() - enable power to I/O rail > diff --git a/include/soc/tegra/pmc.h b/include/soc/tegra/pmc.h > index 14206e8..b6294f6 100644 > --- a/include/soc/tegra/pmc.h > +++ b/include/soc/tegra/pmc.h > @@ -141,16 +141,6 @@ enum tegra_io_pad { > #define TEGRA_IO_RAIL_HDMI TEGRA_IO_PAD_HDMI > #define TEGRA_IO_RAIL_LVDS TEGRA_IO_PAD_LVDS > > -/** > - * enum tegra_io_pad_voltage - voltage level of the I/O pad's source rail > - * @TEGRA_IO_PAD_1800000UV: 1.8 V > - * @TEGRA_IO_PAD_3300000UV: 3.3 V > - */ > -enum tegra_io_pad_voltage { > - TEGRA_IO_PAD_1800000UV, > - TEGRA_IO_PAD_3300000UV, > -}; > - > #ifdef CONFIG_SOC_TEGRA_PMC > int tegra_powergate_is_powered(unsigned int id); > int tegra_powergate_power_on(unsigned int id); > @@ -164,9 +154,6 @@ int tegra_powergate_sequence_power_up(unsigned int id, struct clk *clk, > int tegra_io_pad_power_enable(enum tegra_io_pad id); > int tegra_io_pad_power_disable(enum tegra_io_pad id); > int tegra_io_pad_is_powered(enum tegra_io_pad id); > -int tegra_io_pad_set_voltage(enum tegra_io_pad id, > - enum tegra_io_pad_voltage voltage); > -int tegra_io_pad_get_voltage(enum tegra_io_pad id); > > /* deprecated, use tegra_io_pad_power_{enable,disable}() instead */ > int tegra_io_rail_power_on(unsigned int id); > Acked-by: Jon Hunter Cheers Jon -- nvpublic