[v2,027/106] ccs: Request for "reset" GPIO

Message ID	20201007084557.25843-20-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 027/106] ccs: Request for "reset" GPIO Date: Wed, 7 Oct 2020 11:44:40 +0300 Message-Id: <20201007084557.25843-20-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-20-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 027/106] ccs: Request for "reset" GPIO
Date: Wed,  7 Oct 2020 11:44:40 +0300
Message-Id: <20201007084557.25843-20-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:44 a.m. UTC

The DT bindings documented "reset-gpios" property but the driver never
made use of it. Instead it used a GPIO called "xshutdown", with apprently
wrong polarity.

Fix this by requesting "reset" GPIO with the right polarity first, and if
that fails, then request "xshutdown" GPIO with the old polarity. This way
it works for new users as expected while if someone, somewhere, depended
on "xshutdown" GPIO, that continues to work as well.

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

diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c
index 1880ed31845e..775037ce361f 100644
--- a/drivers/media/i2c/ccs/ccs-core.c
+++ b/drivers/media/i2c/ccs/ccs-core.c
@@ -1295,6 +1295,7 @@  static int ccs_power_on(struct device *dev)
 	}
 	usleep_range(1000, 1000);
 
+	gpiod_set_value(sensor->reset, 0);
 	gpiod_set_value(sensor->xshutdown, 1);
 
 	sleep = SMIAPP_RESET_DELAY(sensor->hwcfg->ext_clk);
@@ -1381,6 +1382,7 @@  static int ccs_power_on(struct device *dev)
 	return 0;
 
 out_cci_addr_fail:
+	gpiod_set_value(sensor->reset, 1);
 	gpiod_set_value(sensor->xshutdown, 0);
 	clk_disable_unprepare(sensor->ext_clk);
 
@@ -1407,6 +1409,7 @@  static int ccs_power_off(struct device *dev)
 	if (sensor->hwcfg->i2c_addr_alt)
 		ccs_write(sensor, SOFTWARE_RESET, CCS_SOFTWARE_RESET_ON);
 
+	gpiod_set_value(sensor->reset, 1);
 	gpiod_set_value(sensor->xshutdown, 0);
 	clk_disable_unprepare(sensor->ext_clk);
 	usleep_range(5000, 5000);
@@ -3008,8 +3011,15 @@  static int ccs_probe(struct i2c_client *client)
 		return -EINVAL;
 	}
 
-	sensor->xshutdown = devm_gpiod_get_optional(&client->dev, "xshutdown",
-						    GPIOD_OUT_LOW);
+	sensor->reset = devm_gpiod_get_optional(&client->dev, "reset",
+						GPIOD_OUT_HIGH);
+	if (IS_ERR(sensor->reset))
+		return PTR_ERR(sensor->reset);
+	/* Support old users that may have used "xshutdown" property. */
+	if (!sensor->reset)
+		sensor->xshutdown = devm_gpiod_get_optional(&client->dev,
+							    "xshutdown",
+							    GPIOD_OUT_LOW);
 	if (IS_ERR(sensor->xshutdown))
 		return PTR_ERR(sensor->xshutdown);
 
diff --git a/drivers/media/i2c/ccs/ccs.h b/drivers/media/i2c/ccs/ccs.h
index 8933f3d40fa5..bfe39e02f5e9 100644
--- a/drivers/media/i2c/ccs/ccs.h
+++ b/drivers/media/i2c/ccs/ccs.h
@@ -219,6 +219,7 @@  struct ccs_sensor {
 	struct regulator *vana;
 	struct clk *ext_clk;
 	struct gpio_desc *xshutdown;
+	struct gpio_desc *reset;
 	void *ccs_limits;
 	u8 nbinning_subtypes;
 	struct ccs_binning_subtype binning_subtypes[CCS_LIM_BINNING_SUB_TYPE_MAX_N + 1];

[v2,027/106] ccs: Request for "reset" GPIO

Commit Message

Patch