| Message ID | 1469293249-6774-4-git-send-email-steve_longerbeam@mentor.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Resend due to HTML email bounce. On 23/07/16 18:00, Steve Longerbeam wrote: > Parse the optional v4l2 endpoint DT node. If the bus type is > V4L2_MBUS_BT656 and the endpoint node specifies "newavmode", > configure the BT.656 bus in NEWAVMODE. > > Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com> > > --- > > v3: > - the newavmode endpoint property is now private to adv7180. > --- > .../devicetree/bindings/media/i2c/adv7180.txt | 4 ++ > drivers/media/i2c/adv7180.c | 46 ++++++++++++++++++++-- > 2 files changed, 47 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/media/i2c/adv7180.txt b/Documentation/devicetree/bindings/media/i2c/adv7180.txt > index 0d50115..6c175d2 100644 > --- a/Documentation/devicetree/bindings/media/i2c/adv7180.txt > +++ b/Documentation/devicetree/bindings/media/i2c/adv7180.txt > @@ -15,6 +15,10 @@ Required Properties : > "adi,adv7282" > "adi,adv7282-m" > > +Optional Endpoint Properties : > +- newavmode: a boolean property to indicate the BT.656 bus is operating > + in Analog Device's NEWAVMODE. Valid for BT.656 busses only. > + > Example: > > i2c0@1c22000 { > diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c > index cb83ebb..3067d5f 100644 > --- a/drivers/media/i2c/adv7180.c > +++ b/drivers/media/i2c/adv7180.c > @@ -31,6 +31,7 @@ > #include <media/v4l2-event.h> > #include <media/v4l2-device.h> > #include <media/v4l2-ctrls.h> > +#include <media/v4l2-of.h> > #include <linux/mutex.h> > #include <linux/delay.h> > > @@ -106,6 +107,7 @@ > #define ADV7180_REG_SHAP_FILTER_CTL_1 0x0017 > #define ADV7180_REG_CTRL_2 0x001d > #define ADV7180_REG_VSYNC_FIELD_CTL_1 0x0031 > +#define ADV7180_VSYNC_FIELD_CTL_1_NEWAVMODE 0x02 See below re this value. > #define ADV7180_REG_MANUAL_WIN_CTL_1 0x003d > #define ADV7180_REG_MANUAL_WIN_CTL_2 0x003e > #define ADV7180_REG_MANUAL_WIN_CTL_3 0x003f > @@ -214,6 +216,7 @@ struct adv7180_state { > struct mutex mutex; /* mutual excl. when accessing chip */ > int irq; > v4l2_std_id curr_norm; > + bool newavmode; > bool powered; > bool streaming; > u8 input; > @@ -864,9 +867,15 @@ static int adv7180_init(struct adv7180_state *state) > if (ret < 0) > return ret; > > - /* Manually set V bit end position in NTSC mode */ > - return adv7180_write(state, ADV7180_REG_NTSC_V_BIT_END, > - ADV7180_NTSC_V_BIT_END_MANUAL_NVEND); > + if (!state->newavmode) { > + /* Manually set V bit end position in NTSC mode */ > + ret = adv7180_write(state, ADV7180_REG_NTSC_V_BIT_END, > + ADV7180_NTSC_V_BIT_END_MANUAL_NVEND); > + if (ret < 0) > + return ret; > + } > + > + return 0; According to the ADV7180 datasheet, rev. J, page 48 [1], when NEWAVMODE is 0, no adjustments are possible to the output timings, which would imply this write is ignored after your edit. 1: www.analog.com/media/en/technical-documentation/data-sheets/ADV7180.pdf > } > > static int adv7180_set_std(struct adv7180_state *state, unsigned int std) > @@ -1217,6 +1226,13 @@ static int init_device(struct adv7180_state *state) > if (ret) > goto out_unlock; > > + if (state->newavmode) { > + ret = adv7180_write(state, ADV7180_REG_VSYNC_FIELD_CTL_1, > + ADV7180_VSYNC_FIELD_CTL_1_NEWAVMODE); > + if (ret < 0) > + goto out_unlock; > + } > + Again according to the DS, NEWAVMODE is set by default and enables a stream which is by default CCIR656 compliant. Your edit writes 0x02 to this register which actually clears NEWAVMODE (bit 4). > ret = adv7180_program_std(state); > if (ret) > goto out_unlock; > @@ -1257,6 +1273,28 @@ out_unlock: > return ret; > } > > +static void adv7180_of_parse(struct adv7180_state *state) > +{ > + struct i2c_client *client = state->client; > + struct device_node *np = client->dev.of_node; > + struct device_node *endpoint; > + struct v4l2_of_endpoint ep; > + > + endpoint = of_graph_get_next_endpoint(np, NULL); > + if (!endpoint) { > + v4l_warn(client, "endpoint node not found\n"); > + return; > + } > + > + v4l2_of_parse_endpoint(endpoint, &ep); > + if (ep.bus_type == V4L2_MBUS_BT656) { > + if (of_property_read_bool(endpoint, "newavmode")) > + state->newavmode = true; > + } > + > + of_node_put(endpoint); > +} > + I'm not sure what the use case is for clearing NEWAVMODE, in which case this code and the call below are not needed. Maybe this particular patch should be dropped? > static int adv7180_probe(struct i2c_client *client, > const struct i2c_device_id *id) > { > @@ -1279,6 +1317,8 @@ static int adv7180_probe(struct i2c_client *client, > state->field = V4L2_FIELD_INTERLACED; > state->chip_info = (struct adv7180_chip_info *)id->driver_data; > > + adv7180_of_parse(state); > + > if (state->chip_info->flags & ADV7180_FLAG_MIPI_CSI2) { > state->csi_client = i2c_new_dummy(client->adapter, > ADV7180_DEFAULT_CSI_I2C_ADDR); Regards, IanJ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 07/25/2016 05:04 AM, Ian Arkver wrote: > On 23/07/16 18:00, Steve Longerbeam wrote: >> Parse the optional v4l2 endpoint DT node. If the bus type is >> V4L2_MBUS_BT656 and the endpoint node specifies "newavmode", >> configure the BT.656 bus in NEWAVMODE. >> >> Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com> >> >> --- >> >> v3: >> - the newavmode endpoint property is now private to adv7180. >> --- >> .../devicetree/bindings/media/i2c/adv7180.txt | 4 ++ >> drivers/media/i2c/adv7180.c | 46 ++++++++++++++++++++-- >> 2 files changed, 47 insertions(+), 3 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/media/i2c/adv7180.txt b/Documentation/devicetree/bindings/media/i2c/adv7180.txt >> index 0d50115..6c175d2 100644 >> --- a/Documentation/devicetree/bindings/media/i2c/adv7180.txt >> +++ b/Documentation/devicetree/bindings/media/i2c/adv7180.txt >> @@ -15,6 +15,10 @@ Required Properties : >> "adi,adv7282" >> "adi,adv7282-m" >> >> +Optional Endpoint Properties : >> +- newavmode: a boolean property to indicate the BT.656 bus is operating >> + in Analog Device's NEWAVMODE. Valid for BT.656 busses only. >> + >> Example: >> >> i2c0@1c22000 { >> diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c >> index cb83ebb..3067d5f 100644 >> --- a/drivers/media/i2c/adv7180.c >> +++ b/drivers/media/i2c/adv7180.c >> @@ -31,6 +31,7 @@ >> #include <media/v4l2-event.h> >> #include <media/v4l2-device.h> >> #include <media/v4l2-ctrls.h> >> +#include <media/v4l2-of.h> >> #include <linux/mutex.h> >> #include <linux/delay.h> >> >> @@ -106,6 +107,7 @@ >> #define ADV7180_REG_SHAP_FILTER_CTL_1 0x0017 >> #define ADV7180_REG_CTRL_2 0x001d >> #define ADV7180_REG_VSYNC_FIELD_CTL_1 0x0031 >> +#define ADV7180_VSYNC_FIELD_CTL_1_NEWAVMODE 0x02 > > See below re this value. > Hi Ian, I double-checked the ADV7180 datasheet, this value is correct. Bit 4, when cleared, _enables_ NEWAVMODE. >> #define ADV7180_REG_MANUAL_WIN_CTL_1 0x003d >> #define ADV7180_REG_MANUAL_WIN_CTL_2 0x003e >> #define ADV7180_REG_MANUAL_WIN_CTL_3 0x003f >> @@ -214,6 +216,7 @@ struct adv7180_state { >> struct mutex mutex; /* mutual excl. when accessing chip */ >> int irq; >> v4l2_std_id curr_norm; >> + bool newavmode; >> bool powered; >> bool streaming; >> u8 input; >> @@ -864,9 +867,15 @@ static int adv7180_init(struct adv7180_state *state) >> if (ret < 0) >> return ret; >> >> - /* Manually set V bit end position in NTSC mode */ >> - return adv7180_write(state, ADV7180_REG_NTSC_V_BIT_END, >> - ADV7180_NTSC_V_BIT_END_MANUAL_NVEND); >> + if (!state->newavmode) { >> + /* Manually set V bit end position in NTSC mode */ >> + ret = adv7180_write(state, ADV7180_REG_NTSC_V_BIT_END, >> + ADV7180_NTSC_V_BIT_END_MANUAL_NVEND); >> + if (ret < 0) >> + return ret; >> + } >> + >> + return 0; > > According to the ADV7180 datasheet, rev. J, page 48 [1], when NEWAVMODE is 0, > no adjustments are possible to the output timings, which would imply this write > is ignored after your edit. That's correct, when NEWAVMODE is enabled (by clearing reg 0x31 bit 4), no adjustments are possible to the output timings: From the rev J datasheet, page 91, when reg 0x31 bit 4 is set (NEAVMODE disabled): "Manual VS/FIELD position controlled by Register 0x32, Register 0x33, and Register 0xE5 to Register 0xEA" > > 1: www.analog.com/media/en/technical-documentation/data-sheets/*ADV7180*.pdf > >> } >> >> static int adv7180_set_std(struct adv7180_state *state, unsigned int std) >> @@ -1217,6 +1226,13 @@ static int init_device(struct adv7180_state *state) >> if (ret) >> goto out_unlock; >> >> + if (state->newavmode) { >> + ret = adv7180_write(state, ADV7180_REG_VSYNC_FIELD_CTL_1, >> + ADV7180_VSYNC_FIELD_CTL_1_NEWAVMODE); >> + if (ret < 0) >> + goto out_unlock; >> + } >> + > > Again according to the DS, NEWAVMODE is set by default and enables a > stream which is by default CCIR656 compliant. Your edit writes 0x02 to > this register which actually clears NEWAVMODE (bit 4). correct, it clears bit 4 which _enables_ NEWAVMODE. NEWAVMODE by default is _disabled_ (bit 4 is set). Steve -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 25/07/16 18:55, Steve Longerbeam wrote: > On 07/25/2016 05:04 AM, Ian Arkver wrote: >> On 23/07/16 18:00, Steve Longerbeam wrote: >>> Parse the optional v4l2 endpoint DT node. If the bus type is >>> V4L2_MBUS_BT656 and the endpoint node specifies "newavmode", >>> configure the BT.656 bus in NEWAVMODE. >>> >>> Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com> >>> >>> --- >>> >>> v3: >>> - the newavmode endpoint property is now private to adv7180. >>> --- >>> .../devicetree/bindings/media/i2c/adv7180.txt | 4 ++ >>> drivers/media/i2c/adv7180.c | 46 ++++++++++++++++++++-- >>> 2 files changed, 47 insertions(+), 3 deletions(-) >>> >>> diff --git a/Documentation/devicetree/bindings/media/i2c/adv7180.txt b/Documentation/devicetree/bindings/media/i2c/adv7180.txt >>> index 0d50115..6c175d2 100644 >>> --- a/Documentation/devicetree/bindings/media/i2c/adv7180.txt >>> +++ b/Documentation/devicetree/bindings/media/i2c/adv7180.txt >>> @@ -15,6 +15,10 @@ Required Properties : >>> "adi,adv7282" >>> "adi,adv7282-m" >>> >>> +Optional Endpoint Properties : >>> +- newavmode: a boolean property to indicate the BT.656 bus is operating >>> + in Analog Device's NEWAVMODE. Valid for BT.656 busses only. >>> + >>> Example: >>> >>> i2c0@1c22000 { >>> diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c >>> index cb83ebb..3067d5f 100644 >>> --- a/drivers/media/i2c/adv7180.c >>> +++ b/drivers/media/i2c/adv7180.c >>> @@ -31,6 +31,7 @@ >>> #include <media/v4l2-event.h> >>> #include <media/v4l2-device.h> >>> #include <media/v4l2-ctrls.h> >>> +#include <media/v4l2-of.h> >>> #include <linux/mutex.h> >>> #include <linux/delay.h> >>> >>> @@ -106,6 +107,7 @@ >>> #define ADV7180_REG_SHAP_FILTER_CTL_1 0x0017 >>> #define ADV7180_REG_CTRL_2 0x001d >>> #define ADV7180_REG_VSYNC_FIELD_CTL_1 0x0031 >>> +#define ADV7180_VSYNC_FIELD_CTL_1_NEWAVMODE 0x02 >> See below re this value. >> > Hi Ian, I double-checked the ADV7180 datasheet, this value is > correct. Bit 4, when cleared, _enables_ NEWAVMODE. Hah, ok. I'm not familiar enough with the history of this chip and didn't know what "OLDAVMODE" was. So, to enable NEWAVMODE you clear the NEWAVMODE bit. That makes perfect sense. Anyway, I still don't see what NEWAVMODE gets you. As far as I can see it just locks down the timings and removes the flexibility the chip otherwise offers to move the BT656 SAV and EAV codes around relative to the incoming video. In what circumstances would you need to set the newavmode property and change this default behaviour? We're not coupling the adv7180 back-to-back with an ADV video encoder here, which is what NEWAVMODE is for and is presumably why AD recommend it for their eval boards. We're trying to get a BT656 compliant stream, which is what the default mode purports to generate. Regards, IanJ > >>> #define ADV7180_REG_MANUAL_WIN_CTL_1 0x003d >>> #define ADV7180_REG_MANUAL_WIN_CTL_2 0x003e >>> #define ADV7180_REG_MANUAL_WIN_CTL_3 0x003f >>> @@ -214,6 +216,7 @@ struct adv7180_state { >>> struct mutex mutex; /* mutual excl. when accessing chip */ >>> int irq; >>> v4l2_std_id curr_norm; >>> + bool newavmode; >>> bool powered; >>> bool streaming; >>> u8 input; >>> @@ -864,9 +867,15 @@ static int adv7180_init(struct adv7180_state *state) >>> if (ret < 0) >>> return ret; >>> >>> - /* Manually set V bit end position in NTSC mode */ >>> - return adv7180_write(state, ADV7180_REG_NTSC_V_BIT_END, >>> - ADV7180_NTSC_V_BIT_END_MANUAL_NVEND); >>> + if (!state->newavmode) { >>> + /* Manually set V bit end position in NTSC mode */ >>> + ret = adv7180_write(state, ADV7180_REG_NTSC_V_BIT_END, >>> + ADV7180_NTSC_V_BIT_END_MANUAL_NVEND); >>> + if (ret < 0) >>> + return ret; >>> + } >>> + >>> + return 0; >> According to the ADV7180 datasheet, rev. J, page 48 [1], when NEWAVMODE is 0, >> no adjustments are possible to the output timings, which would imply this write >> is ignored after your edit. > That's correct, when NEWAVMODE is enabled (by clearing reg 0x31 bit 4), no > adjustments are possible to the output timings: > > From the rev J datasheet, page 91, when reg 0x31 bit 4 is set (NEAVMODE disabled): > > "Manual VS/FIELD position controlled by Register 0x32, Register 0x33, and > Register 0xE5 to Register 0xEA" > >> 1: www.analog.com/media/en/technical-documentation/data-sheets/*ADV7180*.pdf >> >>> } >>> >>> static int adv7180_set_std(struct adv7180_state *state, unsigned int std) >>> @@ -1217,6 +1226,13 @@ static int init_device(struct adv7180_state *state) >>> if (ret) >>> goto out_unlock; >>> >>> + if (state->newavmode) { >>> + ret = adv7180_write(state, ADV7180_REG_VSYNC_FIELD_CTL_1, >>> + ADV7180_VSYNC_FIELD_CTL_1_NEWAVMODE); >>> + if (ret < 0) >>> + goto out_unlock; >>> + } >>> + >> Again according to the DS, NEWAVMODE is set by default and enables a >> stream which is by default CCIR656 compliant. Your edit writes 0x02 to >> this register which actually clears NEWAVMODE (bit 4). > correct, it clears bit 4 which _enables_ NEWAVMODE. > > NEWAVMODE by default is _disabled_ (bit 4 is set). > > > Steve > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 07/25/2016 12:36 PM, Ian Arkver wrote: > On 25/07/16 18:55, Steve Longerbeam wrote: >> On 07/25/2016 05:04 AM, Ian Arkver wrote: >>> On 23/07/16 18:00, Steve Longerbeam wrote: >>>> <snip> >>>> +#define ADV7180_VSYNC_FIELD_CTL_1_NEWAVMODE 0x02 >>> See below re this value. >>> >> Hi Ian, I double-checked the ADV7180 datasheet, this value is >> correct. Bit 4, when cleared, _enables_ NEWAVMODE. > > Hah, ok. I'm not familiar enough with the history of this chip and didn't > know what "OLDAVMODE" was. So, to enable NEWAVMODE you clear > the NEWAVMODE bit. That makes perfect sense. > > Anyway, I still don't see what NEWAVMODE gets you. Hi Ian, With video standard auto-detect disabled in the chip (VID_SEL > 2), captured NTSC images by the i.mx6q SabreAuto are corrupted, best I can describe it as "extremely fuzzy". Only when newavmode is enabled do the images look good again, in manual mode. With auto-detect enabled, images look good with or without newavmode. The strange this is, the auto-detected standard is identical to the standard set explicitly in manual mode (NTSC-M). I did a complete i2c dump of the registers for both auto-detect and manual mode, and found no other differences besides the auto-detect/manual setting. Trying to track this down further would probably require a logic analyzer on the bt.656 bus, which I don't have access to. I will not be debugging this further so NEWAVMODE it will have to remain. Steve > As > far as I can see it just locks down the timings and removes the > flexibility > the chip otherwise offers to move the BT656 SAV and EAV codes around > relative to the incoming video. > > In what circumstances would you need to set the newavmode property > and change this default behaviour? We're not coupling the adv7180 > back-to-back with an ADV video encoder here, which is what > NEWAVMODE is for and is presumably why AD recommend it for their > eval boards. We're trying to get a BT656 compliant stream, which is > what the default mode purports to generate. > > Regards, > IanJ > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 25/07/16 23:04, Steve Longerbeam wrote: > > > On 07/25/2016 12:36 PM, Ian Arkver wrote: >> On 25/07/16 18:55, Steve Longerbeam wrote: >>> On 07/25/2016 05:04 AM, Ian Arkver wrote: >>>> On 23/07/16 18:00, Steve Longerbeam wrote: >>>>> <snip> >>>>> +#define ADV7180_VSYNC_FIELD_CTL_1_NEWAVMODE 0x02 >>>> See below re this value. >>>> >>> Hi Ian, I double-checked the ADV7180 datasheet, this value is >>> correct. Bit 4, when cleared, _enables_ NEWAVMODE. >> >> Hah, ok. I'm not familiar enough with the history of this chip and >> didn't >> know what "OLDAVMODE" was. So, to enable NEWAVMODE you clear >> the NEWAVMODE bit. That makes perfect sense. >> >> Anyway, I still don't see what NEWAVMODE gets you. > > Hi Ian, > > With video standard auto-detect disabled in the chip (VID_SEL > 2), > captured NTSC > images by the i.mx6q SabreAuto are corrupted, best I can describe it > as "extremely > fuzzy". Only when newavmode is enabled do the images look good again, > in manual > mode. With auto-detect enabled, images look good with or without > newavmode. > > The strange this is, the auto-detected standard is identical to the > standard set > explicitly in manual mode (NTSC-M). I did a complete i2c dump of the > registers > for both auto-detect and manual mode, and found no other differences > besides > the auto-detect/manual setting. > > Trying to track this down further would probably require a logic > analyzer on the > bt.656 bus, which I don't have access to. > > I will not be debugging this further so NEWAVMODE it will have to remain. > > Steve OK, interesting. And weird indeed. I may be interfacing an ADV7280 to the i.MX6 in the August timeframe, depending on project needs etc. I'll see if I hit this with that chip. My test app does use autodetect. Incidentally, looking at the BT656-5 spec and comparing to the tvp5150, I see that the spec calls for 244 and 243 lines per field for NTSC, and the tvp5150 provides that number of lines. However this write... adv7180_write(state, ADV7180_REG_NTSC_V_BIT_END, ADV7180_NTSC_V_BIT_END_MANUAL_NVEND); where NVEND is 0x4f, configures the adv7180 to send only 242 lines in each field. Not sure if this is significant. Regards, IanJ. > >> As >> far as I can see it just locks down the timings and removes the >> flexibility >> the chip otherwise offers to move the BT656 SAV and EAV codes around >> relative to the incoming video. >> >> In what circumstances would you need to set the newavmode property >> and change this default behaviour? We're not coupling the adv7180 >> back-to-back with an ADV video encoder here, which is what >> NEWAVMODE is for and is presumably why AD recommend it for their >> eval boards. We're trying to get a BT656 compliant stream, which is >> what the default mode purports to generate. >> >> Regards, >> IanJ >> > > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 07/25/2016 03:24 PM, Ian Arkver wrote: > On 25/07/16 23:04, Steve Longerbeam wrote: >> >> >> On 07/25/2016 12:36 PM, Ian Arkver wrote: >>> On 25/07/16 18:55, Steve Longerbeam wrote: >>>> On 07/25/2016 05:04 AM, Ian Arkver wrote: >>>>> On 23/07/16 18:00, Steve Longerbeam wrote: >>>>>> <snip> >>>>>> +#define ADV7180_VSYNC_FIELD_CTL_1_NEWAVMODE 0x02 >>>>> See below re this value. >>>>> >>>> Hi Ian, I double-checked the ADV7180 datasheet, this value is >>>> correct. Bit 4, when cleared, _enables_ NEWAVMODE. >>> >>> Hah, ok. I'm not familiar enough with the history of this chip and didn't >>> know what "OLDAVMODE" was. So, to enable NEWAVMODE you clear >>> the NEWAVMODE bit. That makes perfect sense. >>> >>> Anyway, I still don't see what NEWAVMODE gets you. >> >> Hi Ian, >> >> With video standard auto-detect disabled in the chip (VID_SEL > 2), captured NTSC >> images by the i.mx6q SabreAuto are corrupted, best I can describe it as "extremely >> fuzzy". Only when newavmode is enabled do the images look good again, in manual >> mode. With auto-detect enabled, images look good with or without newavmode. >> >> The strange this is, the auto-detected standard is identical to the standard set >> explicitly in manual mode (NTSC-M). I did a complete i2c dump of the registers >> for both auto-detect and manual mode, and found no other differences besides >> the auto-detect/manual setting. >> >> Trying to track this down further would probably require a logic analyzer on the >> bt.656 bus, which I don't have access to. >> >> I will not be debugging this further so NEWAVMODE it will have to remain. >> >> Steve > > OK, interesting. And weird indeed. > > I may be interfacing an ADV7280 to the i.MX6 in the August timeframe, depending on > project needs etc. I'll see if I hit this with that chip. My test app does use autodetect. > > Incidentally, looking at the BT656-5 spec and comparing to the tvp5150, I see that > the spec calls for 244 and 243 lines per field for NTSC, and the tvp5150 provides > that number of lines. However this write... > > adv7180_write(state, ADV7180_REG_NTSC_V_BIT_END, > ADV7180_NTSC_V_BIT_END_MANUAL_NVEND); > > where NVEND is 0x4f, configures the adv7180 to send only 242 lines in each field. > Not sure if this is significant. Right. I thought for sure that was the reason for the image problems, but I tried commenting out that write (default value for ADV7180_REG_NTSC_V_BIT_END) with NEWAVMODE disabled, and still the images were corrupted in manual mode. Steve -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/media/i2c/adv7180.txt b/Documentation/devicetree/bindings/media/i2c/adv7180.txt index 0d50115..6c175d2 100644 --- a/Documentation/devicetree/bindings/media/i2c/adv7180.txt +++ b/Documentation/devicetree/bindings/media/i2c/adv7180.txt @@ -15,6 +15,10 @@ Required Properties : "adi,adv7282" "adi,adv7282-m" +Optional Endpoint Properties : +- newavmode: a boolean property to indicate the BT.656 bus is operating + in Analog Device's NEWAVMODE. Valid for BT.656 busses only. + Example: i2c0@1c22000 { diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c index cb83ebb..3067d5f 100644 --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c @@ -31,6 +31,7 @@ #include <media/v4l2-event.h> #include <media/v4l2-device.h> #include <media/v4l2-ctrls.h> +#include <media/v4l2-of.h> #include <linux/mutex.h> #include <linux/delay.h> @@ -106,6 +107,7 @@ #define ADV7180_REG_SHAP_FILTER_CTL_1 0x0017 #define ADV7180_REG_CTRL_2 0x001d #define ADV7180_REG_VSYNC_FIELD_CTL_1 0x0031 +#define ADV7180_VSYNC_FIELD_CTL_1_NEWAVMODE 0x02 #define ADV7180_REG_MANUAL_WIN_CTL_1 0x003d #define ADV7180_REG_MANUAL_WIN_CTL_2 0x003e #define ADV7180_REG_MANUAL_WIN_CTL_3 0x003f @@ -214,6 +216,7 @@ struct adv7180_state { struct mutex mutex; /* mutual excl. when accessing chip */ int irq; v4l2_std_id curr_norm; + bool newavmode; bool powered; bool streaming; u8 input; @@ -864,9 +867,15 @@ static int adv7180_init(struct adv7180_state *state) if (ret < 0) return ret; - /* Manually set V bit end position in NTSC mode */ - return adv7180_write(state, ADV7180_REG_NTSC_V_BIT_END, - ADV7180_NTSC_V_BIT_END_MANUAL_NVEND); + if (!state->newavmode) { + /* Manually set V bit end position in NTSC mode */ + ret = adv7180_write(state, ADV7180_REG_NTSC_V_BIT_END, + ADV7180_NTSC_V_BIT_END_MANUAL_NVEND); + if (ret < 0) + return ret; + } + + return 0; } static int adv7180_set_std(struct adv7180_state *state, unsigned int std) @@ -1217,6 +1226,13 @@ static int init_device(struct adv7180_state *state) if (ret) goto out_unlock; + if (state->newavmode) { + ret = adv7180_write(state, ADV7180_REG_VSYNC_FIELD_CTL_1, + ADV7180_VSYNC_FIELD_CTL_1_NEWAVMODE); + if (ret < 0) + goto out_unlock; + } + ret = adv7180_program_std(state); if (ret) goto out_unlock; @@ -1257,6 +1273,28 @@ out_unlock: return ret; } +static void adv7180_of_parse(struct adv7180_state *state) +{ + struct i2c_client *client = state->client; + struct device_node *np = client->dev.of_node; + struct device_node *endpoint; + struct v4l2_of_endpoint ep; + + endpoint = of_graph_get_next_endpoint(np, NULL); + if (!endpoint) { + v4l_warn(client, "endpoint node not found\n"); + return; + } + + v4l2_of_parse_endpoint(endpoint, &ep); + if (ep.bus_type == V4L2_MBUS_BT656) { + if (of_property_read_bool(endpoint, "newavmode")) + state->newavmode = true; + } + + of_node_put(endpoint); +} + static int adv7180_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -1279,6 +1317,8 @@ static int adv7180_probe(struct i2c_client *client, state->field = V4L2_FIELD_INTERLACED; state->chip_info = (struct adv7180_chip_info *)id->driver_data; + adv7180_of_parse(state); + if (state->chip_info->flags & ADV7180_FLAG_MIPI_CSI2) { state->csi_client = i2c_new_dummy(client->adapter, ADV7180_DEFAULT_CSI_I2C_ADDR);
Parse the optional v4l2 endpoint DT node. If the bus type is V4L2_MBUS_BT656 and the endpoint node specifies "newavmode", configure the BT.656 bus in NEWAVMODE. Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com> --- v3: - the newavmode endpoint property is now private to adv7180. --- .../devicetree/bindings/media/i2c/adv7180.txt | 4 ++ drivers/media/i2c/adv7180.c | 46 ++++++++++++++++++++-- 2 files changed, 47 insertions(+), 3 deletions(-)