Commit 0874734e authored by Bastian Krause's avatar Bastian Krause Committed by Alexandre Belloni
Browse files

rtc: ds1307: consider aux-voltage-chargeable 



Prefer aux-voltage-chargeable over trickle-diode-disable and set diode
accordingly. This is then passed to the chip's appropriate charge setup
function.

Signed-off-by: default avatarBastian Krause <bst@pengutronix.de>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20200917183246.19446-8-bst@pengutronix.de
parent 95a74cbb

drivers/rtc/rtc-ds1307.c

+21 −2
Original line number Diff line number Diff line
@@ -1313,7 +1313,7 @@ static int ds1307_nvram_write(void *priv, unsigned int offset, void *val, 
static u8 ds1307_trickle_init(struct ds1307 *ds1307,

			      const struct chip_desc *chip)

{

	u32 ohms;

	u32 ohms, chargeable;

	bool diode = chip->charge_default;



	if (!chip->do_trickle_setup)
@@ -1323,8 +1323,27 @@ static u8 ds1307_trickle_init(struct ds1307 *ds1307, 
				     &ohms) && chip->requires_trickle_resistor)

		return 0;



	if (device_property_read_bool(ds1307->dev, "trickle-diode-disable"))

	/* aux-voltage-chargeable takes precedence over the deprecated

	 * trickle-diode-disable

	 */

	if (!device_property_read_u32(ds1307->dev, "aux-voltage-chargeable",

				     &chargeable)) {

		switch (chargeable) {

		case 0:

			diode = false;

			break;

		case 1:

			diode = true;

			break;

		default:

			dev_warn(ds1307->dev,

				 "unsupported aux-voltage-chargeable value\n");

			break;

		}

	} else if (device_property_read_bool(ds1307->dev,

					     "trickle-diode-disable")) {

		diode = false;

	}



	return chip->do_trickle_setup(ds1307, ohms, diode);

}