diff options
author | Lee Jones <lee.jones@linaro.org> | 2013-08-19 07:23:05 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-09-26 05:04:16 -0400 |
commit | 58092dc4dfde55d5824211e5aa1be47212a57f1f (patch) | |
tree | 5854e297e171b911a7178ddcc682c7f5565d13fa | |
parent | 67f13daadccebf95c04f73db7b78cead844540bd (diff) |
mfd: dbx500: Remove any mention of the BML8580CLK
The platform which it pertains to is no longer supported and is actually
causing some confusion in the new common clock implementation. A recent
patch removed its use in the clock driver, let's take out the definitions
too.
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | drivers/mfd/db8500-prcmu.c | 1 | ||||
-rw-r--r-- | drivers/mfd/dbx500-prcmu-regs.h | 1 | ||||
-rw-r--r-- | include/dt-bindings/mfd/dbx500-prcmu.h | 27 |
3 files changed, 13 insertions, 16 deletions
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index 53f371dcbb6e..b9ce60c301de 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c | |||
@@ -480,7 +480,6 @@ static struct clk_mgt clk_mgt[PRCMU_NUM_REG_CLOCKS] = { | |||
480 | CLK_MGT_ENTRY(PER6CLK, PLL_DIV, true), | 480 | CLK_MGT_ENTRY(PER6CLK, PLL_DIV, true), |
481 | CLK_MGT_ENTRY(PER7CLK, PLL_DIV, true), | 481 | CLK_MGT_ENTRY(PER7CLK, PLL_DIV, true), |
482 | CLK_MGT_ENTRY(LCDCLK, PLL_FIX, true), | 482 | CLK_MGT_ENTRY(LCDCLK, PLL_FIX, true), |
483 | CLK_MGT_ENTRY(BML8580CLK, PLL_DIV, true), | ||
484 | CLK_MGT_ENTRY(BMLCLK, PLL_DIV, true), | 483 | CLK_MGT_ENTRY(BMLCLK, PLL_DIV, true), |
485 | CLK_MGT_ENTRY(HSITXCLK, PLL_DIV, true), | 484 | CLK_MGT_ENTRY(HSITXCLK, PLL_DIV, true), |
486 | CLK_MGT_ENTRY(HSIRXCLK, PLL_DIV, true), | 485 | CLK_MGT_ENTRY(HSIRXCLK, PLL_DIV, true), |
diff --git a/drivers/mfd/dbx500-prcmu-regs.h b/drivers/mfd/dbx500-prcmu-regs.h index 4f6f0fa5d3b7..7cc32a8ff01c 100644 --- a/drivers/mfd/dbx500-prcmu-regs.h +++ b/drivers/mfd/dbx500-prcmu-regs.h | |||
@@ -32,7 +32,6 @@ | |||
32 | #define PRCM_PER7CLK_MGT (0x040) | 32 | #define PRCM_PER7CLK_MGT (0x040) |
33 | #define PRCM_LCDCLK_MGT (0x044) | 33 | #define PRCM_LCDCLK_MGT (0x044) |
34 | #define PRCM_BMLCLK_MGT (0x04C) | 34 | #define PRCM_BMLCLK_MGT (0x04C) |
35 | #define PRCM_BML8580CLK_MGT (0x108) | ||
36 | #define PRCM_HSITXCLK_MGT (0x050) | 35 | #define PRCM_HSITXCLK_MGT (0x050) |
37 | #define PRCM_HSIRXCLK_MGT (0x054) | 36 | #define PRCM_HSIRXCLK_MGT (0x054) |
38 | #define PRCM_HDMICLK_MGT (0x058) | 37 | #define PRCM_HDMICLK_MGT (0x058) |
diff --git a/include/dt-bindings/mfd/dbx500-prcmu.h b/include/dt-bindings/mfd/dbx500-prcmu.h index b7ee8c909908..552a2d174f01 100644 --- a/include/dt-bindings/mfd/dbx500-prcmu.h +++ b/include/dt-bindings/mfd/dbx500-prcmu.h | |||
@@ -61,24 +61,23 @@ | |||
61 | #define PRCMU_PLLSOC1 43 | 61 | #define PRCMU_PLLSOC1 43 |
62 | #define PRCMU_ARMSS 44 | 62 | #define PRCMU_ARMSS 44 |
63 | #define PRCMU_PLLDDR 45 | 63 | #define PRCMU_PLLDDR 45 |
64 | #define PRCMU_BML8580CLK 46 | ||
65 | 64 | ||
66 | /* DSI Clocks */ | 65 | /* DSI Clocks */ |
67 | #define PRCMU_PLLDSI 47 | 66 | #define PRCMU_PLLDSI 46 |
68 | #define PRCMU_DSI0CLK 48 | 67 | #define PRCMU_DSI0CLK 47 |
69 | #define PRCMU_DSI1CLK 49 | 68 | #define PRCMU_DSI1CLK 48 |
70 | #define PRCMU_DSI0ESCCLK 50 | 69 | #define PRCMU_DSI0ESCCLK 49 |
71 | #define PRCMU_DSI1ESCCLK 51 | 70 | #define PRCMU_DSI1ESCCLK 50 |
72 | #define PRCMU_DSI2ESCCLK 52 | 71 | #define PRCMU_DSI2ESCCLK 51 |
73 | 72 | ||
74 | /* LCD DSI PLL - Ux540 only */ | 73 | /* LCD DSI PLL - Ux540 only */ |
75 | #define PRCMU_PLLDSI_LCD 53 | 74 | #define PRCMU_PLLDSI_LCD 52 |
76 | #define PRCMU_DSI0CLK_LCD 54 | 75 | #define PRCMU_DSI0CLK_LCD 53 |
77 | #define PRCMU_DSI1CLK_LCD 55 | 76 | #define PRCMU_DSI1CLK_LCD 54 |
78 | #define PRCMU_DSI0ESCCLK_LCD 56 | 77 | #define PRCMU_DSI0ESCCLK_LCD 55 |
79 | #define PRCMU_DSI1ESCCLK_LCD 57 | 78 | #define PRCMU_DSI1ESCCLK_LCD 56 |
80 | #define PRCMU_DSI2ESCCLK_LCD 58 | 79 | #define PRCMU_DSI2ESCCLK_LCD 57 |
81 | 80 | ||
82 | #define PRCMU_NUM_CLKS 59 | 81 | #define PRCMU_NUM_CLKS 58 |
83 | 82 | ||
84 | #endif | 83 | #endif |