media: ov5640: add support of module orientation (c3f3ba3e) · Commits · 戴 / test

drivers/media/i2c/ov5640.c

+26 −2

Original line number	Original line	Diff line number	Diff line
	@@ -215,6 +215,7 @@ struct ov5640_dev {
	struct regulator_bulk_data supplies[OV5640_NUM_SUPPLIES];		struct regulator_bulk_data supplies[OV5640_NUM_SUPPLIES];
	struct gpio_desc *reset_gpio;		struct gpio_desc *reset_gpio;
	struct gpio_desc *pwdn_gpio;		struct gpio_desc *pwdn_gpio;
			bool upside_down;

	/* lock to protect all members below */		/* lock to protect all members below */
	struct mutex lock;		struct mutex lock;
	@@ -2222,6 +2223,8 @@ static int ov5640_set_ctrl_light_freq(struct ov5640_dev *sensor, int value)
	static int ov5640_set_ctrl_hflip(struct ov5640_dev *sensor, int value)		static int ov5640_set_ctrl_hflip(struct ov5640_dev *sensor, int value)
	{		{
	/*		/*
			* If sensor is mounted upside down, mirror logic is inversed.
			*
	* Sensor is a BSI (Back Side Illuminated) one,		* Sensor is a BSI (Back Side Illuminated) one,
	* so image captured is physically mirrored.		* so image captured is physically mirrored.
	* This is why mirror logic is inversed in		* This is why mirror logic is inversed in
	@@ -2235,11 +2238,14 @@ static int ov5640_set_ctrl_hflip(struct ov5640_dev *sensor, int value)
	*/		*/
	return ov5640_mod_reg(sensor, OV5640_REG_TIMING_TC_REG21,		return ov5640_mod_reg(sensor, OV5640_REG_TIMING_TC_REG21,
	BIT(2) \| BIT(1),		BIT(2) \| BIT(1),
	(!value) ? (BIT(2) \| BIT(1)) : 0);		(!(value ^ sensor->upside_down)) ?
			(BIT(2) \| BIT(1)) : 0);
	}		}

	static int ov5640_set_ctrl_vflip(struct ov5640_dev *sensor, int value)		static int ov5640_set_ctrl_vflip(struct ov5640_dev *sensor, int value)
	{		{
			/* If sensor is mounted upside down, flip logic is inversed */

	/*		/*
	* TIMING TC REG20:		* TIMING TC REG20:
	* - [2]: ISP vflip		* - [2]: ISP vflip
	@@ -2247,7 +2253,8 @@ static int ov5640_set_ctrl_vflip(struct ov5640_dev *sensor, int value)
	*/		*/
	return ov5640_mod_reg(sensor, OV5640_REG_TIMING_TC_REG20,		return ov5640_mod_reg(sensor, OV5640_REG_TIMING_TC_REG20,
	BIT(2) \| BIT(1),		BIT(2) \| BIT(1),
	value ? (BIT(2) \| BIT(1)) : 0);		(value ^ sensor->upside_down) ?
			(BIT(2) \| BIT(1)) : 0);
	}		}

	static int ov5640_g_volatile_ctrl(struct v4l2_ctrl *ctrl)		static int ov5640_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
	@@ -2625,6 +2632,7 @@ static int ov5640_probe(struct i2c_client *client,
	struct fwnode_handle *endpoint;		struct fwnode_handle *endpoint;
	struct ov5640_dev *sensor;		struct ov5640_dev *sensor;
	struct v4l2_mbus_framefmt *fmt;		struct v4l2_mbus_framefmt *fmt;
			u32 rotation;
	int ret;		int ret;

	sensor = devm_kzalloc(dev, sizeof(*sensor), GFP_KERNEL);		sensor = devm_kzalloc(dev, sizeof(*sensor), GFP_KERNEL);
	@@ -2650,6 +2658,22 @@ static int ov5640_probe(struct i2c_client *client,

	sensor->ae_target = 52;		sensor->ae_target = 52;

			/* optional indication of physical rotation of sensor */
			ret = fwnode_property_read_u32(dev_fwnode(&client->dev), "rotation",
			&rotation);
			if (!ret) {
			switch (rotation) {
			case 180:
			sensor->upside_down = true;
			/* fall through */
			case 0:
			break;
			default:
			dev_warn(dev, "%u degrees rotation is not supported, ignoring...\n",
			rotation);
			}
			}

	endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(&client->dev),		endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(&client->dev),
	NULL);		NULL);
	if (!endpoint) {		if (!endpoint) {

Admin message