diff mbox

[01/11] media: adv7180: Fix broken interrupt register access

Message ID 1467846004-12731-2-git-send-email-steve_longerbeam@mentor.com (mailing list archive)
State New, archived
Headers show

Commit Message

Steve Longerbeam July 6, 2016, 10:59 p.m. UTC
Access to the interrupt page registers has been broken since
at least 3999e5d01da74f1a22afbb0b61b3992fea301478. That commit
forgot to add the inerrupt page number to the register defines.

Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com>
---
 drivers/media/i2c/adv7180.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Comments

Tim Harvey July 7, 2016, 2:44 p.m. UTC | #1
On Wed, Jul 6, 2016 at 3:59 PM, Steve Longerbeam <slongerbeam@gmail.com> wrote:
> Access to the interrupt page registers has been broken since
> at least 3999e5d01da74f1a22afbb0b61b3992fea301478. That commit
> forgot to add the inerrupt page number to the register defines.
>
> Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com>
> ---
>  drivers/media/i2c/adv7180.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
> index b77b0a4..95cbc85 100644
> --- a/drivers/media/i2c/adv7180.c
> +++ b/drivers/media/i2c/adv7180.c
> @@ -100,7 +100,7 @@
>  #define ADV7180_REG_IDENT 0x0011
>  #define ADV7180_ID_7180 0x18
>
> -#define ADV7180_REG_ICONF1             0x0040
> +#define ADV7180_REG_ICONF1             0x2040
>  #define ADV7180_ICONF1_ACTIVE_LOW      0x01
>  #define ADV7180_ICONF1_PSYNC_ONLY      0x10
>  #define ADV7180_ICONF1_ACTIVE_TO_CLR   0xC0
> @@ -113,15 +113,15 @@
>
>  #define ADV7180_IRQ1_LOCK      0x01
>  #define ADV7180_IRQ1_UNLOCK    0x02
> -#define ADV7180_REG_ISR1       0x0042
> -#define ADV7180_REG_ICR1       0x0043
> -#define ADV7180_REG_IMR1       0x0044
> -#define ADV7180_REG_IMR2       0x0048
> +#define ADV7180_REG_ISR1       0x2042
> +#define ADV7180_REG_ICR1       0x2043
> +#define ADV7180_REG_IMR1       0x2044
> +#define ADV7180_REG_IMR2       0x2048
>  #define ADV7180_IRQ3_AD_CHANGE 0x08
> -#define ADV7180_REG_ISR3       0x004A
> -#define ADV7180_REG_ICR3       0x004B
> -#define ADV7180_REG_IMR3       0x004C
> -#define ADV7180_REG_IMR4       0x50
> +#define ADV7180_REG_ISR3       0x204A
> +#define ADV7180_REG_ICR3       0x204B
> +#define ADV7180_REG_IMR3       0x204C
> +#define ADV7180_REG_IMR4       0x2050
>
>  #define ADV7180_REG_NTSC_V_BIT_END     0x00E6
>  #define ADV7180_NTSC_V_BIT_END_MANUAL_NVEND    0x4F
> --
> 1.9.1
>
> --
> 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

Tested on an IMX6 Gateworks Ventana with IMX6 capture drivers from Steve [1]

Tested-by: Tim Harvey <tharvey@gateworks.com>
Acked-by: Tim Harvey <tharvey@gateworks.com>

Added to Cc list those who signed-off and acked
3999e5d01da74f1a22afbb0b61b3992fea301478

[1] - http://thread.gmane.org/gmane.linux.drivers.video-input-infrastructure/102914
--
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
Lars-Peter Clausen July 7, 2016, 3:37 p.m. UTC | #2
On 07/07/2016 12:59 AM, Steve Longerbeam wrote:
> Access to the interrupt page registers has been broken since
> at least 3999e5d01da74f1a22afbb0b61b3992fea301478. That commit
> forgot to add the inerrupt page number to the register defines.

typo: interrupt

> 
> Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com>

Looks good, thanks.

Acked-by: Lars-Peter Clausen <lars@metafoo.de>
--
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 mbox

Patch

diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
index b77b0a4..95cbc85 100644
--- a/drivers/media/i2c/adv7180.c
+++ b/drivers/media/i2c/adv7180.c
@@ -100,7 +100,7 @@ 
 #define ADV7180_REG_IDENT 0x0011
 #define ADV7180_ID_7180 0x18
 
-#define ADV7180_REG_ICONF1		0x0040
+#define ADV7180_REG_ICONF1		0x2040
 #define ADV7180_ICONF1_ACTIVE_LOW	0x01
 #define ADV7180_ICONF1_PSYNC_ONLY	0x10
 #define ADV7180_ICONF1_ACTIVE_TO_CLR	0xC0
@@ -113,15 +113,15 @@ 
 
 #define ADV7180_IRQ1_LOCK	0x01
 #define ADV7180_IRQ1_UNLOCK	0x02
-#define ADV7180_REG_ISR1	0x0042
-#define ADV7180_REG_ICR1	0x0043
-#define ADV7180_REG_IMR1	0x0044
-#define ADV7180_REG_IMR2	0x0048
+#define ADV7180_REG_ISR1	0x2042
+#define ADV7180_REG_ICR1	0x2043
+#define ADV7180_REG_IMR1	0x2044
+#define ADV7180_REG_IMR2	0x2048
 #define ADV7180_IRQ3_AD_CHANGE	0x08
-#define ADV7180_REG_ISR3	0x004A
-#define ADV7180_REG_ICR3	0x004B
-#define ADV7180_REG_IMR3	0x004C
-#define ADV7180_REG_IMR4	0x50
+#define ADV7180_REG_ISR3	0x204A
+#define ADV7180_REG_ICR3	0x204B
+#define ADV7180_REG_IMR3	0x204C
+#define ADV7180_REG_IMR4	0x2050
 
 #define ADV7180_REG_NTSC_V_BIT_END	0x00E6
 #define ADV7180_NTSC_V_BIT_END_MANUAL_NVEND	0x4F