Camera: Use cif_clk_out 24MHz

Change-Id: Ic66a3770ea849a84f7499dd9faa1769ea3d4ddf8

Author: xuanhao_zhang

arch/arm/boot/dts/overlays/camera-ov5647-overlay.dts

@@ -12,7 +12,9 @@
 			camera0: ov5647@36 {
 				compatible = "ovti,ov5647";
 				reg = <0x36>;
-				clocks = <&ext_cam_clk>;
+				clocks = <&cru 127>;
+				pinctrl-names = "rockchip,camera_default";
+				pinctrl-0 = <&isp_mipi>;
 				status = "okay";
 
 				port {
@@ -26,7 +28,9 @@
 			camera1: imx219@10 {
 				compatible = "sony,imx219";
 				reg = <0x10>;
-				clocks = <&ext_cam_clk>;
+				clocks = <&cru 127>;
+				pinctrl-names = "rockchip,camera_default";
+				pinctrl-0 = <&isp_mipi>;
 				status = "disabled";
 				port {
 					imx219_out: endpoint {

arch/arm/boot/dts/rk3288-miniarm.dts

@@ -517,7 +517,9 @@
 	camera0: ov5647@36 {
 		compatible = "ovti,ov5647";
 		reg = <0x36>;
-		clocks = <&ext_cam_clk>;
+		clocks = <&cru SCLK_VIP_OUT>;
+		pinctrl-names = "rockchip,camera_default";
+		pinctrl-0 = <&isp_mipi>;
 		status = "disabled";
 		port {
 			ov5647_out: endpoint {
@@ -528,7 +530,9 @@
 	camera1: imx219@10 {
 		compatible = "sony,imx219";
 		reg = <0x10>;
-		clocks = <&ext_cam_clk>;
+		clocks = <&cru SCLK_VIP_OUT>;
+		pinctrl-names = "rockchip,camera_default";
+		pinctrl-0 = <&isp_mipi>;
 		status = "okay";
 		port {
 			imx219_out: endpoint {

drivers/media/i2c/imx219.c

@@ -14,6 +14,7 @@
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/of_graph.h>
+#include <linux/pinctrl/consumer.h>
 #include <linux/slab.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-ctrls.h>
@@ -40,6 +41,9 @@
 
 #define IMX219_EXP_LINES_MARGIN	4
 
+#define OF_CAMERA_PINCTRL_STATE_DEFAULT	"rockchip,camera_default"
+#define IMX219_XVCLK_FREQ				24000000
+
 static const s64 link_freq_menu_items[] = {
 	456000000,
 };
@@ -281,6 +285,9 @@ struct imx219 {
 	struct v4l2_ctrl *pixel_rate;
 	const struct imx219_mode *cur_mode;
 	u16 cur_vts;
+
+	struct pinctrl          *pinctrl;
+	struct pinctrl_state    *pins_default;
 };
 
 static const struct imx219_mode supported_modes[] = {
@@ -967,6 +974,7 @@ static int imx219_probe(struct i2c_client *client,
 	struct imx219 *priv;
 	struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
 	int ret;
+	u32 clk_freq;
 
 	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
 		dev_warn(&adapter->dev,
@@ -977,12 +985,36 @@ static int imx219_probe(struct i2c_client *client,
 	if (!priv)
 		return -ENOMEM;
 
+	priv->pinctrl = devm_pinctrl_get(&client->dev);
+	if (!IS_ERR(priv->pinctrl)) {
+		priv->pins_default = pinctrl_lookup_state(priv->pinctrl,
+				OF_CAMERA_PINCTRL_STATE_DEFAULT);
+	if (IS_ERR(priv->pins_default))
+		dev_err(&client->dev, "could not get default pinstate\n");
+	}
+
+	if (!IS_ERR_OR_NULL(priv->pins_default)) {
+		ret = pinctrl_select_state(priv->pinctrl, priv->pins_default);
+		if (ret < 0)
+			dev_err(&client->dev, "could not set pins\n");
+	}
+
 	priv->clk = devm_clk_get(&client->dev, NULL);
 	if (IS_ERR(priv->clk)) {
 		dev_info(&client->dev, "Error %ld getting clock\n",
 			 PTR_ERR(priv->clk));
 		return -EPROBE_DEFER;
 	}
+	ret = clk_set_rate(priv->clk, IMX219_XVCLK_FREQ);
+	if (ret < 0) {
+		dev_err(&client->dev, "Failed to set xvclk rate (24MHz)\n");
+		return ret;
+	}
+	clk_freq = clk_get_rate(priv->clk);
+	if (clk_freq != IMX219_XVCLK_FREQ) {
+		dev_err(&client->dev, "Unsupported clock frequency: %u\n", clk_freq);
+		return -EINVAL;
+	}
 
 	/* 1920 * 1080 by default */
 	priv->cur_mode = &supported_modes[0];

drivers/media/i2c/ov5647.c

@@ -26,6 +26,7 @@
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/of_graph.h>
+#include <linux/pinctrl/consumer.h>
 #include <linux/slab.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-ctrls.h>
@@ -58,6 +59,8 @@
 #define OV5647_ANALOG_GAIN_STEP	0x01
 #define OV5647_ANALOG_GAIN_DEFAULT 0x100
 
+#define OF_CAMERA_PINCTRL_STATE_DEFAULT	"rockchip,camera_default"
+#define OV5647_XVCLK_FREQ		24000000
 #define OV5647_LINK_FREQ_150MHZ		150000000
 static const s64 link_freq_menu_items[] = {
 	OV5647_LINK_FREQ_150MHZ
@@ -87,6 +90,9 @@ struct ov5647_state {
 	struct v4l2_ctrl *anal_gain;
 
 	const struct ov5647_mode *cur_mode;
+
+	struct pinctrl		*pinctrl;
+	struct pinctrl_state	*pins_default;
 };
 
 struct ov5647_mode {
@@ -851,15 +857,34 @@ static int ov5647_probe(struct i2c_client *client,
 		}
 	}
 
+	sensor->pinctrl = devm_pinctrl_get(dev);
+	if (!IS_ERR(sensor->pinctrl)) {
+		sensor->pins_default =
+			pinctrl_lookup_state(sensor->pinctrl,
+					     OF_CAMERA_PINCTRL_STATE_DEFAULT);
+		if (IS_ERR(sensor->pins_default))
+			dev_err(dev, "could not get default pinstate\n");
+	}
+	if (!IS_ERR_OR_NULL(sensor->pins_default)) {
+		ret = pinctrl_select_state(sensor->pinctrl,
+					   sensor->pins_default);
+		if (ret < 0)
+			dev_err(dev, "could not set pins\n");
+	}
+
 	/* get system clock (xclk) */
 	sensor->xclk = devm_clk_get(dev, NULL);
 	if (IS_ERR(sensor->xclk)) {
 		dev_err(dev, "could not get xclk");
 		return PTR_ERR(sensor->xclk);
 	}
-
+	ret = clk_set_rate(sensor->xclk, OV5647_XVCLK_FREQ);
+	if (ret < 0) {
+		dev_err(dev, "Failed to set xvclk rate (24MHz)\n");
+		return ret;
+	}
 	xclk_freq = clk_get_rate(sensor->xclk);
-	if (xclk_freq != 25000000) {
+	if (xclk_freq != OV5647_XVCLK_FREQ) {
 		dev_err(dev, "Unsupported clock frequency: %u\n", xclk_freq);
 		return -EINVAL;
 	}