From: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
To: sakari.ailus@iki.fi
Cc: sre@kernel.org, pali.rohar@gmail.com, pavel@ucw.cz,
linux-media@vger.kernel.org,
Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Subject: [RFC PATCH 22/24] [media] omap3isp: Correctly set IO_OUT_SEL and VP_CLK_POL for CCP2 mode
Date: Mon, 25 Apr 2016 00:08:22 +0300 [thread overview]
Message-ID: <1461532104-24032-23-git-send-email-ivo.g.dimitrov.75@gmail.com> (raw)
In-Reply-To: <1461532104-24032-1-git-send-email-ivo.g.dimitrov.75@gmail.com>
ISP CSI1 module needs all the bits correctly set to work.
Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
---
drivers/media/platform/omap3isp/isp.c | 2 ++
drivers/media/platform/omap3isp/ispccp2.c | 7 +++++--
drivers/media/platform/omap3isp/ispreg.h | 4 ++++
drivers/media/platform/omap3isp/omap3isp.h | 1 +
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index e51a1f9..6361fde 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -2056,6 +2056,8 @@ static void isp_of_parse_node_csi1(struct device *dev,
* sensor. Frame descriptors, perhaps?
*/
buscfg->bus.ccp2.crc = 1;
+
+ buscfg->bus.ccp2.vp_clk_pol = 1;
}
static void isp_of_parse_node_csi2(struct device *dev,
diff --git a/drivers/media/platform/omap3isp/ispccp2.c b/drivers/media/platform/omap3isp/ispccp2.c
index ca09523..7bb7feb 100644
--- a/drivers/media/platform/omap3isp/ispccp2.c
+++ b/drivers/media/platform/omap3isp/ispccp2.c
@@ -213,14 +213,17 @@ static int ccp2_phyif_config(struct isp_ccp2_device *ccp2,
struct isp_device *isp = to_isp_device(ccp2);
u32 val;
- /* CCP2B mode */
val = isp_reg_readl(isp, OMAP3_ISP_IOMEM_CCP2, ISPCCP2_CTRL) |
- ISPCCP2_CTRL_IO_OUT_SEL | ISPCCP2_CTRL_MODE;
+ ISPCCP2_CTRL_MODE;
/* Data/strobe physical layer */
BIT_SET(val, ISPCCP2_CTRL_PHY_SEL_SHIFT, ISPCCP2_CTRL_PHY_SEL_MASK,
buscfg->phy_layer);
+ BIT_SET(val, ISPCCP2_CTRL_IO_OUT_SEL_SHIFT,
+ ISPCCP2_CTRL_IO_OUT_SEL_MASK, buscfg->ccp2_mode);
BIT_SET(val, ISPCCP2_CTRL_INV_SHIFT, ISPCCP2_CTRL_INV_MASK,
buscfg->strobe_clk_pol);
+ BIT_SET(val, ISPCCP2_CTRL_VP_CLK_POL_SHIFT,
+ ISPCCP2_CTRL_VP_CLK_POL_MASK, buscfg->vp_clk_pol);
isp_reg_writel(isp, val, OMAP3_ISP_IOMEM_CCP2, ISPCCP2_CTRL);
val = isp_reg_readl(isp, OMAP3_ISP_IOMEM_CCP2, ISPCCP2_CTRL);
diff --git a/drivers/media/platform/omap3isp/ispreg.h b/drivers/media/platform/omap3isp/ispreg.h
index b5ea8da..d084839 100644
--- a/drivers/media/platform/omap3isp/ispreg.h
+++ b/drivers/media/platform/omap3isp/ispreg.h
@@ -87,6 +87,8 @@
#define ISPCCP2_CTRL_PHY_SEL_MASK 0x1
#define ISPCCP2_CTRL_PHY_SEL_SHIFT 1
#define ISPCCP2_CTRL_IO_OUT_SEL (1 << 2)
+#define ISPCCP2_CTRL_IO_OUT_SEL_MASK 0x1
+#define ISPCCP2_CTRL_IO_OUT_SEL_SHIFT 2
#define ISPCCP2_CTRL_MODE (1 << 4)
#define ISPCCP2_CTRL_VP_CLK_FORCE_ON (1 << 9)
#define ISPCCP2_CTRL_INV (1 << 10)
@@ -94,6 +96,8 @@
#define ISPCCP2_CTRL_INV_SHIFT 10
#define ISPCCP2_CTRL_VP_ONLY_EN (1 << 11)
#define ISPCCP2_CTRL_VP_CLK_POL (1 << 12)
+#define ISPCCP2_CTRL_VP_CLK_POL_MASK 0x1
+#define ISPCCP2_CTRL_VP_CLK_POL_SHIFT 12
#define ISPCCP2_CTRL_VPCLK_DIV_SHIFT 15
#define ISPCCP2_CTRL_VPCLK_DIV_MASK 0x1ffff /* [31:15] */
#define ISPCCP2_CTRL_VP_OUT_CTRL_SHIFT 8 /* 3430 bits */
diff --git a/drivers/media/platform/omap3isp/omap3isp.h b/drivers/media/platform/omap3isp/omap3isp.h
index 443e8f7..f6d1d0d 100644
--- a/drivers/media/platform/omap3isp/omap3isp.h
+++ b/drivers/media/platform/omap3isp/omap3isp.h
@@ -108,6 +108,7 @@ struct isp_ccp2_cfg {
unsigned int ccp2_mode:1;
unsigned int phy_layer:1;
unsigned int vpclk_div:2;
+ unsigned int vp_clk_pol:1;
struct isp_csiphy_lanes_cfg lanecfg;
};
--
1.9.1
next prev parent reply other threads:[~2016-04-24 21:10 UTC|newest]
Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20160420081427.GZ32125@valkosipuli.retiisi.org.uk>
2016-04-24 21:08 ` [RFC PATCH 00/24] Make Nokia N900 cameras working Ivaylo Dimitrov
2016-04-24 21:08 ` [RFC PATCH 01/24] V4L fixes Ivaylo Dimitrov
2016-04-24 22:05 ` Pavel Machek
2016-04-25 7:29 ` Hans Verkuil
2016-04-25 13:25 ` Sakari Ailus
2016-04-25 16:32 ` Ivaylo Dimitrov
2016-04-29 7:41 ` Sakari Ailus
2016-04-24 21:08 ` [RFC PATCH 02/24] smiaregs: Generic i2c register writing Ivaylo Dimitrov
2016-04-24 21:08 ` [RFC PATCH 03/24] et8ek8: Toshiba 5MP sensor driver Ivaylo Dimitrov
2016-05-01 10:44 ` Sakari Ailus
2016-05-01 12:31 ` Ivaylo Dimitrov
2016-05-01 12:32 ` Ivaylo Dimitrov
2016-05-01 12:50 ` Ivaylo Dimitrov
2016-05-01 13:41 ` Sakari Ailus
2016-05-03 14:50 ` [PATCH] [media]: Driver for Toshiba et8ek8 5MP sensor Ivaylo Dimitrov
2016-05-22 10:07 ` Ivaylo Dimitrov
2016-05-24 11:19 ` Pavel Machek
2016-06-04 19:16 ` Ivaylo Dimitrov
2016-06-06 9:04 ` Sylwester Nawrocki
2016-05-25 21:45 ` Sakari Ailus
2016-06-04 19:54 ` Ivaylo Dimitrov
2016-06-09 23:13 ` Sakari Ailus
2016-04-24 21:08 ` [RFC PATCH 04/24] smiapp-pll: Take existing divisor into account in minimum divisor check Ivaylo Dimitrov
2016-05-01 10:45 ` Sakari Ailus
2016-05-03 18:25 ` Ivaylo Dimitrov
2016-05-24 9:09 ` Pali Rohár
2016-05-24 10:17 ` Pavel Machek
2016-04-24 21:08 ` [RFC PATCH 05/24] smiapp: Add smiapp_has_quirk() to tell whether a quirk is implemented Ivaylo Dimitrov
2016-04-24 21:08 ` [RFC PATCH 06/24] smiapp: Add quirk control support Ivaylo Dimitrov
2016-05-01 10:46 ` Sakari Ailus
2016-05-03 18:32 ` Ivaylo Dimitrov
2016-04-24 21:08 ` [RFC PATCH 07/24] v4l: of: Call CSI2 bus csi2, not csi Ivaylo Dimitrov
2016-04-29 13:22 ` Pavel Machek
2016-04-24 21:08 ` [RFC PATCH 08/24] v4l: of: Obtain data bus type from bus-type property Ivaylo Dimitrov
2016-04-24 21:08 ` [RFC PATCH 09/24] v4l: Add CSI1 and CCP2 bus type to enum v4l2_mbus_type Ivaylo Dimitrov
2016-04-29 13:27 ` Pavel Machek
2016-04-24 21:08 ` [RFC PATCH 10/24] v4l: of: Separate lane parsing from CSI-2 bus parameter parsing Ivaylo Dimitrov
2016-04-24 21:08 ` [RFC PATCH 11/24] dt: bindings: v4l: Add bus-type video interface property Ivaylo Dimitrov
2016-04-29 13:28 ` Pavel Machek
2016-04-24 21:08 ` [RFC PATCH 12/24] dt: bindings: Add CSI1/CCP2 related properties to video-interfaces.txt Ivaylo Dimitrov
2016-04-29 13:39 ` Pavel Machek
2016-04-24 21:08 ` [RFC PATCH 13/24] v4l: of: Support CSI-1 and CCP2 busses Ivaylo Dimitrov
2016-04-24 21:08 ` [RFC PATCH 14/24] media: et8ek8: add device tree binding document Ivaylo Dimitrov
2016-04-24 21:08 ` [RFC PATCH 15/24] media: add subdev type for bus switch Ivaylo Dimitrov
2016-04-24 21:08 ` [RFC PATCH 16/24] media: video-bus-switch: new driver Ivaylo Dimitrov
2016-04-24 21:08 ` [RFC PATCH 17/24] smiapp: add CCP2 support Ivaylo Dimitrov
2016-05-01 10:57 ` Sakari Ailus
2016-04-24 21:08 ` [RFC PATCH 18/24] v4l2-async: per notifier locking Ivaylo Dimitrov
2016-04-24 21:08 ` [RFC PATCH 19/24] v4l2_device_register_subdev_nodes: allow calling multiple times Ivaylo Dimitrov
2016-04-24 21:08 ` [RFC PATCH 20/24] ARM: dts: omap3-n900: enable cameras Ivaylo Dimitrov
2016-04-24 21:08 ` [RFC PATCH 21/24] omap3isp: dt: Add support for CSI1/CCP2 busses Ivaylo Dimitrov
2016-04-24 21:08 ` Ivaylo Dimitrov [this message]
2016-04-24 21:08 ` [RFC PATCH 23/24] [media] omap3isp: Make sure CSI1 interface is enabled in CPP2 mode Ivaylo Dimitrov
2016-04-24 21:08 ` [RFC PATCH 24/24] ARM: dts: omap3-n900: enable cameras - remove invalid entry Ivaylo Dimitrov
2016-04-24 21:55 ` [RFC PATCH 00/24] Make Nokia N900 cameras working Pavel Machek
2016-04-25 6:33 ` Ivaylo Dimitrov
2016-04-25 17:09 ` Pavel Machek
2016-04-25 17:21 ` Ivaylo Dimitrov
2016-04-27 21:07 ` Pavel Machek
2016-04-25 10:40 ` Pali Rohár
2016-04-25 14:06 ` Pavel Machek
2016-04-25 14:09 ` Hans Verkuil
2016-04-27 21:09 ` Pavel Machek
2016-04-25 14:14 ` Pali Rohár
2016-04-25 17:14 ` Pali Rohár
2016-04-25 16:58 ` Pavel Machek
2016-04-25 17:17 ` Ivaylo Dimitrov
2016-04-25 18:40 ` Pavel Machek
2016-04-25 19:17 ` Ivaylo Dimitrov
2016-04-25 20:41 ` Pavel Machek
2016-04-25 20:53 ` Ivaylo Dimitrov
2016-04-25 22:07 ` Pavel Machek
2016-04-26 4:21 ` Ivaylo Dimitrov
2016-04-27 8:30 ` Pavel Machek
2016-04-27 3:08 ` Sebastian Reichel
2016-04-27 5:05 ` Ivaylo Dimitrov
2016-04-27 6:57 ` Ivaylo Dimitrov
2016-04-27 16:42 ` Sebastian Reichel
2016-04-27 16:45 ` Pavel Machek
2016-04-27 16:59 ` Sebastian Reichel
2016-05-02 7:06 ` Pavel Machek
2016-04-27 17:12 ` Ивайло Димитров
2016-04-27 19:05 ` Pavel Machek
2016-04-29 0:05 ` Sebastian Reichel
2016-04-29 17:45 ` Sebastian Reichel
2016-04-29 18:44 ` Ivaylo Dimitrov
2016-05-01 10:37 ` Sakari Ailus
2016-05-01 9:03 ` Pavel Machek
2016-04-27 20:30 ` Pavel Machek
2016-06-17 16:42 ` Nokia N900 cameras -- pipeline setup in python (was Re: [RFC PATCH 00/24] Make Nokia N900 cameras working) Pavel Machek
2016-06-17 17:12 ` Pavel Machek
2016-06-20 17:00 ` Pavel Machek
2016-06-20 20:59 ` Sakari Ailus
2016-06-21 18:05 ` Pavel Machek
2016-06-22 7:22 ` Sakari Ailus
2016-06-22 11:18 ` Pavel Machek
2016-07-01 7:31 ` square-only image on Nokia N900 camera " Pavel Machek
2016-07-01 8:50 ` Pavel Machek
2016-07-01 11:01 ` Pavel Machek
2016-07-01 19:40 ` Pavel Machek
2016-06-24 16:21 ` [RFC PATCH 00/24] Make Nokia N900 cameras working Pavel Machek
2016-08-27 13:48 ` fcam-dev support for new kernels -- " Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461532104-24032-23-git-send-email-ivo.g.dimitrov.75@gmail.com \
--to=ivo.g.dimitrov.75@gmail.com \
--cc=linux-media@vger.kernel.org \
--cc=pali.rohar@gmail.com \
--cc=pavel@ucw.cz \
--cc=sakari.ailus@iki.fi \
--cc=sre@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).