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

powerpc/fsl: remove extraneous DIU platform functions

The Freescale DIU driver was recently updated to not require every DIU
platform function, so now we can remove the unneeded functions from
some boards.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

authored by

Timur Tabi and committed by
Kumar Gala
d4d801d1 4700ebd1

-55
-5
arch/powerpc/platforms/512x/mpc512x_shared.c
··· 68 68 bool in_use; 69 69 }; 70 70 71 - void mpc512x_set_monitor_port(enum fsl_diu_monitor_port port) 72 - { 73 - } 74 - 75 71 #define DIU_DIV_MASK 0x000000ff 76 72 void mpc512x_set_pixel_clock(unsigned int pixclock) 77 73 { ··· 299 303 } 300 304 } 301 305 302 - diu_ops.set_monitor_port = mpc512x_set_monitor_port; 303 306 diu_ops.set_pixel_clock = mpc512x_set_pixel_clock; 304 307 diu_ops.valid_monitor_port = mpc512x_valid_monitor_port; 305 308 diu_ops.release_bootmem = mpc512x_release_bootmem;
-38
arch/powerpc/platforms/85xx/p1022_ds.c
··· 106 106 (c2 << AD_COMP_2_SHIFT) | (c1 << AD_COMP_1_SHIFT) | \ 107 107 (c0 << AD_COMP_0_SHIFT) | (size << AD_PIXEL_S_SHIFT)) 108 108 109 - /** 110 - * p1022ds_get_pixel_format: return the Area Descriptor for a given pixel depth 111 - * 112 - * The Area Descriptor is a 32-bit value that determine which bits in each 113 - * pixel are to be used for each color. 114 - */ 115 - static u32 p1022ds_get_pixel_format(enum fsl_diu_monitor_port port, 116 - unsigned int bits_per_pixel) 117 - { 118 - switch (bits_per_pixel) { 119 - case 32: 120 - /* 0x88883316 */ 121 - return MAKE_AD(3, 2, 0, 1, 3, 8, 8, 8, 8); 122 - case 24: 123 - /* 0x88082219 */ 124 - return MAKE_AD(4, 0, 1, 2, 2, 0, 8, 8, 8); 125 - case 16: 126 - /* 0x65053118 */ 127 - return MAKE_AD(4, 2, 1, 0, 1, 5, 6, 5, 0); 128 - default: 129 - pr_err("fsl-diu: unsupported pixel depth %u\n", bits_per_pixel); 130 - return 0; 131 - } 132 - } 133 - 134 - /** 135 - * p1022ds_set_gamma_table: update the gamma table, if necessary 136 - * 137 - * On some boards, the gamma table for some ports may need to be modified. 138 - * This is not the case on the P1022DS, so we do nothing. 139 - */ 140 - static void p1022ds_set_gamma_table(enum fsl_diu_monitor_port port, 141 - char *gamma_table_base) 142 - { 143 - } 144 - 145 109 struct fsl_law { 146 110 u32 lawbar; 147 111 u32 reserved1; ··· 474 510 ppc_md.progress("p1022_ds_setup_arch()", 0); 475 511 476 512 #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE) 477 - diu_ops.get_pixel_format = p1022ds_get_pixel_format; 478 - diu_ops.set_gamma_table = p1022ds_set_gamma_table; 479 513 diu_ops.set_monitor_port = p1022ds_set_monitor_port; 480 514 diu_ops.set_pixel_clock = p1022ds_set_pixel_clock; 481 515 diu_ops.valid_monitor_port = p1022ds_valid_monitor_port;
-12
arch/powerpc/platforms/85xx/p1022_rdk.c
··· 35 35 #define CLKDVDR_PXCLK_MASK 0x00FF0000 36 36 37 37 /** 38 - * p1022rdk_set_monitor_port: switch the output to a different monitor port 39 - */ 40 - static void p1022rdk_set_monitor_port(enum fsl_diu_monitor_port port) 41 - { 42 - if (port != FSL_DIU_PORT_DVI) { 43 - pr_err("p1022rdk: unsupported monitor port %i\n", port); 44 - return; 45 - } 46 - } 47 - 48 - /** 49 38 * p1022rdk_set_pixel_clock: program the DIU's clock 50 39 * 51 40 * @pixclock: the wavelength, in picoseconds, of the clock ··· 113 124 ppc_md.progress("p1022_rdk_setup_arch()", 0); 114 125 115 126 #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE) 116 - diu_ops.set_monitor_port = p1022rdk_set_monitor_port; 117 127 diu_ops.set_pixel_clock = p1022rdk_set_pixel_clock; 118 128 diu_ops.valid_monitor_port = p1022rdk_valid_monitor_port; 119 129 #endif