OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
449c5e9
31dca07
)
Merge branch '4.8/omapdrm-pll' (omapdrm PLL work)
author
Tomi Valkeinen
<tomi.valkeinen@ti.com>
Mon, 6 Jun 2016 07:16:51 +0000
(10:16 +0300)
committer
Tomi Valkeinen
<tomi.valkeinen@ti.com>
Mon, 6 Jun 2016 07:16:51 +0000
(10:16 +0300)
Merge omapdrm PLL work, which makes it possible to use the DSS PLLs in a
versatile manner, for example, HDMI PLL can be used for LCDs.
1
2
drivers/gpu/drm/omapdrm/dss/dsi.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/omapdrm/dss/dss.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/omapdrm/dss/hdmi4.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/omapdrm/dss/hdmi5.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/gpu/drm/omapdrm/dss/dsi.c
Simple merge
diff --cc
drivers/gpu/drm/omapdrm/dss/dss.c
Simple merge
diff --cc
drivers/gpu/drm/omapdrm/dss/hdmi4.c
Simple merge
diff --cc
drivers/gpu/drm/omapdrm/dss/hdmi5.c
Simple merge
diff --cc
drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
index
f1015e8
,
ac866d2
..
dc0212a
---
1
/
drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
---
2
/
drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
+++ b/
drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
@@@
-16,7
-16,7
+16,8
@@@
#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
+#include <linux/seq_file.h>
+ #include <linux/pm_runtime.h>
#include <video/omapdss.h>