aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchit Taneja2014-07-08 04:05:32 -0500
committerArchit Taneja2014-07-14 08:27:17 -0500
commit34129000a12ed460ad3443d14988da2dcbfebcff (patch)
tree7019314684ea11119a6ca1f1b152106a6a521e55
parent7c0575b42ebdfd9a8a88245bdb5e47a88b45001e (diff)
downloadkernel-video-34129000a12ed460ad3443d14988da2dcbfebcff.tar.gz
kernel-video-34129000a12ed460ad3443d14988da2dcbfebcff.tar.xz
kernel-video-34129000a12ed460ad3443d14988da2dcbfebcff.zip
OMAPDSS: dss/dispc/hdmi/pll: Add DRA72x version
Add OMAPDSS_VER_DRA72xx in the init_feature functions of different drivers. In dss.c, create a new features struct for DRA72x, and specify that VIDEO2 PLL doesn't exist on this DSS version. Signed-off-by: Archit Taneja <archit@ti.com>
-rw-r--r--drivers/video/fbdev/omap2/dss/dispc.c2
-rw-r--r--drivers/video/fbdev/omap2/dss/dss.c16
-rw-r--r--drivers/video/fbdev/omap2/dss/dss_features.c1
-rw-r--r--drivers/video/fbdev/omap2/dss/hdmi_phy.c1
-rw-r--r--drivers/video/fbdev/omap2/dss/pll.c1
5 files changed, 21 insertions, 0 deletions
diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/video/fbdev/omap2/dss/dispc.c
index fb5c164256e..0c9ddcb2303 100644
--- a/drivers/video/fbdev/omap2/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/dss/dispc.c
@@ -3719,7 +3719,9 @@ static int __init dispc_init_features(struct platform_device *pdev)
3719 case OMAPDSS_VER_OMAP5: 3719 case OMAPDSS_VER_OMAP5:
3720 src = &omap54xx_dispc_feats; 3720 src = &omap54xx_dispc_feats;
3721 break; 3721 break;
3722
3722 case OMAPDSS_VER_DRA74xx: 3723 case OMAPDSS_VER_DRA74xx:
3724 case OMAPDSS_VER_DRA72xx:
3723 src = &dra7xx_dispc_feats; 3725 src = &dra7xx_dispc_feats;
3724 break; 3726 break;
3725 3727
diff --git a/drivers/video/fbdev/omap2/dss/dss.c b/drivers/video/fbdev/omap2/dss/dss.c
index 217cdc7bcf7..f21bc0e1cef 100644
--- a/drivers/video/fbdev/omap2/dss/dss.c
+++ b/drivers/video/fbdev/omap2/dss/dss.c
@@ -883,6 +883,18 @@ static const struct dss_features dra74x_dss_feats __initconst = {
883 .video2_pll = true, 883 .video2_pll = true,
884}; 884};
885 885
886static const struct dss_features dra72x_dss_feats __initconst = {
887 .fck_div_max = 64,
888 .dss_fck_multiplier = 1,
889 .parent_clk_name = "dpll_per_x2_ck",
890 .dpi_select_source = &dss_dpi_select_source_dra7xx,
891 .ports = dra7xx_ports,
892 .num_ports = ARRAY_SIZE(dra7xx_ports),
893 .pll_ext_ctrl = true,
894 .video1_pll = true,
895 .video2_pll = false,
896};
897
886static int __init dss_init_features(struct platform_device *pdev) 898static int __init dss_init_features(struct platform_device *pdev)
887{ 899{
888 const struct dss_features *src; 900 const struct dss_features *src;
@@ -927,6 +939,10 @@ static int __init dss_init_features(struct platform_device *pdev)
927 src = &dra74x_dss_feats; 939 src = &dra74x_dss_feats;
928 break; 940 break;
929 941
942 case OMAPDSS_VER_DRA72xx:
943 src = &dra72x_dss_feats;
944 break;
945
930 default: 946 default:
931 return -ENODEV; 947 return -ENODEV;
932 } 948 }
diff --git a/drivers/video/fbdev/omap2/dss/dss_features.c b/drivers/video/fbdev/omap2/dss/dss_features.c
index 9b5e326c241..59d0f230721 100644
--- a/drivers/video/fbdev/omap2/dss/dss_features.c
+++ b/drivers/video/fbdev/omap2/dss/dss_features.c
@@ -945,6 +945,7 @@ void dss_features_init(enum omapdss_version version)
945 945
946 case OMAPDSS_VER_OMAP5: 946 case OMAPDSS_VER_OMAP5:
947 case OMAPDSS_VER_DRA74xx: 947 case OMAPDSS_VER_DRA74xx:
948 case OMAPDSS_VER_DRA72xx:
948 omap_current_dss_features = &omap5_dss_features; 949 omap_current_dss_features = &omap5_dss_features;
949 break; 950 break;
950 951
diff --git a/drivers/video/fbdev/omap2/dss/hdmi_phy.c b/drivers/video/fbdev/omap2/dss/hdmi_phy.c
index 9d4eab22846..6d144687cd7 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi_phy.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi_phy.c
@@ -218,6 +218,7 @@ static int hdmi_phy_init_features(struct platform_device *pdev)
218 218
219 case OMAPDSS_VER_OMAP5: 219 case OMAPDSS_VER_OMAP5:
220 case OMAPDSS_VER_DRA74xx: 220 case OMAPDSS_VER_DRA74xx:
221 case OMAPDSS_VER_DRA72xx:
221 src = &omap54xx_phy_feats; 222 src = &omap54xx_phy_feats;
222 break; 223 break;
223 224
diff --git a/drivers/video/fbdev/omap2/dss/pll.c b/drivers/video/fbdev/omap2/dss/pll.c
index 9a3efbdcc45..ee97854d6f9 100644
--- a/drivers/video/fbdev/omap2/dss/pll.c
+++ b/drivers/video/fbdev/omap2/dss/pll.c
@@ -558,6 +558,7 @@ static int __init pll_init_features(struct pll_data *pll)
558 558
559 case OMAPDSS_VER_OMAP5: 559 case OMAPDSS_VER_OMAP5:
560 case OMAPDSS_VER_DRA74xx: 560 case OMAPDSS_VER_DRA74xx:
561 case OMAPDSS_VER_DRA72xx:
561 pll->feats = &omap54xx_pll_features; 562 pll->feats = &omap54xx_pll_features;
562 break; 563 break;
563 564