[v2,055/106] ccs: Use all regulators

Message ID	20201007084557.25843-46-sakari.ailus@linux.intel.com
State	Superseded
Headers	show Return-Path: <SRS0=q2TO=DO=vger.kernel.org=linux-media-owner@kernel.org> From: Sakari Ailus <sakari.ailus@linux.intel.com> To: linux-media@vger.kernel.org Subject: [PATCH v2 055/106] ccs: Use all regulators Date: Wed, 7 Oct 2020 11:45:06 +0300 Message-Id: <20201007084557.25843-46-sakari.ailus@linux.intel.com> In-Reply-To: <20201007084557.25843-1-sakari.ailus@linux.intel.com> References: <20201007084505.25761-1-sakari.ailus@linux.intel.com> <20201007084557.25843-1-sakari.ailus@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [v2,002/106] smiapp: Use CCS register flags [v2,004/106] smiapp: Remove macros for defining registers, merge definitions [v2,009/106] smiapp: Obtain frame descriptor from CCS limits [v2,011/106] smiapp: Use CCS limits in reading binning capabilities [v2,013/106] smiapp: Remove quirk function for writing a single 8-bit register [v2,014/106] smiapp: Rename register access functions [v2,015/106] smiapp: Internal rename to CCS [v2,016/106] smiapp: Differentiate CCS sensors from SMIA in subdev naming [v2,019/106] ccs: Give all subdevs a function [v2,027/106] ccs: Request for "reset" GPIO [v2,029/106] ccs: Remove the I²C ID table [v2,032/106] ccs: Fix obtaining bus information from firmware [v2,033/106] ccs: Add CCS static data parser library [v2,034/106] ccs: Combine revision number major and minor into one [v2,036/106] ccs: Stop reading arrays after the first zero [v2,039/106] ccs: Refactor register reading a little [v2,040/106] ccs: Make real to integer number conversion optional [v2,041/106] ccs: Move limit value real to integer conversion from read to access time [v2,043/106] smiapp-pll: Rename as ccs-pll [v2,020/106] dt-bindings: nokia,smia: Fix link-frequencies documentation [v2,044/106] ccs-pll: Fix MODULE_LICENSE [v2,021/106] dt-bindings: nokia,smia: Make vana-supply optional [v2,023/106] dt-bindings: nokia,smia: Convert to YAML [v2,049/106] ccs: Wrap long lines, unwrap short ones [v2,025/106] dt-bindings: nokia,smia: Amend SMIA bindings with MIPI CCS support [v2,050/106] ccs: Add device compatible identifiers for telling SMIA and CCS apart [v2,053/106] dt-bindings: mipi,ccs: Don't mention vana voltage [v2,052/106] ccs: Remove unnecessary delays from power-up sequence [v2,055/106] ccs: Use all regulators [v2,058/106] ccs-pll: Use correct VT divisor for calculating VT SYS divisor [v2,059/106] ccs-pll: End search if there are no better values available [v2,061/106] ccs-pll: Differentiate between CSI-2 D-PHY and C-PHY [v2,063/106] ccs-pll: Document the structs in the header as well as the function [v2,067/106] ccs-pll: Avoid overflow in pre-PLL divisor lower bound search [v2,074/106] ccs-pll: Add support for extended input PLL clock divider [v2,075/106] ccs-pll: Support two cycles per pixel on OP domain [v2,076/106] ccs-pll: Add support flexible OP PLL pixel clock divider [v2,077/106] ccs-pll: Add sanity checks [v2,079/106] ccs-pll: Split off VT subtree calculation [v2,083/106] ccs-pll: Rework bounds checks [v2,085/106] ccs-pll: Fix VT post-PLL divisor calculation [v2,086/106] ccs-pll: Separate VT divisor limit calculation from the rest [v2,087/106] ccs-pll: Add trivial dual PLL support [v2,088/106] ccs: Dual PLL support [v2,091/106] ccs: Print written register values [v2,093/106] ccs: Add support for obtaining C-PHY configuration from firmware [v2,094/106] ccs: Add digital gain support [v2,096/106] ccs: Remove analogue gain field [v2,097/106] ccs: Only add analogue gain control if the device supports it [v2,098/106] v4l: uapi: Add user control base for CCS controls [v2,099/106] v4l: uapi: ccs: Add controls for analogue gain constants [v2,101/106] v4l: uapi: ccs: Add controls for CCS alternative analogue gain [v2,105/106] ccs: Add shading correction and luminance correction level controls

Message ID

20201007084557.25843-46-sakari.ailus@linux.intel.com

State

Superseded

Headers

From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Subject: [PATCH v2 055/106] ccs: Use all regulators
Date: Wed,  7 Oct 2020 11:45:06 +0300
Message-Id: <20201007084557.25843-46-sakari.ailus@linux.intel.com>
In-Reply-To: <20201007084557.25843-1-sakari.ailus@linux.intel.com>
References: <20201007084505.25761-1-sakari.ailus@linux.intel.com>
	<20201007084557.25843-1-sakari.ailus@linux.intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

None | expand

Commit Message

Sakari Ailus Oct. 7, 2020, 8:45 a.m. UTC

Use regulators vio and vcore besides vana. The regulators were always
there but on many boards they've been hard wired. Control them explicitly
now.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 drivers/media/i2c/ccs/ccs-core.c | 30 +++++++++++++++++++++++-------
 drivers/media/i2c/ccs/ccs.h      |  2 +-
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c
index 8bf42fc222c1..1a466378c1c1 100644
--- a/drivers/media/i2c/ccs/ccs-core.c
+++ b/drivers/media/i2c/ccs/ccs-core.c
@@ -65,6 +65,8 @@  struct ccs_device {
 	unsigned char flags;
 };
 
+static const char * const ccs_regulators[] = { "vcore", "vio", "vana" };
+
 /*
  *
  * Dynamic Capability Identification
@@ -1304,7 +1306,8 @@  static int ccs_power_on(struct device *dev)
 	unsigned int sleep;
 	int rval;
 
-	rval = regulator_enable(sensor->vana);
+	rval = regulator_bulk_enable(ARRAY_SIZE(ccs_regulators),
+				     sensor->regulators);
 	if (rval) {
 		dev_err(dev, "failed to enable vana regulator\n");
 		return rval;
@@ -1416,7 +1419,8 @@  static int ccs_power_on(struct device *dev)
 	clk_disable_unprepare(sensor->ext_clk);
 
 out_xclk_fail:
-	regulator_disable(sensor->vana);
+	regulator_bulk_disable(ARRAY_SIZE(ccs_regulators),
+			       sensor->regulators);
 
 	return rval;
 }
@@ -1442,7 +1446,8 @@  static int ccs_power_off(struct device *dev)
 	gpiod_set_value(sensor->xshutdown, 0);
 	clk_disable_unprepare(sensor->ext_clk);
 	usleep_range(5000, 5000);
-	regulator_disable(sensor->vana);
+	regulator_bulk_disable(ARRAY_SIZE(ccs_regulators),
+			       sensor->regulators);
 	sensor->streaming = false;
 
 	return 0;
@@ -2981,10 +2986,21 @@  static int ccs_probe(struct i2c_client *client)
 	v4l2_i2c_subdev_init(&sensor->src->sd, client, &ccs_ops);
 	sensor->src->sd.internal_ops = &ccs_internal_src_ops;
 
-	sensor->vana = devm_regulator_get(&client->dev, "vana");
-	if (IS_ERR(sensor->vana)) {
-		dev_err(&client->dev, "could not get regulator for vana\n");
-		return PTR_ERR(sensor->vana);
+	sensor->regulators = devm_kcalloc(&client->dev,
+					  ARRAY_SIZE(ccs_regulators),
+					  sizeof(*sensor->regulators),
+					  GFP_KERNEL);
+	if (!sensor->regulators)
+		return -ENOMEM;
+
+	for (i = 0; i < ARRAY_SIZE(ccs_regulators); i++)
+		sensor->regulators[i].supply = ccs_regulators[i];
+
+	rval = devm_regulator_bulk_get(&client->dev, ARRAY_SIZE(ccs_regulators),
+				       sensor->regulators);
+	if (rval) {
+		dev_err(&client->dev, "could not get regulators\n");
+		return rval;
 	}
 
 	sensor->ext_clk = devm_clk_get(&client->dev, NULL);
diff --git a/drivers/media/i2c/ccs/ccs.h b/drivers/media/i2c/ccs/ccs.h
index 6b07e4143ff0..356b87c33405 100644
--- a/drivers/media/i2c/ccs/ccs.h
+++ b/drivers/media/i2c/ccs/ccs.h
@@ -223,7 +223,7 @@  struct ccs_sensor {
 	struct ccs_subdev *scaler;
 	struct ccs_subdev *pixel_array;
 	struct ccs_hwconfig hwcfg;
-	struct regulator *vana;
+	struct regulator_bulk_data *regulators;
 	struct clk *ext_clk;
 	struct gpio_desc *xshutdown;
 	struct gpio_desc *reset;

[v2,055/106] ccs: Use all regulators

Commit Message

Patch