summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx5
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2010-10-12 12:26:32 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-10-19 18:44:59 +0200
commit7e5a747113cabb71ec855411bb7666e8963a75b7 (patch)
treed171ed6fc8f5744a87e9abb3ca3d6ce3ced5b44b /arch/arm/mach-mx5
parent0076232d54b3fb2908c7fcf19bf699c4e8376213 (diff)
downloadblackbird-op-linux-7e5a747113cabb71ec855411bb7666e8963a75b7.tar.gz
blackbird-op-linux-7e5a747113cabb71ec855411bb7666e8963a75b7.zip
clock-mx51: rename CLOCK1 to CLOCK_CCGR for better readability
Signed-off-by: Eric Bénard <eric@eukrea.com>
Diffstat (limited to 'arch/arm/mach-mx5')
-rw-r--r--arch/arm/mach-mx5/clock-mx51.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx5/clock-mx51.c b/arch/arm/mach-mx5/clock-mx51.c
index 7deb6837937a..9a39492c5b23 100644
--- a/arch/arm/mach-mx5/clock-mx51.c
+++ b/arch/arm/mach-mx5/clock-mx51.c
@@ -772,7 +772,7 @@ static struct clk emi_slow_clk = {
.get_rate = clk_emi_slow_get_rate,
};
-#define DEFINE_CLOCK1(name, i, er, es, pfx, p, s) \
+#define DEFINE_CLOCK_CCGR(name, i, er, es, pfx, p, s) \
static struct clk name = { \
.id = i, \
.enable_reg = er, \
@@ -900,7 +900,7 @@ DEFINE_CLOCK(fec_clk, 0, MXC_CCM_CCGR2, MXC_CCM_CCGRx_CG12_OFFSET,
NULL, NULL, &ipg_clk, NULL);
/* NFC */
-DEFINE_CLOCK1(nfc_clk, 0, MXC_CCM_CCGR5, MXC_CCM_CCGRx_CG10_OFFSET,
+DEFINE_CLOCK_CCGR(nfc_clk, 0, MXC_CCM_CCGR5, MXC_CCM_CCGRx_CG10_OFFSET,
clk_nfc, &emi_slow_clk, NULL);
/* SSI */
OpenPOWER on IntegriCloud