From: Mark Greer <mgreer@animalcreek.com> To: Samuel Ortiz <sameo@linux.intel.com> Cc: linux-wireless@vger.kernel.org, linux-nfc@lists.01.org, devicetree@vger.kernel.org, Mark Greer <mgreer@animalcreek.com> Subject: [PATCH v4 6/9] NFC: trf7970a: Remove support for 'vin-voltage-override' DT property Date: Tue, 25 Apr 2017 11:40:33 -0700 [thread overview] Message-ID: <20170425184036.1212-7-mgreer@animalcreek.com> (raw) In-Reply-To: <20170425184036.1212-1-mgreer@animalcreek.com> The 'vin-voltage-override' DT property is used by the trf7970a driver to override the voltage presented to the driver by the regulator subsystem. This is unnecessary as properly specifying the regulator chain via DT properties will accomplish the same thing. Therefore, remove support for 'vin-voltage-override'. Signed-off-by: Mark Greer <mgreer@animalcreek.com> --- Documentation/devicetree/bindings/net/nfc/trf7970a.txt | 2 -- drivers/nfc/trf7970a.c | 11 +---------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Documentation/devicetree/bindings/net/nfc/trf7970a.txt b/Documentation/devicetree/bindings/net/nfc/trf7970a.txt index c627bbb3009e..57cb52c94783 100644 --- a/Documentation/devicetree/bindings/net/nfc/trf7970a.txt +++ b/Documentation/devicetree/bindings/net/nfc/trf7970a.txt @@ -13,7 +13,6 @@ Optional SoC Specific Properties: - pinctrl-names: Contains only one value - "default". - pintctrl-0: Specifies the pin control groups used for this controller. - autosuspend-delay: Specify autosuspend delay in milliseconds. -- vin-voltage-override: Specify voltage of VIN pin in microvolts. - irq-status-read-quirk: Specify that the trf7970a being used has the "IRQ Status Read" erratum. - en2-rf-quirk: Specify that the trf7970a being used has the "EN2 RF" @@ -40,7 +39,6 @@ Example (for ARM-based BeagleBone with TRF7970A on SPI1): ti,enable-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>, <&gpio2 5 GPIO_ACTIVE_LOW>; vin-supply = <&ldo3_reg>; - vin-voltage-override = <5000000>; vdd-io-supply = <&ldo2_reg>; autosuspend-delay = <30000>; irq-status-read-quirk; diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c index b9a90843ea35..5827ad111942 100644 --- a/drivers/nfc/trf7970a.c +++ b/drivers/nfc/trf7970a.c @@ -2005,12 +2005,6 @@ static int trf7970a_get_autosuspend_delay(struct device_node *np) return autosuspend_delay; } -static int trf7970a_get_vin_voltage_override(struct device_node *np, - u32 *vin_uvolts) -{ - return of_property_read_u32(np, "vin-voltage-override", vin_uvolts); -} - static int trf7970a_probe(struct spi_device *spi) { struct device_node *np = spi->dev.of_node; @@ -2108,10 +2102,7 @@ static int trf7970a_probe(struct spi_device *spi) goto err_destroy_lock; } - ret = trf7970a_get_vin_voltage_override(np, &uvolts); - if (ret) - uvolts = regulator_get_voltage(trf->regulator); - + uvolts = regulator_get_voltage(trf->regulator); if (uvolts > 4000000) trf->chip_status_ctrl = TRF7970A_CHIP_STATUS_VRS5_3; -- 2.12.0
WARNING: multiple messages have this Message-ID (diff)
From: Mark Greer <mgreer-luAo+O/VEmrlveNOaEYElw@public.gmane.org> To: Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-nfc-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Mark Greer <mgreer-luAo+O/VEmrlveNOaEYElw@public.gmane.org> Subject: [PATCH v4 6/9] NFC: trf7970a: Remove support for 'vin-voltage-override' DT property Date: Tue, 25 Apr 2017 11:40:33 -0700 [thread overview] Message-ID: <20170425184036.1212-7-mgreer@animalcreek.com> (raw) In-Reply-To: <20170425184036.1212-1-mgreer-luAo+O/VEmrlveNOaEYElw@public.gmane.org> The 'vin-voltage-override' DT property is used by the trf7970a driver to override the voltage presented to the driver by the regulator subsystem. This is unnecessary as properly specifying the regulator chain via DT properties will accomplish the same thing. Therefore, remove support for 'vin-voltage-override'. Signed-off-by: Mark Greer <mgreer-luAo+O/VEmrlveNOaEYElw@public.gmane.org> --- Documentation/devicetree/bindings/net/nfc/trf7970a.txt | 2 -- drivers/nfc/trf7970a.c | 11 +---------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Documentation/devicetree/bindings/net/nfc/trf7970a.txt b/Documentation/devicetree/bindings/net/nfc/trf7970a.txt index c627bbb3009e..57cb52c94783 100644 --- a/Documentation/devicetree/bindings/net/nfc/trf7970a.txt +++ b/Documentation/devicetree/bindings/net/nfc/trf7970a.txt @@ -13,7 +13,6 @@ Optional SoC Specific Properties: - pinctrl-names: Contains only one value - "default". - pintctrl-0: Specifies the pin control groups used for this controller. - autosuspend-delay: Specify autosuspend delay in milliseconds. -- vin-voltage-override: Specify voltage of VIN pin in microvolts. - irq-status-read-quirk: Specify that the trf7970a being used has the "IRQ Status Read" erratum. - en2-rf-quirk: Specify that the trf7970a being used has the "EN2 RF" @@ -40,7 +39,6 @@ Example (for ARM-based BeagleBone with TRF7970A on SPI1): ti,enable-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>, <&gpio2 5 GPIO_ACTIVE_LOW>; vin-supply = <&ldo3_reg>; - vin-voltage-override = <5000000>; vdd-io-supply = <&ldo2_reg>; autosuspend-delay = <30000>; irq-status-read-quirk; diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c index b9a90843ea35..5827ad111942 100644 --- a/drivers/nfc/trf7970a.c +++ b/drivers/nfc/trf7970a.c @@ -2005,12 +2005,6 @@ static int trf7970a_get_autosuspend_delay(struct device_node *np) return autosuspend_delay; } -static int trf7970a_get_vin_voltage_override(struct device_node *np, - u32 *vin_uvolts) -{ - return of_property_read_u32(np, "vin-voltage-override", vin_uvolts); -} - static int trf7970a_probe(struct spi_device *spi) { struct device_node *np = spi->dev.of_node; @@ -2108,10 +2102,7 @@ static int trf7970a_probe(struct spi_device *spi) goto err_destroy_lock; } - ret = trf7970a_get_vin_voltage_override(np, &uvolts); - if (ret) - uvolts = regulator_get_voltage(trf->regulator); - + uvolts = regulator_get_voltage(trf->regulator); if (uvolts > 4000000) trf->chip_status_ctrl = TRF7970A_CHIP_STATUS_VRS5_3; -- 2.12.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2017-04-25 18:40 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-25 18:40 [PATCH v4 0/9] NFC: trf7970a: Fixups & convert to desc-based GPIO Mark Greer 2017-04-25 18:40 ` Mark Greer 2017-04-25 18:40 ` [PATCH v4 1/9] MAINTAINERS: NFC: trf7970a: Add Mark Greer as maintainer Mark Greer 2017-04-25 18:40 ` Mark Greer 2017-04-25 18:40 ` [PATCH v4 2/9] NFC: trf7970a: Don't de-assert EN2 unless it was asserted Mark Greer 2017-04-25 18:40 ` Mark Greer 2017-04-25 18:40 ` [PATCH v4 3/9] NFC: trf7970a: Fix inaccurate comment in trf7970a_probe() Mark Greer 2017-04-25 18:40 ` Mark Greer 2017-04-25 18:40 ` [PATCH v4 4/9] NFC: trf7970a: Only check 'en2-rf-quirk' if EN2 is specified Mark Greer 2017-04-25 18:40 ` Mark Greer 2017-04-25 18:40 ` [PATCH v4 5/9] NFC: trf7970a: Remove useless comment Mark Greer 2017-04-25 18:40 ` Mark Greer 2017-04-25 18:40 ` Mark Greer [this message] 2017-04-25 18:40 ` [PATCH v4 6/9] NFC: trf7970a: Remove support for 'vin-voltage-override' DT property Mark Greer 2017-04-25 18:40 ` [PATCH v4 7/9] NFC: trf7970a: Enable pins are active high not active low Mark Greer 2017-04-25 18:40 ` Mark Greer 2017-04-25 18:40 ` [PATCH v4 8/9] NFC: trf7970a: Convert to descriptor based GPIO interface Mark Greer 2017-04-25 18:40 ` Mark Greer 2017-04-25 18:40 ` [PATCH v4 9/9] NFC: trf7970a: Clean up coding style issues Mark Greer 2017-04-25 18:40 ` Mark Greer 2017-04-25 22:43 ` [PATCH v4 0/9] NFC: trf7970a: Fixups & convert to desc-based GPIO Mark Greer 2017-04-25 22:43 ` Mark Greer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170425184036.1212-7-mgreer@animalcreek.com \ --to=mgreer@animalcreek.com \ --cc=devicetree@vger.kernel.org \ --cc=linux-nfc@lists.01.org \ --cc=linux-wireless@vger.kernel.org \ --cc=sameo@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.