From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/41] mfd: dbx500: Remove any mention of the BML8580CLK
Date: Wed, 18 Sep 2013 13:14:00 +0100 [thread overview]
Message-ID: <1379506478-16625-4-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1379506478-16625-1-git-send-email-lee.jones@linaro.org>
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>
---
drivers/mfd/db8500-prcmu.c | 1 -
drivers/mfd/dbx500-prcmu-regs.h | 1 -
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 3c157faee..ed79d7b 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -480,7 +480,6 @@ struct clk_mgt clk_mgt[PRCMU_NUM_REG_CLOCKS] = {
CLK_MGT_ENTRY(PER6CLK, PLL_DIV, true),
CLK_MGT_ENTRY(PER7CLK, PLL_DIV, true),
CLK_MGT_ENTRY(LCDCLK, PLL_FIX, true),
- CLK_MGT_ENTRY(BML8580CLK, PLL_DIV, true),
CLK_MGT_ENTRY(BMLCLK, PLL_DIV, true),
CLK_MGT_ENTRY(HSITXCLK, PLL_DIV, true),
CLK_MGT_ENTRY(HSIRXCLK, PLL_DIV, true),
diff --git a/drivers/mfd/dbx500-prcmu-regs.h b/drivers/mfd/dbx500-prcmu-regs.h
index 4f6f0fa..7cc32a8 100644
--- a/drivers/mfd/dbx500-prcmu-regs.h
+++ b/drivers/mfd/dbx500-prcmu-regs.h
@@ -32,7 +32,6 @@
#define PRCM_PER7CLK_MGT (0x040)
#define PRCM_LCDCLK_MGT (0x044)
#define PRCM_BMLCLK_MGT (0x04C)
-#define PRCM_BML8580CLK_MGT (0x108)
#define PRCM_HSITXCLK_MGT (0x050)
#define PRCM_HSIRXCLK_MGT (0x054)
#define PRCM_HDMICLK_MGT (0x058)
diff --git a/include/dt-bindings/mfd/dbx500-prcmu.h b/include/dt-bindings/mfd/dbx500-prcmu.h
index b7ee8c9..552a2d1 100644
--- a/include/dt-bindings/mfd/dbx500-prcmu.h
+++ b/include/dt-bindings/mfd/dbx500-prcmu.h
@@ -61,24 +61,23 @@
#define PRCMU_PLLSOC1 43
#define PRCMU_ARMSS 44
#define PRCMU_PLLDDR 45
-#define PRCMU_BML8580CLK 46
/* DSI Clocks */
-#define PRCMU_PLLDSI 47
-#define PRCMU_DSI0CLK 48
-#define PRCMU_DSI1CLK 49
-#define PRCMU_DSI0ESCCLK 50
-#define PRCMU_DSI1ESCCLK 51
-#define PRCMU_DSI2ESCCLK 52
+#define PRCMU_PLLDSI 46
+#define PRCMU_DSI0CLK 47
+#define PRCMU_DSI1CLK 48
+#define PRCMU_DSI0ESCCLK 49
+#define PRCMU_DSI1ESCCLK 50
+#define PRCMU_DSI2ESCCLK 51
/* LCD DSI PLL - Ux540 only */
-#define PRCMU_PLLDSI_LCD 53
-#define PRCMU_DSI0CLK_LCD 54
-#define PRCMU_DSI1CLK_LCD 55
-#define PRCMU_DSI0ESCCLK_LCD 56
-#define PRCMU_DSI1ESCCLK_LCD 57
-#define PRCMU_DSI2ESCCLK_LCD 58
+#define PRCMU_PLLDSI_LCD 52
+#define PRCMU_DSI0CLK_LCD 53
+#define PRCMU_DSI1CLK_LCD 54
+#define PRCMU_DSI0ESCCLK_LCD 55
+#define PRCMU_DSI1ESCCLK_LCD 56
+#define PRCMU_DSI2ESCCLK_LCD 57
-#define PRCMU_NUM_CLKS 59
+#define PRCMU_NUM_CLKS 58
#endif
--
1.8.1.2
next prev parent reply other threads:[~2013-09-18 12:14 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-18 12:13 [PATCH v2 00/41] Enable common clock with Device Tree on ux500 platforms Lee Jones
2013-09-18 12:13 ` [PATCH 01/41] mfd: dbx500-prcmu: Correctly reorder PRCMU clock identifiers Lee Jones
2013-09-18 12:23 ` Linus Walleij
2013-09-18 12:13 ` [PATCH 02/41] mfd: dbx500-prcmu: Move PRCMU numerical clock identifiers into DT include file Lee Jones
2013-09-18 12:24 ` Linus Walleij
2013-09-18 12:14 ` Lee Jones [this message]
2013-09-18 12:14 ` [PATCH 04/41] ARM: ux500: Add PRCMU clock node to DBx500 Device Tree Lee Jones
2013-09-18 12:14 ` [PATCH 05/41] ARM: ux500: Supply the DMA clock lookup to the DBX500 DT Lee Jones
2013-09-18 12:14 ` [PATCH 06/41] ARM: ux500: Add PRCC Peripheral clock node to DBx500 Device Tree Lee Jones
2013-09-18 12:14 ` [PATCH 07/41] ARM: ux500: Supply the GPIO clocks lookup to the DBX500 DT Lee Jones
2013-09-18 12:14 ` [PATCH 08/41] ARM: ux500: Supply the USB clock " Lee Jones
2013-09-18 12:14 ` [PATCH 09/41] ARM: ux500: Supply the Ethernet clock lookup to Snowball's DT Lee Jones
2013-09-18 12:14 ` [PATCH 10/41] ARM: ux500: Add PRCC Kernel clock node to DBx500 Device Tree Lee Jones
2013-09-18 12:14 ` [PATCH 11/41] ARM: ux500: Supply the I2C clocks lookup to the DBX500 DT Lee Jones
2013-09-18 12:14 ` [PATCH 12/41] ARM: ux500: Supply the UART " Lee Jones
2013-09-18 12:14 ` [PATCH 13/41] ARM: ux500: Supply the SDI (MMC) " Lee Jones
2013-09-18 12:14 ` [PATCH 14/41] ARM: ux500: Supply the MSP (Audio) " Lee Jones
2013-09-18 12:14 ` [PATCH 15/41] ARM: ux500: Add RTC (fixed-frequency) clock node to DBx500 Device Tree Lee Jones
2013-09-18 12:14 ` [PATCH 16/41] ARM: ux500: Supply the RTC clock lookup to the DBX500 DT Lee Jones
2013-09-18 12:14 ` [PATCH 17/41] ARM: ux500: Add TWD (fixed-factor) clock node to DBx500 Device Tree Lee Jones
2013-09-18 12:14 ` [PATCH 18/41] ARM: ux500: Supply the TWD Timer clock lookup to the DBX500 DT Lee Jones
2013-09-18 12:14 ` [PATCH 19/41] ARM: ux500: Add a DT node for the Nomadik System Timer (MTU0) Lee Jones
2013-09-18 12:14 ` [PATCH 20/41] ARM: ux500: Don't attempt to enable the Nomadik System Timer twice Lee Jones
2013-09-18 12:14 ` [PATCH 21/41] clk: ux500: Remove BML8580 clock Lee Jones
2013-09-18 12:14 ` [PATCH 22/41] clk: ux500: Copy u8500_clk_init() ready for DT enablement Lee Jones
2013-09-19 12:31 ` Lee Jones
2013-09-20 20:59 ` Linus Walleij
2013-12-13 1:51 ` Mike Turquette
2013-12-19 20:15 ` Ulf Hansson
2013-09-18 12:14 ` [PATCH 23/41] clk: ux500: Provide u8500_clk with skeleton Device Tree support Lee Jones
2013-09-18 12:14 ` [PATCH 24/41] clk: ux500: Add a 2-cell Device Tree parser for obtaining PRCC clocks Lee Jones
2013-09-18 12:14 ` [PATCH 25/41] clk: ux500: Add Device Tree support for the PRCMU clock Lee Jones
2013-09-18 12:14 ` [PATCH 26/41] clk: ux500: Add Device Tree support for the PRCC Peripheral clock Lee Jones
2013-09-18 12:14 ` [PATCH 27/41] clk: ux500: Add Device Tree support for the PRCC Kernel clock Lee Jones
2013-09-18 12:14 ` [PATCH 28/41] clk: ux500: Add Device Tree support for the RTC clock Lee Jones
2013-09-18 12:14 ` [PATCH 29/41] clk: ux500: Add Device Tree support for the TWD clock Lee Jones
2013-09-18 12:14 ` [PATCH 30/41] usb: musb: ux500: Don't supply a con_id when requesting the clock Lee Jones
2013-09-20 20:41 ` Linus Walleij
2013-09-23 20:43 ` Felipe Balbi
2013-09-18 12:14 ` [PATCH 31/41] ARM: ux500: Call appropriate clock initialisation based on DT or !DT booting Lee Jones
2013-09-18 12:14 ` [PATCH 32/41] ARM: ux500: Remove AUXDATA relating to GPIO clock-name bindings Lee Jones
2013-09-18 12:14 ` [PATCH 33/41] ARM: ux500: Remove AUXDATA relating to UART " Lee Jones
2013-09-18 12:14 ` [PATCH 34/41] ARM: ux500: Remove AUXDATA relating to I2C " Lee Jones
2013-09-18 12:14 ` [PATCH 35/41] ARM: ux500: Relocate AUXDATA relating to MSP (Audio) Lee Jones
2013-09-18 12:14 ` [PATCH 36/41] ARM: ux500: Remove AUXDATA relating to USB clock-name bindings Lee Jones
2013-09-18 12:14 ` [PATCH 37/41] ARM: ux500: Remove AUXDATA relating to Ethernet " Lee Jones
2013-09-18 12:14 ` [PATCH 38/41] ARM: ux500: Remove AUXDATA relating to DMA " Lee Jones
2013-09-18 12:14 ` [PATCH 39/41] ARM: ux500: Reclassify PRCMU AUXDATA entry Lee Jones
2013-09-18 12:14 ` [PATCH 40/41] ARM: ux500: Remove SSP AUXDATA pertaining to DMA bindings Lee Jones
2013-09-18 12:14 ` [PATCH 41/41] ARM: ux500: Fix trivial whitespace/tabbing issue Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1379506478-16625-4-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).