Commit a34631c2 authored by Mark Greer's avatar Mark Greer Committed by Samuel Ortiz
Browse files

NFC: trf7970a: Remove support for 'vin-voltage-override' DT property 



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: default avatarMark Greer <mgreer@animalcreek.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent fcc652f6

Documentation/devicetree/bindings/net/nfc/trf7970a.txt

+0 −2
Original line number Diff line number Diff line
@@ -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;

drivers/nfc/trf7970a.c

+1 −10
Original line number Diff line number Diff line
@@ -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);



	if (uvolts > 4000000)

		trf->chip_status_ctrl = TRF7970A_CHIP_STATUS_VRS5_3;

CRA Git | Maintained and supported by SUSTech CRA and CCSE