Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 19 Jun 2020 17:49:49 +0000 (UTC)
From:      Emmanuel Vadot <manu@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r362393 - stable/12/sys/dev/extres/regulator
Message-ID:  <202006191749.05JHnnof037862@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: manu
Date: Fri Jun 19 17:49:49 2020
New Revision: 362393
URL: https://svnweb.freebsd.org/changeset/base/362393

Log:
  MFC r356803:
  
  regulator_fixed: Add a get_voltage method
  
  Some consumer cannot know the voltage of the regulator without it.
  While here, refuse to attach is min_voltage != max_voltage, it
  shouldn't happens anyway.

Modified:
  stable/12/sys/dev/extres/regulator/regulator_fixed.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/extres/regulator/regulator_fixed.c
==============================================================================
--- stable/12/sys/dev/extres/regulator/regulator_fixed.c	Fri Jun 19 17:33:54 2020	(r362392)
+++ stable/12/sys/dev/extres/regulator/regulator_fixed.c	Fri Jun 19 17:49:49 2020	(r362393)
@@ -73,6 +73,7 @@ static int regnode_fixed_enable(struct regnode *regnod
     int *udelay);
 static int regnode_fixed_status(struct regnode *regnode, int *status);
 static int regnode_fixed_stop(struct regnode *regnode, int *udelay);
+static int regnode_fixed_get_voltage(struct regnode *regnode, int *uvolt);
 
 static regnode_method_t regnode_fixed_methods[] = {
 	/* Regulator interface */
@@ -80,6 +81,7 @@ static regnode_method_t regnode_fixed_methods[] = {
 	REGNODEMETHOD(regnode_enable,		regnode_fixed_enable),
 	REGNODEMETHOD(regnode_status,		regnode_fixed_status),
 	REGNODEMETHOD(regnode_stop,		regnode_fixed_stop),
+	REGNODEMETHOD(regnode_get_voltage,	regnode_fixed_get_voltage),
 	REGNODEMETHOD(regnode_check_voltage,	regnode_method_check_voltage),
 	REGNODEMETHOD_END
 };
@@ -280,6 +282,16 @@ regnode_fixed_status(struct regnode *regnode, int *sta
 	return (rv);
 }
 
+static int
+regnode_fixed_get_voltage(struct regnode *regnode, int *uvolt)
+{
+	struct regnode_fixed_sc *sc;
+
+	sc = regnode_get_softc(regnode);
+	*uvolt = sc->param->min_uvolt;
+	return (0);
+}
+
 int
 regnode_fixed_register(device_t dev, struct regnode_fixed_init_def *init_def)
 {
@@ -382,6 +394,10 @@ regfix_parse_fdt(struct regfix_softc * sc)
 		return(rv);
 	}
 
+	if (init_def->std_param.min_uvolt != init_def->std_param.max_uvolt) {
+		device_printf(sc->dev, "min_uvolt != max_uvolt\n");
+		return (ENXIO);
+	}
 	/* Fixed regulator uses 'startup-delay-us' property for enable_delay */
 	rv = OF_getencprop(node, "startup-delay-us",
 	   &init_def->std_param.enable_delay,

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006191749.05JHnnof037862>