aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-18 10:47:51 -0400
committerLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-30 13:18:11 -0400
commite620b8b83092be5da89443c0e0c5ffe20e77e819 (patch)
tree4ec4fc9d9f31736b5cb099b1d827fea8208b262b /drivers/video
parent3df11b8d108d53b08845371690d42b921e81b8ed (diff)
Revert "UBUNTU: SAUCE: OMAP: DSS2: enable hsclk in dsi_pll_init for OMAP36XX"
This reverts commit d360158cc2b48727a2215ebc1e78c3b1d171335e. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/dss/dpi.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index 207f5c552bb..ff6bd30132d 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -203,10 +203,7 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
203 203
204 if (dpi_use_dsi_pll(dssdev)) { 204 if (dpi_use_dsi_pll(dssdev)) {
205 dss_clk_enable(DSS_CLK_SYSCK); 205 dss_clk_enable(DSS_CLK_SYSCK);
206 if (cpu_is_omap3630()) 206 r = dsi_pll_init(dpi.dsidev, 0, 1);
207 r = dsi_pll_init(dssdev, 1, 1);
208 else
209 r = dsi_pll_init(dssdev, 0, 1);
210 if (r) 207 if (r)
211 goto err3; 208 goto err3;
212 } 209 }
/a> 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412



























































































































































































































































































































































































































                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
ÿØÿà