aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Zapolskiy <vladimir_zapolskiy@mentor.com>2015-05-18 08:32:20 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-08-18 06:38:11 -0400
commit6dc2e1bf8e0025db2ff8a35ee3e0bd88203d4402 (patch)
tree6661abdaceb9d424077349e298f734fc778c3c6b
parentb872a8e16b3fb17c3fe1e97f4ed0803f4a740aae (diff)
drm: bridge/dw_hdmi: fix register I2CM_ADDRESS register name
I2CM_ADDRESS became a MESS, fix it, also change guarding define to __DW_HDMI_H__ , since the driver is not IMX specific. Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/gpu/drm/bridge/dw_hdmi.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/bridge/dw_hdmi.h b/drivers/gpu/drm/bridge/dw_hdmi.h
index 175dbc89a824..ee7f7ed2ab12 100644
--- a/drivers/gpu/drm/bridge/dw_hdmi.h
+++ b/drivers/gpu/drm/bridge/dw_hdmi.h
@@ -7,8 +7,8 @@
7 * (at your option) any later version. 7 * (at your option) any later version.
8 */ 8 */
9 9
10#ifndef __IMX_HDMI_H__ 10#ifndef __DW_HDMI_H__
11#define __IMX_HDMI_H__ 11#define __DW_HDMI_H__
12 12
13/* Identification Registers */ 13/* Identification Registers */
14#define HDMI_DESIGN_ID 0x0000 14#define HDMI_DESIGN_ID 0x0000
@@ -525,7 +525,7 @@
525 525
526/* I2C Master Registers (E-DDC) */ 526/* I2C Master Registers (E-DDC) */
527#define HDMI_I2CM_SLAVE 0x7E00 527#define HDMI_I2CM_SLAVE 0x7E00
528#define HDMI_I2CMESS 0x7E01 528#define HDMI_I2CM_ADDRESS 0x7E01
529#define HDMI_I2CM_DATAO 0x7E02 529#define HDMI_I2CM_DATAO 0x7E02
530#define HDMI_I2CM_DATAI 0x7E03 530#define HDMI_I2CM_DATAI 0x7E03
531#define HDMI_I2CM_OPERATION 0x7E04 531#define HDMI_I2CM_OPERATION 0x7E04
@@ -1031,4 +1031,4 @@ enum {
1031 HDMI_A_VIDPOLCFG_HSYNCPOL_ACTIVE_LOW = 0x0, 1031 HDMI_A_VIDPOLCFG_HSYNCPOL_ACTIVE_LOW = 0x0,
1032}; 1032};
1033 1033
1034#endif /* __IMX_HDMI_H__ */ 1034#endif /* __DW_HDMI_H__ */