Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

OMAPDSS: features: remove unused DSI PLL features

Now that the DSS has the common DSS PLL, we no longer use the DSI PLL
feature flags from dss_features.c.

Remove all the unused feature flags.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

-49
-38
drivers/video/fbdev/omap2/dss/dss_features.c
··· 72 72 [FEAT_REG_HORIZONTALACCU] = { 9, 0 }, 73 73 [FEAT_REG_VERTICALACCU] = { 25, 16 }, 74 74 [FEAT_REG_DISPC_CLK_SWITCH] = { 0, 0 }, 75 - [FEAT_REG_DSIPLL_REGN] = { 0, 0 }, 76 - [FEAT_REG_DSIPLL_REGM] = { 0, 0 }, 77 - [FEAT_REG_DSIPLL_REGM_DISPC] = { 0, 0 }, 78 - [FEAT_REG_DSIPLL_REGM_DSI] = { 0, 0 }, 79 75 }; 80 76 81 77 static const struct dss_reg_field omap3_dss_reg_fields[] = { ··· 83 87 [FEAT_REG_HORIZONTALACCU] = { 9, 0 }, 84 88 [FEAT_REG_VERTICALACCU] = { 25, 16 }, 85 89 [FEAT_REG_DISPC_CLK_SWITCH] = { 0, 0 }, 86 - [FEAT_REG_DSIPLL_REGN] = { 7, 1 }, 87 - [FEAT_REG_DSIPLL_REGM] = { 18, 8 }, 88 - [FEAT_REG_DSIPLL_REGM_DISPC] = { 22, 19 }, 89 - [FEAT_REG_DSIPLL_REGM_DSI] = { 26, 23 }, 90 90 }; 91 91 92 92 static const struct dss_reg_field am43xx_dss_reg_fields[] = { ··· 105 113 [FEAT_REG_HORIZONTALACCU] = { 10, 0 }, 106 114 [FEAT_REG_VERTICALACCU] = { 26, 16 }, 107 115 [FEAT_REG_DISPC_CLK_SWITCH] = { 9, 8 }, 108 - [FEAT_REG_DSIPLL_REGN] = { 8, 1 }, 109 - [FEAT_REG_DSIPLL_REGM] = { 20, 9 }, 110 - [FEAT_REG_DSIPLL_REGM_DISPC] = { 25, 21 }, 111 - [FEAT_REG_DSIPLL_REGM_DSI] = { 30, 26 }, 112 116 }; 113 117 114 118 static const struct dss_reg_field omap5_dss_reg_fields[] = { ··· 116 128 [FEAT_REG_HORIZONTALACCU] = { 10, 0 }, 117 129 [FEAT_REG_VERTICALACCU] = { 26, 16 }, 118 130 [FEAT_REG_DISPC_CLK_SWITCH] = { 9, 7 }, 119 - [FEAT_REG_DSIPLL_REGN] = { 8, 1 }, 120 - [FEAT_REG_DSIPLL_REGM] = { 20, 9 }, 121 - [FEAT_REG_DSIPLL_REGM_DISPC] = { 25, 21 }, 122 - [FEAT_REG_DSIPLL_REGM_DSI] = { 30, 26 }, 123 131 }; 124 132 125 133 static const enum omap_display_type omap2_dss_supported_displays[] = { ··· 421 437 static const struct dss_param_range omap2_dss_param_range[] = { 422 438 [FEAT_PARAM_DSS_FCK] = { 0, 133000000 }, 423 439 [FEAT_PARAM_DSS_PCD] = { 2, 255 }, 424 - [FEAT_PARAM_DSIPLL_REGN] = { 0, 0 }, 425 - [FEAT_PARAM_DSIPLL_REGM] = { 0, 0 }, 426 - [FEAT_PARAM_DSIPLL_REGM_HSDIV] = { 0, 0 }, 427 - [FEAT_PARAM_DSIPLL_FINT] = { 0, 0 }, 428 - [FEAT_PARAM_DSIPLL_LPDIV] = { 0, 0 }, 429 440 [FEAT_PARAM_DOWNSCALE] = { 1, 2 }, 430 441 /* 431 442 * Assuming the line width buffer to be 768 pixels as OMAP2 DISPC ··· 432 453 static const struct dss_param_range omap3_dss_param_range[] = { 433 454 [FEAT_PARAM_DSS_FCK] = { 0, 173000000 }, 434 455 [FEAT_PARAM_DSS_PCD] = { 1, 255 }, 435 - [FEAT_PARAM_DSIPLL_REGN] = { 0, (1 << 7) - 1 }, 436 - [FEAT_PARAM_DSIPLL_REGM] = { 0, (1 << 11) - 1 }, 437 - [FEAT_PARAM_DSIPLL_REGM_HSDIV] = { 0, (1 << 4) - 1 }, 438 - [FEAT_PARAM_DSIPLL_FINT] = { 750000, 2100000 }, 439 456 [FEAT_PARAM_DSIPLL_LPDIV] = { 1, (1 << 13) - 1}, 440 457 [FEAT_PARAM_DSI_FCK] = { 0, 173000000 }, 441 458 [FEAT_PARAM_DOWNSCALE] = { 1, 4 }, ··· 448 473 static const struct dss_param_range omap4_dss_param_range[] = { 449 474 [FEAT_PARAM_DSS_FCK] = { 0, 186000000 }, 450 475 [FEAT_PARAM_DSS_PCD] = { 1, 255 }, 451 - [FEAT_PARAM_DSIPLL_REGN] = { 0, (1 << 8) - 1 }, 452 - [FEAT_PARAM_DSIPLL_REGM] = { 0, (1 << 12) - 1 }, 453 - [FEAT_PARAM_DSIPLL_REGM_HSDIV] = { 0, (1 << 5) - 1 }, 454 - [FEAT_PARAM_DSIPLL_FINT] = { 500000, 2500000 }, 455 476 [FEAT_PARAM_DSIPLL_LPDIV] = { 0, (1 << 13) - 1 }, 456 477 [FEAT_PARAM_DSI_FCK] = { 0, 170000000 }, 457 478 [FEAT_PARAM_DOWNSCALE] = { 1, 4 }, ··· 457 486 static const struct dss_param_range omap5_dss_param_range[] = { 458 487 [FEAT_PARAM_DSS_FCK] = { 0, 209250000 }, 459 488 [FEAT_PARAM_DSS_PCD] = { 1, 255 }, 460 - [FEAT_PARAM_DSIPLL_REGN] = { 0, (1 << 8) - 1 }, 461 - [FEAT_PARAM_DSIPLL_REGM] = { 0, (1 << 12) - 1 }, 462 - [FEAT_PARAM_DSIPLL_REGM_HSDIV] = { 0, (1 << 5) - 1 }, 463 - [FEAT_PARAM_DSIPLL_FINT] = { 150000, 52000000 }, 464 489 [FEAT_PARAM_DSIPLL_LPDIV] = { 0, (1 << 13) - 1 }, 465 490 [FEAT_PARAM_DSI_FCK] = { 0, 209250000 }, 466 491 [FEAT_PARAM_DOWNSCALE] = { 1, 4 }, ··· 480 513 FEAT_LINEBUFFERSPLIT, 481 514 FEAT_ROWREPEATENABLE, 482 515 FEAT_RESIZECONF, 483 - FEAT_DSI_PLL_FREQSEL, 484 516 FEAT_DSI_REVERSE_TXCLKESC, 485 517 FEAT_VENC_REQUIRES_TV_DAC_CLK, 486 518 FEAT_CPR, ··· 499 533 FEAT_LINEBUFFERSPLIT, 500 534 FEAT_ROWREPEATENABLE, 501 535 FEAT_RESIZECONF, 502 - FEAT_DSI_PLL_FREQSEL, 503 536 FEAT_DSI_REVERSE_TXCLKESC, 504 537 FEAT_VENC_REQUIRES_TV_DAC_CLK, 505 538 FEAT_CPR, ··· 533 568 FEAT_ROWREPEATENABLE, 534 569 FEAT_RESIZECONF, 535 570 FEAT_DSI_PLL_PWR_BUG, 536 - FEAT_DSI_PLL_FREQSEL, 537 571 FEAT_CPR, 538 572 FEAT_PRELOAD, 539 573 FEAT_FIR_COEF_V, ··· 614 650 FEAT_ALPHA_FREE_ZORDER, 615 651 FEAT_FIFO_MERGE, 616 652 FEAT_BURST_2D, 617 - FEAT_DSI_PLL_SELFREQDCO, 618 - FEAT_DSI_PLL_REFSEL, 619 653 FEAT_DSI_PHY_DCC, 620 654 FEAT_MFLAG, 621 655 };
-11
drivers/video/fbdev/omap2/dss/dss_features.h
··· 41 41 FEAT_LCD_CLK_SRC, 42 42 /* DSI-PLL power command 0x3 is not working */ 43 43 FEAT_DSI_PLL_PWR_BUG, 44 - FEAT_DSI_PLL_FREQSEL, 45 44 FEAT_DSI_DCS_CMD_CONFIG_VC, 46 45 FEAT_DSI_VC_OCP_WIDTH, 47 46 FEAT_DSI_REVERSE_TXCLKESC, ··· 60 61 /* An unknown HW bug causing the normal FIFO thresholds not to work */ 61 62 FEAT_OMAP3_DSI_FIFO_BUG, 62 63 FEAT_BURST_2D, 63 - FEAT_DSI_PLL_SELFREQDCO, 64 - FEAT_DSI_PLL_REFSEL, 65 64 FEAT_DSI_PHY_DCC, 66 65 FEAT_MFLAG, 67 66 }; ··· 74 77 FEAT_REG_HORIZONTALACCU, 75 78 FEAT_REG_VERTICALACCU, 76 79 FEAT_REG_DISPC_CLK_SWITCH, 77 - FEAT_REG_DSIPLL_REGN, 78 - FEAT_REG_DSIPLL_REGM, 79 - FEAT_REG_DSIPLL_REGM_DISPC, 80 - FEAT_REG_DSIPLL_REGM_DSI, 81 80 }; 82 81 83 82 enum dss_range_param { 84 83 FEAT_PARAM_DSS_FCK, 85 84 FEAT_PARAM_DSS_PCD, 86 - FEAT_PARAM_DSIPLL_REGN, 87 - FEAT_PARAM_DSIPLL_REGM, 88 - FEAT_PARAM_DSIPLL_REGM_HSDIV, 89 - FEAT_PARAM_DSIPLL_FINT, 90 85 FEAT_PARAM_DSIPLL_LPDIV, 91 86 FEAT_PARAM_DSI_FCK, 92 87 FEAT_PARAM_DOWNSCALE,