c43c17c4d6561d92dc38fb76408cdac8d5eb8719
[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-3.0 / pm-wip / voltdm / 0027-omap-mcbsp-Remove-port-number-enums.patch
1 From b1096b8873a8ffd74a2de22fa2edb6e138bedf83 Mon Sep 17 00:00:00 2001
2 From: Jarkko Nikula <jhnikula@gmail.com>
3 Date: Fri, 1 Jul 2011 08:52:27 +0000
4 Subject: [PATCH 027/149] omap: mcbsp: Remove port number enums
6 These McBSP port number enums are used only in two places in the McBSP code
7 so we may remove then and just use numeric values like rest of the code does.
9 Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
10 Signed-off-by: Tony Lindgren <tony@atomide.com>
11 ---
12 arch/arm/mach-omap1/mcbsp.c | 4 ++--
13 arch/arm/plat-omap/include/plat/mcbsp.h | 10 +---------
14 2 files changed, 3 insertions(+), 11 deletions(-)
16 diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c
17 index d9af981..ab7395d 100644
18 --- a/arch/arm/mach-omap1/mcbsp.c
19 +++ b/arch/arm/mach-omap1/mcbsp.c
20 @@ -38,7 +38,7 @@ static void omap1_mcbsp_request(unsigned int id)
21 * On 1510, 1610 and 1710, McBSP1 and McBSP3
22 * are DSP public peripherals.
23 */
24 - if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {
25 + if (id == 0 || id == 2) {
26 if (dsp_use++ == 0) {
27 api_clk = clk_get(NULL, "api_ck");
28 dsp_clk = clk_get(NULL, "dsp_ck");
29 @@ -59,7 +59,7 @@ static void omap1_mcbsp_request(unsigned int id)
31 static void omap1_mcbsp_free(unsigned int id)
32 {
33 - if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {
34 + if (id == 0 || id == 2) {
35 if (--dsp_use == 0) {
36 if (!IS_ERR(api_clk)) {
37 clk_disable(api_clk);
38 diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h
39 index 63464ad..9882c65 100644
40 --- a/arch/arm/plat-omap/include/plat/mcbsp.h
41 +++ b/arch/arm/plat-omap/include/plat/mcbsp.h
42 @@ -33,7 +33,7 @@
43 #define OMAP_MCBSP_PLATFORM_DEVICE(port_nr) \
44 static struct platform_device omap_mcbsp##port_nr = { \
45 .name = "omap-mcbsp-dai", \
46 - .id = OMAP_MCBSP##port_nr, \
47 + .id = port_nr - 1, \
48 }
50 #define MCBSP_CONFIG_TYPE2 0x2
51 @@ -332,14 +332,6 @@ struct omap_mcbsp_reg_cfg {
52 };
54 typedef enum {
55 - OMAP_MCBSP1 = 0,
56 - OMAP_MCBSP2,
57 - OMAP_MCBSP3,
58 - OMAP_MCBSP4,
59 - OMAP_MCBSP5
60 -} omap_mcbsp_id;
61 -
62 -typedef enum {
63 OMAP_MCBSP_WORD_8 = 0,
64 OMAP_MCBSP_WORD_12,
65 OMAP_MCBSP_WORD_16,
66 --
67 1.6.6.1