1 files changed, 11 insertions, 12 deletions

diff --git a/include/media/adv7604.h b/include/media/adv7604.h
index b2500baee8ed..6186771c0642 100644
--- a/include/media/adv7604.h
+++ b/include/media/adv7604.h
@@ -155,20 +155,19 @@ struct adv7604_platform_data {
         u8 i2c_vdp;
 };
 
-enum adv7604_input_port {
-        ADV7604_INPUT_HDMI_PORT_A,
-        ADV7604_INPUT_HDMI_PORT_B,
-        ADV7604_INPUT_HDMI_PORT_C,
-        ADV7604_INPUT_HDMI_PORT_D,
-        ADV7604_INPUT_VGA_RGB,
-        ADV7604_INPUT_VGA_COMP,
+enum adv7604_pad {
+        ADV7604_PAD_HDMI_PORT_A = 0,
+        ADV7604_PAD_HDMI_PORT_B = 1,
+        ADV7604_PAD_HDMI_PORT_C = 2,
+        ADV7604_PAD_HDMI_PORT_D = 3,
+        ADV7604_PAD_VGA_RGB = 4,
+        ADV7604_PAD_VGA_COMP = 5,
+        /* The source pad is either 1 (ADV7611) or 6 (ADV7604) */
+        ADV7604_PAD_SOURCE = 6,
+        ADV7611_PAD_SOURCE = 1,
+        ADV7604_PAD_MAX = 7,
 };
 
-#define ADV7604_EDID_PORT_A 0
-#define ADV7604_EDID_PORT_B 1
-#define ADV7604_EDID_PORT_C 2
-#define ADV7604_EDID_PORT_D 3
-
 #define V4L2_CID_ADV_RX_ANALOG_SAMPLING_PHASE   (V4L2_CID_DV_CLASS_BASE + 0x1000)
 #define V4L2_CID_ADV_RX_FREE_RUN_COLOR_MANUAL   (V4L2_CID_DV_CLASS_BASE + 0x1001)
 #define V4L2_CID_ADV_RX_FREE_RUN_COLOR          (V4L2_CID_DV_CLASS_BASE + 0x1002)