| Message ID | 20160602193027.GB7984@amd |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Thu, Jun 02, 2016 at 09:30:27PM +0200, Pavel Machek wrote: > > Add documentation for ad5820 device tree binding. > > Signed-off-by: Pavel Machek <pavel@denx.de> Thanks, Pavel!! Can I pick the two patches (this one + the driver) or would you like to send a pull request? In the latter case you can add: Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
On Fri 2016-06-03 00:27:46, Sakari Ailus wrote: > On Thu, Jun 02, 2016 at 09:30:27PM +0200, Pavel Machek wrote: > > > > Add documentation for ad5820 device tree binding. > > > > Signed-off-by: Pavel Machek <pavel@denx.de> > > Thanks, Pavel!! > > Can I pick the two patches (this one + the driver) or would you like to send > a pull request? In the latter case you can add: Yes please, pick up the two patches. Best regards, Pavel > Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> >
Hi, On 5.06.2016 22:07, Pavel Machek wrote: > Add userspace API definitions. > > Signed-off-by: Pavel Machek <pavel@ucw.cz> > > diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h > index b6a357a..23011cc 100644 > --- a/include/uapi/linux/v4l2-controls.h > +++ b/include/uapi/linux/v4l2-controls.h > @@ -974,4 +975,9 @@ enum v4l2_detect_md_mode { > #define V4L2_CID_DETECT_MD_THRESHOLD_GRID (V4L2_CID_DETECT_CLASS_BASE + 3) > #define V4L2_CID_DETECT_MD_REGION_GRID (V4L2_CID_DETECT_CLASS_BASE + 4) > > +/* Control IDs specific to the AD5820 driver as defined by V4L2 */ > +#define V4L2_CID_FOCUS_AD5820_BASE (V4L2_CTRL_CLASS_CAMERA | 0x10af) > +#define V4L2_CID_FOCUS_AD5820_RAMP_TIME (V4L2_CID_FOCUS_AD5820_BASE+0) > +#define V4L2_CID_FOCUS_AD5820_RAMP_MODE (V4L2_CID_FOCUS_AD5820_BASE+1) > + > #endif > Sakari, what about adding those as standard camera controls? It seems ad5820 is not the only VCM driver to implement "antiringing" controls, http://rohmfs.rohm.com/en/products/databook/datasheet/ic/motor/mobile_module/bu64241gwz-e.pdf is another example I found by quick search. What about: #define V4L2_CID_FOCUS_STEP_MODE xxx enum v4l2_cid_focus_step_mode { V4L2_CID_FOCUS_STEP_MODE_DIRECT, V4L2_CID_FOCUS_STEP_MODE_LINEAR, V4L2_CID_FOCUS_STEP_MODE_AUTO }; #define V4L2_CID_FOCUS_STEP_TIME xxx+1 Also, how the userspace(or the kernel) is notified by v4l that there is an event? The point is - I think it is a good idea to notify when VCM has completed its movement, we can start a timer based on the current position, mode, step time etc and notify after the pre-calculated movement time. Here ftp://ftp.analog.com/pub/evalcd/AD5820_v1_0/AD5820_Quickstart.pdf can be found the modes/timings description for ad5820 along with the equations needed to calculate timings etc. Ivo -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi! > On 5.06.2016 22:07, Pavel Machek wrote: > >Add userspace API definitions. > > > >Signed-off-by: Pavel Machek <pavel@ucw.cz> > > > >diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h > >index b6a357a..23011cc 100644 > >--- a/include/uapi/linux/v4l2-controls.h > >+++ b/include/uapi/linux/v4l2-controls.h > >@@ -974,4 +975,9 @@ enum v4l2_detect_md_mode { > > #define V4L2_CID_DETECT_MD_THRESHOLD_GRID (V4L2_CID_DETECT_CLASS_BASE + 3) > > #define V4L2_CID_DETECT_MD_REGION_GRID (V4L2_CID_DETECT_CLASS_BASE + 4) > > > >+/* Control IDs specific to the AD5820 driver as defined by V4L2 */ > >+#define V4L2_CID_FOCUS_AD5820_BASE (V4L2_CTRL_CLASS_CAMERA | 0x10af) > >+#define V4L2_CID_FOCUS_AD5820_RAMP_TIME (V4L2_CID_FOCUS_AD5820_BASE+0) > >+#define V4L2_CID_FOCUS_AD5820_RAMP_MODE (V4L2_CID_FOCUS_AD5820_BASE+1) > >+ > > #endif > > > > Sakari, what about adding those as standard camera controls? It seems ad5820 > is not the only VCM driver to implement "antiringing" controls, http://rohmfs.rohm.com/en/products/databook/datasheet/ic/motor/mobile_module/bu64241gwz-e.pdf > is another example I found by quick search. Well, standartized API may be good idea... but I'd really like the driver to go in, and it looks like camera application needs to know quite a lot of details about the autofocus subsystem. > > What about: > > #define V4L2_CID_FOCUS_STEP_MODE xxx > enum v4l2_cid_focus_step_mode { > V4L2_CID_FOCUS_STEP_MODE_DIRECT, > V4L2_CID_FOCUS_STEP_MODE_LINEAR, > V4L2_CID_FOCUS_STEP_MODE_AUTO > }; > #define V4L2_CID_FOCUS_STEP_TIME xxx+1 > > Also, how the userspace(or the kernel) is notified by v4l that there is an > event? The point is - I think it is a good idea to notify when VCM has > completed its movement, we can start a timer based on the current > position, Why? Look at how fcam-dev/ works. It is not interested when movement is "done". It sets the focus to one distance, then says it to slowly refocus to another distance, and watches the stream for sharpness. When it is sharp, it computes likely lens position at the time of sharpness, and asks hardware to go back there. Best regards, Pavel
On Thu, Jun 02, 2016 at 09:30:27PM +0200, Pavel Machek wrote: > > Add documentation for ad5820 device tree binding. > > Signed-off-by: Pavel Machek <pavel@denx.de> > > diff --git a/Documentation/devicetree/bindings/media/i2c/ad5820.txt b/Documentation/devicetree/bindings/media/i2c/ad5820.txt > new file mode 100644 > index 0000000..fb70ca5 > --- /dev/null > +++ b/Documentation/devicetree/bindings/media/i2c/ad5820.txt > @@ -0,0 +1,19 @@ > +* Analog Devices AD5820 autofocus coil > + > +Required Properties: > + > + - compatible: Must contain "adi,ad5820" > + > + - reg: I2C slave address > + > + - VANA-supply: supply of voltage for VANA pin > + > +Example: > + > + ad5820: coil@0c { Drop the leading 0. With that, Acked-by: Rob Herring <robh@kernel.org> -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Ivaylo, On Mon, Jun 06, 2016 at 09:06:29AM +0300, Ivaylo Dimitrov wrote: > Hi, > > On 5.06.2016 22:07, Pavel Machek wrote: > >Add userspace API definitions. > > > >Signed-off-by: Pavel Machek <pavel@ucw.cz> > > > >diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h > >index b6a357a..23011cc 100644 > >--- a/include/uapi/linux/v4l2-controls.h > >+++ b/include/uapi/linux/v4l2-controls.h > >@@ -974,4 +975,9 @@ enum v4l2_detect_md_mode { > > #define V4L2_CID_DETECT_MD_THRESHOLD_GRID (V4L2_CID_DETECT_CLASS_BASE + 3) > > #define V4L2_CID_DETECT_MD_REGION_GRID (V4L2_CID_DETECT_CLASS_BASE + 4) > > > >+/* Control IDs specific to the AD5820 driver as defined by V4L2 */ > >+#define V4L2_CID_FOCUS_AD5820_BASE (V4L2_CTRL_CLASS_CAMERA | 0x10af) Please check V4L2_CID_USER_*_BASE. That's how custom controls are handled nowadays. > >+#define V4L2_CID_FOCUS_AD5820_RAMP_TIME (V4L2_CID_FOCUS_AD5820_BASE+0) > >+#define V4L2_CID_FOCUS_AD5820_RAMP_MODE (V4L2_CID_FOCUS_AD5820_BASE+1) > >+ > > #endif > > > > Sakari, what about adding those as standard camera controls? It seems ad5820 > is not the only VCM driver to implement "antiringing" controls, http://rohmfs.rohm.com/en/products/databook/datasheet/ic/motor/mobile_module/bu64241gwz-e.pdf > is another example I found by quick search. These controls however seem to be related to some thing else --- configuring the driver to drive the lens little by little to the target using a pre-defined step time and size. I presume it is intended for something else, most likely for performing a full search for a regular AF algorithm. I also wonder how much this functionality is used nowadays, most devices use continuous AF algorithm that has little or no use for such. It also provides no help in synchronising lens movement to exposure of the AF window. Now that I think about this, the original implementation in N900 very likely did not use either of the two controls; the device driver was still written to provide access to full capabilities of the chip. And that one had no continuous AF. > What about: > > #define V4L2_CID_FOCUS_STEP_MODE xxx > enum v4l2_cid_focus_step_mode { > V4L2_CID_FOCUS_STEP_MODE_DIRECT, > V4L2_CID_FOCUS_STEP_MODE_LINEAR, > V4L2_CID_FOCUS_STEP_MODE_AUTO > }; > #define V4L2_CID_FOCUS_STEP_TIME xxx+1 > > Also, how the userspace(or the kernel) is notified by v4l that there is an > event? The point is - I think it is a good idea to notify when VCM has > completed its movement, we can start a timer based on the current position, > mode, step time etc and notify after the pre-calculated movement time. You'd have to start modelling the movement of the lens somehow. And for that, we'd need to know about the lens and the spring in the kernel, too. I presume that's already a lot of the algorithm to get the lens moving, and supposing this is in the kernel, what else would go to the kernel? These device provide very basic functionality for moving the lens; current is applied on a coil and that has the effect of moving the lens, bringing the focus distance closer as more current is applied but that's pretty much it: there's no reliable way to focus at a particular distance for example. I might as well drop the two controls, up to you. If someone ever needs them they can always be reintroduced. I'd be happy to get a new patch, the current driver patch does not compile (just tried) as the definitions of these controls are missing. Ringing compensation functionality present in the other chip should be far more useful. If there are AF experts reading this, feel free to challenge me. :-) I can't claim to be one.
Hi! > > >@@ -974,4 +975,9 @@ enum v4l2_detect_md_mode { > > > #define V4L2_CID_DETECT_MD_THRESHOLD_GRID (V4L2_CID_DETECT_CLASS_BASE + 3) > > > #define V4L2_CID_DETECT_MD_REGION_GRID (V4L2_CID_DETECT_CLASS_BASE + 4) > > > > > >+/* Control IDs specific to the AD5820 driver as defined by V4L2 */ > > >+#define V4L2_CID_FOCUS_AD5820_BASE (V4L2_CTRL_CLASS_CAMERA | 0x10af) > > Please check V4L2_CID_USER_*_BASE. That's how custom controls are handled > nowadays. Let me see... > Now that I think about this, the original implementation in N900 very likely > did not use either of the two controls; the device driver was still written > to provide access to full capabilities of the chip. And that one had no > continuous AF. I'm not sure about the original implementation, but fcam-dev library (which is our best chance for usable camera) does use both: pavel@duo:~/g/fcam-dev$ grep -ri RAMP_TIME . ./.svn/pristine/05/0574680922f59e07bd49e16a951d69421690a323.svn-base: int val = ioctlSet(V4L2_CID_FOCUS_AD5820_RAMP_TIME, 1000000.0f/diopterRateToTickRate(speed)); ./src/N900/Lens.cpp: int val = ioctlSet(V4L2_CID_FOCUS_AD5820_RAMP_TIME, 1000000.0f/diopterRateToTickRate(speed)); pavel@duo:~/g/fcam-dev$ grep -ri RAMP_MODE . ./.svn/pristine/05/0574680922f59e07bd49e16a951d69421690a323.svn-base: ioctlSet(V4L2_CID_FOCUS_AD5820_RAMP_MODE, 0); ./src/N900/Lens.cpp: ioctlSet(V4L2_CID_FOCUS_AD5820_RAMP_MODE, 0); pavel@duo:~/g/fcam-dev$ > I might as well drop the two controls, up to you. If someone ever needs them > they can always be reintroduced. I'd be happy to get a new patch, the > current driver patch does not compile (just tried) as the definitions of > these controls are missing. I'd prefer to keep the controls, as we have userspace using them. I got it to compile but have yet to get it to work (subdevs split, so it needs some modifications). Best regards, Pavel
Hi Pavel, On Sun, Jun 12, 2016 at 10:48:11AM +0200, Pavel Machek wrote: > Hi! > > > > >Add userspace API definitions. > > > > > > > >Signed-off-by: Pavel Machek <pavel@ucw.cz> > > > > > > > >diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h > > > >index b6a357a..23011cc 100644 > > > >--- a/include/uapi/linux/v4l2-controls.h > > > >+++ b/include/uapi/linux/v4l2-controls.h > > > >@@ -974,4 +975,9 @@ enum v4l2_detect_md_mode { > > > > #define V4L2_CID_DETECT_MD_THRESHOLD_GRID (V4L2_CID_DETECT_CLASS_BASE + 3) > > > > #define V4L2_CID_DETECT_MD_REGION_GRID (V4L2_CID_DETECT_CLASS_BASE + 4) > > > > > > > >+/* Control IDs specific to the AD5820 driver as defined by V4L2 */ > > > >+#define V4L2_CID_FOCUS_AD5820_BASE (V4L2_CTRL_CLASS_CAMERA | 0x10af) > > > > Please check V4L2_CID_USER_*_BASE. That's how custom controls are handled > > nowadays. > > So something like this? > > Thanks, > Pavel > > diff --git a/drivers/media/i2c/ad5820.c b/drivers/media/i2c/ad5820.c > index 2efa5dc1..b04b471 100644 > --- a/drivers/media/i2c/ad5820.c > +++ b/drivers/media/i2c/ad5820.c > @@ -40,6 +40,11 @@ > #define AD5820_RAMP_MODE_LINEAR (0 << 3) > #define AD5820_RAMP_MODE_64_16 (1 << 3) > > +/* Control IDs specific to the AD5820 driver as defined by V4L2 */ > +#define V4L2_CID_FOCUS_AD5820_RAMP_TIME (V4L2_CID_USER_AD5820_BASE+0) > +#define V4L2_CID_FOCUS_AD5820_RAMP_MODE (V4L2_CID_FOCUS_AD5820_BASE+1) > + > + We could still define these in a header file that can be included by the user space. Please use V4L2_CID_AD5820 prefix. A separate header file should be used, e.g. include/uapi/linux/ad5820.h. > #define CODE_TO_RAMP_US(s) ((s) == 0 ? 0 : (1 << ((s) - 1)) * 50) > #define RAMP_US_TO_CODE(c) fls(((c) + ((c)>>1)) / 50) > > diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h > index 23011cc..4b24546 100644 > --- a/include/uapi/linux/v4l2-controls.h > +++ b/include/uapi/linux/v4l2-controls.h > @@ -181,6 +181,10 @@ enum v4l2_colorfx { > * We reserve 16 controls for this driver. */ > #define V4L2_CID_USER_TC358743_BASE (V4L2_CID_USER_BASE + 0x1080) > > +/* The base for the ad5820 driver controls. > + * We reserve 16 controls for this driver. */ > +#define V4L2_CID_USER_AD5820_BASE (V4L2_CID_USER_BASE + 0x1090) > + > /* MPEG-class control IDs */ > /* The MPEG controls are applicable to all codec controls > * and the 'MPEG' part of the define is historical */ > @@ -986,9 +990,4 @@ enum v4l2_detect_md_mode { > #define V4L2_CID_MODE_SENSITIVITY (V4L2_CID_MODE_CLASS_BASE+6) > #define V4L2_CID_MODE_OPSYSCLOCK (V4L2_CID_MODE_CLASS_BASE+7) > > -/* Control IDs specific to the AD5820 driver as defined by V4L2 */ > -#define V4L2_CID_FOCUS_AD5820_BASE (V4L2_CTRL_CLASS_CAMERA | 0x10af) > -#define V4L2_CID_FOCUS_AD5820_RAMP_TIME (V4L2_CID_FOCUS_AD5820_BASE+0) > -#define V4L2_CID_FOCUS_AD5820_RAMP_MODE (V4L2_CID_FOCUS_AD5820_BASE+1) > - > #endif > >
Hi Pavel, On Sun, Jun 12, 2016 at 09:54:17AM +0200, Pavel Machek wrote: > Hi! > > > > >@@ -974,4 +975,9 @@ enum v4l2_detect_md_mode { > > > > #define V4L2_CID_DETECT_MD_THRESHOLD_GRID (V4L2_CID_DETECT_CLASS_BASE + 3) > > > > #define V4L2_CID_DETECT_MD_REGION_GRID (V4L2_CID_DETECT_CLASS_BASE + 4) > > > > > > > >+/* Control IDs specific to the AD5820 driver as defined by V4L2 */ > > > >+#define V4L2_CID_FOCUS_AD5820_BASE (V4L2_CTRL_CLASS_CAMERA | 0x10af) > > > > Please check V4L2_CID_USER_*_BASE. That's how custom controls are handled > > nowadays. > > Let me see... > > > Now that I think about this, the original implementation in N900 very likely > > did not use either of the two controls; the device driver was still written > > to provide access to full capabilities of the chip. And that one had no > > continuous AF. > > I'm not sure about the original implementation, but fcam-dev library > (which is our best chance for usable camera) does use both: > > pavel@duo:~/g/fcam-dev$ grep -ri RAMP_TIME . > ./.svn/pristine/05/0574680922f59e07bd49e16a951d69421690a323.svn-base: > int val = ioctlSet(V4L2_CID_FOCUS_AD5820_RAMP_TIME, > 1000000.0f/diopterRateToTickRate(speed)); > ./src/N900/Lens.cpp: int val = > ioctlSet(V4L2_CID_FOCUS_AD5820_RAMP_TIME, > 1000000.0f/diopterRateToTickRate(speed)); > pavel@duo:~/g/fcam-dev$ grep -ri RAMP_MODE . > ./.svn/pristine/05/0574680922f59e07bd49e16a951d69421690a323.svn-base: > ioctlSet(V4L2_CID_FOCUS_AD5820_RAMP_MODE, 0); > ./src/N900/Lens.cpp: ioctlSet(V4L2_CID_FOCUS_AD5820_RAMP_MODE, 0); > pavel@duo:~/g/fcam-dev$ > > > I might as well drop the two controls, up to you. If someone ever needs them > > they can always be reintroduced. I'd be happy to get a new patch, the > > current driver patch does not compile (just tried) as the definitions of > > these controls are missing. > > I'd prefer to keep the controls, as we have userspace using them. I > got it to compile but have yet to get it to work (subdevs split, so it > needs some modifications). Right. I didn't know Fcam used them. Still, using them is hardly an optimal way to control the lens (as far as camera functionality goes, using them requires less CPU time consumption though). The flash control patches should receive a proper RFC that discusses the problem area and proposes a solution. I'll write one in the near future. I think that for this particular controller it's relatively clear though: it provides very basic functionality that maps well to controls that I don't really see alternative options for that. I don't object defining standard controls for ramp mode nor time either. But I expect you to write a patch in that case. :-)
Hi Pavel, On Mon, Jun 13, 2016 at 09:17:53PM +0200, Pavel Machek wrote: > On Sun 2016-06-12 14:22:53, Sakari Ailus wrote: > > Hi Pavel, > > > > On Sun, Jun 12, 2016 at 10:48:11AM +0200, Pavel Machek wrote: > > > Hi! > > > > > > > > >Add userspace API definitions. > > > > > > > > > > > >Signed-off-by: Pavel Machek <pavel@ucw.cz> > > > > > > > > > > > >diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h > > > > > >index b6a357a..23011cc 100644 > > > > > >--- a/include/uapi/linux/v4l2-controls.h > > > > > >+++ b/include/uapi/linux/v4l2-controls.h > > > > > >@@ -974,4 +975,9 @@ enum v4l2_detect_md_mode { > > > > > > #define V4L2_CID_DETECT_MD_THRESHOLD_GRID (V4L2_CID_DETECT_CLASS_BASE + 3) > > > > > > #define V4L2_CID_DETECT_MD_REGION_GRID (V4L2_CID_DETECT_CLASS_BASE + 4) > > > > > > > > > > > >+/* Control IDs specific to the AD5820 driver as defined by V4L2 */ > > > > > >+#define V4L2_CID_FOCUS_AD5820_BASE (V4L2_CTRL_CLASS_CAMERA | 0x10af) > > > > > > > > Please check V4L2_CID_USER_*_BASE. That's how custom controls are handled > > > > nowadays. > > > > > > So something like this? > > > > > > Thanks, > > > Pavel > > > > > > diff --git a/drivers/media/i2c/ad5820.c b/drivers/media/i2c/ad5820.c > > > index 2efa5dc1..b04b471 100644 > > > --- a/drivers/media/i2c/ad5820.c > > > +++ b/drivers/media/i2c/ad5820.c > > > @@ -40,6 +40,11 @@ > > > #define AD5820_RAMP_MODE_LINEAR (0 << 3) > > > #define AD5820_RAMP_MODE_64_16 (1 << 3) > > > > > > +/* Control IDs specific to the AD5820 driver as defined by V4L2 */ > > > +#define V4L2_CID_FOCUS_AD5820_RAMP_TIME (V4L2_CID_USER_AD5820_BASE+0) > > > +#define V4L2_CID_FOCUS_AD5820_RAMP_MODE (V4L2_CID_FOCUS_AD5820_BASE+1) > > > + > > > + > > > > We could still define these in a header file that can be included by the > > user space. Please use V4L2_CID_AD5820 prefix. > > Not V4L2_CID_USER_AD5820...? The rest of the controls have no USER as part of the macro name, so I wouldn't use it here either. > > > A separate header file should be used, > > e.g. include/uapi/linux/ad5820.h. > > Ok, separate header file for 2 lines seemed like a bit of overkill, > but why not. That follows an existing pattern of how controls have been implemented in other drivers. > > Something like this? Yes. A few minor comments below. Could you merge this with the driver patch? I've dropped that from my ad5820 branch as it does not compile. > > commit 8dd701d2580e41b06bb2285e6bd59a4f1702b4d8 > Author: Pavel <pavel@ucw.cz> > Date: Mon Jun 13 21:17:15 2016 +0200 > > Userspace api, as Sakari asked. > > diff --git a/drivers/media/i2c/ad5820.c b/drivers/media/i2c/ad5820.c > index 2efa5dc1..ed3facc 100644 > --- a/drivers/media/i2c/ad5820.c > +++ b/drivers/media/i2c/ad5820.c > @@ -32,6 +32,8 @@ > #include <media/v4l2-device.h> > #include <media/v4l2-subdev.h> > > +#include <uapi/linux/ad5820.h> > + > #define AD5820_NAME "ad5820" > > /* Register definitions */ > @@ -40,6 +42,8 @@ > #define AD5820_RAMP_MODE_LINEAR (0 << 3) > #define AD5820_RAMP_MODE_64_16 (1 << 3) > > + > + Extra newlines. > #define CODE_TO_RAMP_US(s) ((s) == 0 ? 0 : (1 << ((s) - 1)) * 50) > #define RAMP_US_TO_CODE(c) fls(((c) + ((c)>>1)) / 50) > > @@ -165,13 +169,13 @@ static int ad5820_set_ctrl(struct v4l2_ctrl *ctrl) > coil->focus_absolute = ctrl->val; > return ad5820_update_hw(coil); > > - case V4L2_CID_FOCUS_AD5820_RAMP_TIME: > + case V4L2_CID_AD5820_RAMP_TIME: > code = RAMP_US_TO_CODE(ctrl->val); > ctrl->val = CODE_TO_RAMP_US(code); > coil->focus_ramp_time = ctrl->val; > break; > > - case V4L2_CID_FOCUS_AD5820_RAMP_MODE: > + case V4L2_CID_AD5820_RAMP_MODE: > coil->focus_ramp_mode = ctrl->val; > break; > } > @@ -191,7 +195,7 @@ static const char * const ad5820_focus_menu[] = { > static const struct v4l2_ctrl_config ad5820_ctrls[] = { > { > .ops = &ad5820_ctrl_ops, > - .id = V4L2_CID_FOCUS_AD5820_RAMP_TIME, > + .id = V4L2_CID_AD5820_RAMP_TIME, > .type = V4L2_CTRL_TYPE_INTEGER, > .name = "Focus ramping time [us]", > .min = 0, > @@ -202,7 +206,7 @@ static const struct v4l2_ctrl_config ad5820_ctrls[] = { > }, > { > .ops = &ad5820_ctrl_ops, > - .id = V4L2_CID_FOCUS_AD5820_RAMP_MODE, > + .id = V4L2_CID_AD5820_RAMP_MODE, > .type = V4L2_CTRL_TYPE_MENU, > .name = "Focus ramping mode", > .min = 0, > diff --git a/include/uapi/linux/ad5820.h b/include/uapi/linux/ad5820.h > new file mode 100644 > index 0000000..d44ba9c > --- /dev/null > +++ b/include/uapi/linux/ad5820.h > @@ -0,0 +1,18 @@ > +/* > + * AD5820 DAC driver for camera voice coil focus. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * version 2 as published by the Free Software Foundation. > + */ > + > +#ifndef __LINUX_AD5820_H > +#define __LINUX_AD5820_H > + > +#include <linux/v4l2-controls.h> > + > +/* Control IDs specific to the AD5820 driver as defined by V4L2 */ > +#define V4L2_CID_AD5820_RAMP_TIME (V4L2_CID_AD5820_BASE+0) (V4L2_CID_AD5820_BASE + 0) Same below. > +#define V4L2_CID_AD5820_RAMP_MODE (V4L2_CID_AD5820_BASE+1) > + > +#endif > diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h > index 23011cc..015e90b 100644 > --- a/include/uapi/linux/v4l2-controls.h > +++ b/include/uapi/linux/v4l2-controls.h > @@ -181,6 +181,10 @@ enum v4l2_colorfx { > * We reserve 16 controls for this driver. */ > #define V4L2_CID_USER_TC358743_BASE (V4L2_CID_USER_BASE + 0x1080) > > +/* The base for the ad5820 driver controls. > + * We reserve 16 controls for this driver. */ > +#define V4L2_CID_AD5820_BASE (V4L2_CID_USER_BASE + 0x1090) > + > /* MPEG-class control IDs */ > /* The MPEG controls are applicable to all codec controls > * and the 'MPEG' part of the define is historical */ > @@ -986,9 +990,4 @@ enum v4l2_detect_md_mode { > #define V4L2_CID_MODE_SENSITIVITY (V4L2_CID_MODE_CLASS_BASE+6) > #define V4L2_CID_MODE_OPSYSCLOCK (V4L2_CID_MODE_CLASS_BASE+7) > > -/* Control IDs specific to the AD5820 driver as defined by V4L2 */ > -#define V4L2_CID_FOCUS_AD5820_BASE (V4L2_CTRL_CLASS_CAMERA | 0x10af) > -#define V4L2_CID_FOCUS_AD5820_RAMP_TIME (V4L2_CID_FOCUS_AD5820_BASE+0) > -#define V4L2_CID_FOCUS_AD5820_RAMP_MODE (V4L2_CID_FOCUS_AD5820_BASE+1) > - > #endif > >
Hi! > > Not V4L2_CID_USER_AD5820...? > > The rest of the controls have no USER as part of the macro name, so I > wouldn't use it here either. Ok. > > Ok, separate header file for 2 lines seemed like a bit of overkill, > > but why not. > > That follows an existing pattern of how controls have been implemented in > other drivers. Ok. > Could you merge this with the driver patch? I've dropped that from my ad5820 > branch as it does not compile. Yes, merged patch should be in your inbox now. Thanks, Pavel
Em Sat, 18 Jun 2016 17:38:46 +0200 Pavel Machek <pavel@ucw.cz> escreveu: > Hi! > > > > Not V4L2_CID_USER_AD5820...? > > > > The rest of the controls have no USER as part of the macro name, so I > > wouldn't use it here either. > > Ok. > > > > Ok, separate header file for 2 lines seemed like a bit of overkill, > > > but why not. > > > > That follows an existing pattern of how controls have been implemented in > > other drivers. > > Ok. > > > Could you merge this with the driver patch? I've dropped that from my ad5820 > > branch as it does not compile. > > Yes, merged patch should be in your inbox now. The V4L2 core changes should be on a separate patch. Btw, you'll also need to patch documentation to reflect such changes. We're right now moving from DocBook to ReST markup language. The patches for it are right now on a separate topic branch (docs-next), to be merged for Kernel 4.8 on the next merge window. You should either base the patch on such branch or wait for it to be merged back mainstream to write such documentation additions. > > Thanks, > Pavel >
On Tue 2016-07-12 20:32:01, Mauro Carvalho Chehab wrote: 1;2802;0c> Em Sat, 18 Jun 2016 17:38:46 +0200 > Pavel Machek <pavel@ucw.cz> escreveu: > > > Hi! > > > > > > Not V4L2_CID_USER_AD5820...? > > > > > > The rest of the controls have no USER as part of the macro name, so I > > > wouldn't use it here either. > > > > Ok. > > > > > > Ok, separate header file for 2 lines seemed like a bit of overkill, > > > > but why not. > > > > > > That follows an existing pattern of how controls have been implemented in > > > other drivers. > > > > Ok. > > > > > Could you merge this with the driver patch? I've dropped that from my ad5820 > > > branch as it does not compile. > > > > Yes, merged patch should be in your inbox now. > > The V4L2 core changes should be on a separate patch. Btw, you'll also > need to patch documentation to reflect such changes. We're right now > moving from DocBook to ReST markup language. The patches for it are > right now on a separate topic branch (docs-next), to be merged for > Kernel 4.8 on the next merge window. > > You should either base the patch on such branch or wait for it to be > merged back mainstream to write such documentation additions. So how many iterations and how many releases does it take to get trivial driver into the tree? I did what Sakari asked me to do. The driver is trivial. You can see pretty easily what I'm changing in the core... and it is not much. Can you just add your acked-by to it, merge it and me done with it? If some more docs is required, I can do the docs, but stalling patch for months and then claiming "hey, we have these new rules you have to follow" is not a nice thing. Thanks, Pavel
On Tue 2016-07-12 20:32:01, Mauro Carvalho Chehab wrote: > Em Sat, 18 Jun 2016 17:38:46 +0200 > Pavel Machek <pavel@ucw.cz> escreveu: > > > Hi! > > > > > > Not V4L2_CID_USER_AD5820...? > > > > > > The rest of the controls have no USER as part of the macro name, so I > > > wouldn't use it here either. > > > > Ok. > > > > > > Ok, separate header file for 2 lines seemed like a bit of overkill, > > > > but why not. > > > > > > That follows an existing pattern of how controls have been implemented in > > > other drivers. > > > > Ok. > > > > > Could you merge this with the driver patch? I've dropped that from my ad5820 > > > branch as it does not compile. > > > > Yes, merged patch should be in your inbox now. > > The V4L2 core changes should be on a separate patch. Btw, you'll also > need to patch documentation to reflect such changes. We're right now > moving from DocBook to ReST markup language. The patches for it are > right now on a separate topic branch (docs-next), to be merged for > Kernel 4.8 on the next merge window. What about: I drop all the functionality but FOCUS_ABSOLUTE, which is core functionality, anyway, and does not need core changes. When V4L2 core stabilizes, it can be reintroduced. Best regards, Pavel
diff --git a/Documentation/devicetree/bindings/media/i2c/ad5820.txt b/Documentation/devicetree/bindings/media/i2c/ad5820.txt new file mode 100644 index 0000000..fb70ca5 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/ad5820.txt @@ -0,0 +1,19 @@ +* Analog Devices AD5820 autofocus coil + +Required Properties: + + - compatible: Must contain "adi,ad5820" + + - reg: I2C slave address + + - VANA-supply: supply of voltage for VANA pin + +Example: + + ad5820: coil@0c { + compatible = "adi,ad5820"; + reg = <0x0c>; + + VANA-supply = <&vaux4>; + }; +
Add documentation for ad5820 device tree binding. Signed-off-by: Pavel Machek <pavel@denx.de>