diff options
| author | Archit Taneja <archit@ti.com> | 2013-09-12 16:37:49 +0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-10-09 13:42:23 +0400 |
| commit | bdb8bfc652543dc392caa66343fe32cf66c4095b (patch) | |
| tree | 9221d7863bb4c4511b99c7b5cb26ccb394c47506 /drivers/video/omap2/dss/hdmi_phy.c | |
| parent | 275cfa1a9d43f00d1ae59f36fa0c3ed7f941b369 (diff) | |
| download | linux-bdb8bfc652543dc392caa66343fe32cf66c4095b.tar.xz | |
omapdss: HDMI: Clean up the header files
Keep only OMAP4 HDMI core block related structs and enums in ti_hdmi_4xxx_ip.h,
move the rest to ti_hdmi.h. This holds all library specific data which will be
shared between OMAP4 and OMAP5/DRA7x HDMI encoder drivers.
Move the duplicate register read/write/wait_for_bit_change functions in the hdmi
library files to ti_hdmi.h
Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/hdmi_phy.c')
| -rw-r--r-- | drivers/video/omap2/dss/hdmi_phy.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/video/omap2/dss/hdmi_phy.c b/drivers/video/omap2/dss/hdmi_phy.c index 48bdba8d7031..29f7552b4b9a 100644 --- a/drivers/video/omap2/dss/hdmi_phy.c +++ b/drivers/video/omap2/dss/hdmi_phy.c @@ -9,7 +9,6 @@ */ #include <linux/kernel.h> -#include <linux/delay.h> #include <linux/err.h> #include <linux/io.h> #include <linux/platform_device.h> @@ -17,40 +16,10 @@ #include "dss.h" #include "ti_hdmi.h" -#include "ti_hdmi_4xxx_ip.h" #define HDMI_IRQ_LINK_CONNECT (1 << 25) #define HDMI_IRQ_LINK_DISCONNECT (1 << 26) -static inline void hdmi_write_reg(void __iomem *base_addr, const u16 idx, - u32 val) -{ - __raw_writel(val, base_addr + idx); -} - -static inline u32 hdmi_read_reg(void __iomem *base_addr, const u16 idx) -{ - return __raw_readl(base_addr + idx); -} - -#define REG_FLD_MOD(base, idx, val, start, end) \ - hdmi_write_reg(base, idx, FLD_MOD(hdmi_read_reg(base, idx),\ - val, start, end)) -#define REG_GET(base, idx, start, end) \ - FLD_GET(hdmi_read_reg(base, idx), start, end) - -static inline int hdmi_wait_for_bit_change(void __iomem *base_addr, - const u16 idx, int b2, int b1, u32 val) -{ - u32 t = 0; - while (val != REG_GET(base_addr, idx, b2, b1)) { - udelay(1); - if (t++ > 10000) - return !val; - } - return val; -} - void hdmi_phy_dump(struct hdmi_phy_data *phy, struct seq_file *s) { #define DUMPPHY(r) seq_printf(s, "%-35s %08x\n", #r,\ |