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

ARM: OMAP2+: clock: remove clock_common_data.c file

This only contains clksel tables that were used with the legacy clock data.
Now that legacy clock data is completely gone, this file can be removed
also.

Signed-off-by: Tero Kristo <t-kristo@ti.com>

+1 -130
+1 -1
arch/arm/mach-omap2/Makefile
··· 12 12 13 13 hwmod-common = omap_hwmod.o omap_hwmod_reset.o \ 14 14 omap_hwmod_common_data.o 15 - clock-common = clock.o clock_common_data.o 15 + clock-common = clock.o 16 16 secure-common = omap-smc.o omap-secure.o 17 17 18 18 obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)
-14
arch/arm/mach-omap2/clock.h
··· 204 204 205 205 extern struct clk_functions omap2_clk_functions; 206 206 207 - extern const struct clksel_rate gpt_32k_rates[]; 208 - extern const struct clksel_rate gpt_sys_rates[]; 209 - extern const struct clksel_rate gfx_l3_rates[]; 210 - extern const struct clksel_rate dsp_ick_rates[]; 211 - 212 207 extern const struct clk_hw_omap_ops clkhwops_wait; 213 208 extern const struct clk_hw_omap_ops clkhwops_omap3430es2_ssi_wait; 214 209 extern const struct clk_hw_omap_ops clkhwops_omap3430es2_dss_usbhost_wait; ··· 211 216 extern const struct clk_hw_omap_ops clkhwops_am35xx_ipss_module_wait; 212 217 extern const struct clk_hw_omap_ops clkhwops_apll54; 213 218 extern const struct clk_hw_omap_ops clkhwops_apll96; 214 - 215 - /* clksel_rate blocks shared between OMAP44xx and AM33xx */ 216 - extern const struct clksel_rate div_1_0_rates[]; 217 - extern const struct clksel_rate div3_1to4_rates[]; 218 - extern const struct clksel_rate div_1_1_rates[]; 219 - extern const struct clksel_rate div_1_2_rates[]; 220 - extern const struct clksel_rate div_1_3_rates[]; 221 - extern const struct clksel_rate div_1_4_rates[]; 222 - extern const struct clksel_rate div31_1to31_rates[]; 223 219 224 220 extern int omap2_clkops_enable_clkdm(struct clk_hw *hw); 225 221 extern void omap2_clkops_disable_clkdm(struct clk_hw *hw);
-115
arch/arm/mach-omap2/clock_common_data.c
··· 1 - /* 2 - * linux/arch/arm/mach-omap2/clock_common_data.c 3 - * 4 - * Copyright (C) 2005-2009 Texas Instruments, Inc. 5 - * Copyright (C) 2004-2009 Nokia Corporation 6 - * 7 - * Contacts: 8 - * Richard Woodruff <r-woodruff2@ti.com> 9 - * Paul Walmsley 10 - * 11 - * This program is free software; you can redistribute it and/or modify 12 - * it under the terms of the GNU General Public License version 2 as 13 - * published by the Free Software Foundation. 14 - * 15 - * This file contains clock data that is common to both the OMAP2xxx and 16 - * OMAP3xxx clock definition files. 17 - */ 18 - 19 - #include "clock.h" 20 - 21 - /* clksel_rate data common to 24xx/343x */ 22 - const struct clksel_rate gpt_32k_rates[] = { 23 - { .div = 1, .val = 0, .flags = RATE_IN_24XX | RATE_IN_3XXX }, 24 - { .div = 0 } 25 - }; 26 - 27 - const struct clksel_rate gpt_sys_rates[] = { 28 - { .div = 1, .val = 1, .flags = RATE_IN_24XX | RATE_IN_3XXX }, 29 - { .div = 0 } 30 - }; 31 - 32 - const struct clksel_rate gfx_l3_rates[] = { 33 - { .div = 1, .val = 1, .flags = RATE_IN_24XX | RATE_IN_3XXX }, 34 - { .div = 2, .val = 2, .flags = RATE_IN_24XX | RATE_IN_3XXX }, 35 - { .div = 3, .val = 3, .flags = RATE_IN_243X | RATE_IN_3XXX }, 36 - { .div = 4, .val = 4, .flags = RATE_IN_243X | RATE_IN_3XXX }, 37 - { .div = 0 } 38 - }; 39 - 40 - const struct clksel_rate dsp_ick_rates[] = { 41 - { .div = 1, .val = 1, .flags = RATE_IN_24XX }, 42 - { .div = 2, .val = 2, .flags = RATE_IN_24XX }, 43 - { .div = 3, .val = 3, .flags = RATE_IN_243X }, 44 - { .div = 0 }, 45 - }; 46 - 47 - 48 - /* clksel_rate blocks shared between OMAP44xx and AM33xx */ 49 - 50 - const struct clksel_rate div_1_0_rates[] = { 51 - { .div = 1, .val = 0, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 52 - { .div = 0 }, 53 - }; 54 - 55 - const struct clksel_rate div3_1to4_rates[] = { 56 - { .div = 1, .val = 0, .flags = RATE_IN_4430 }, 57 - { .div = 2, .val = 1, .flags = RATE_IN_4430 }, 58 - { .div = 4, .val = 2, .flags = RATE_IN_4430 }, 59 - { .div = 0 }, 60 - }; 61 - 62 - const struct clksel_rate div_1_1_rates[] = { 63 - { .div = 1, .val = 1, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 64 - { .div = 0 }, 65 - }; 66 - 67 - const struct clksel_rate div_1_2_rates[] = { 68 - { .div = 1, .val = 2, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 69 - { .div = 0 }, 70 - }; 71 - 72 - const struct clksel_rate div_1_3_rates[] = { 73 - { .div = 1, .val = 3, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 74 - { .div = 0 }, 75 - }; 76 - 77 - const struct clksel_rate div_1_4_rates[] = { 78 - { .div = 1, .val = 4, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 79 - { .div = 0 }, 80 - }; 81 - 82 - const struct clksel_rate div31_1to31_rates[] = { 83 - { .div = 1, .val = 1, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 84 - { .div = 2, .val = 2, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 85 - { .div = 3, .val = 3, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 86 - { .div = 4, .val = 4, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 87 - { .div = 5, .val = 5, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 88 - { .div = 6, .val = 6, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 89 - { .div = 7, .val = 7, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 90 - { .div = 8, .val = 8, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 91 - { .div = 9, .val = 9, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 92 - { .div = 10, .val = 10, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 93 - { .div = 11, .val = 11, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 94 - { .div = 12, .val = 12, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 95 - { .div = 13, .val = 13, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 96 - { .div = 14, .val = 14, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 97 - { .div = 15, .val = 15, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 98 - { .div = 16, .val = 16, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 99 - { .div = 17, .val = 17, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 100 - { .div = 18, .val = 18, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 101 - { .div = 19, .val = 19, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 102 - { .div = 20, .val = 20, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 103 - { .div = 21, .val = 21, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 104 - { .div = 22, .val = 22, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 105 - { .div = 23, .val = 23, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 106 - { .div = 24, .val = 24, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 107 - { .div = 25, .val = 25, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 108 - { .div = 26, .val = 26, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 109 - { .div = 27, .val = 27, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 110 - { .div = 28, .val = 28, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 111 - { .div = 29, .val = 29, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 112 - { .div = 30, .val = 30, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 113 - { .div = 31, .val = 31, .flags = RATE_IN_4430 | RATE_IN_AM33XX }, 114 - { .div = 0 }, 115 - };