diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-shmobile/clock-sh7367.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/clock-sh7372.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/clock-sh7377.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/clock-sh73a0.c | 4 |
4 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/mach-shmobile/clock-sh7367.c b/arch/arm/mach-shmobile/clock-sh7367.c index 6b186aefcbd..5218c34a9cc 100644 --- a/arch/arm/mach-shmobile/clock-sh7367.c +++ b/arch/arm/mach-shmobile/clock-sh7367.c | |||
@@ -259,9 +259,6 @@ static struct clk mstp_clks[MSTP_NR] = { | |||
259 | [CMMSTP003] = MSTP(&r_clk, CMMSTPCR0, 3, 0), /* KEYSC */ | 259 | [CMMSTP003] = MSTP(&r_clk, CMMSTPCR0, 3, 0), /* KEYSC */ |
260 | }; | 260 | }; |
261 | 261 | ||
262 | #define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk } | ||
263 | #define CLKDEV_DEV_ID(_id, _clk) { .dev_id = _id, .clk = _clk } | ||
264 | |||
265 | static struct clk_lookup lookups[] = { | 262 | static struct clk_lookup lookups[] = { |
266 | /* main clocks */ | 263 | /* main clocks */ |
267 | CLKDEV_CON_ID("r_clk", &r_clk), | 264 | CLKDEV_CON_ID("r_clk", &r_clk), |
diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c index 91f5779abdd..6b1619a65db 100644 --- a/arch/arm/mach-shmobile/clock-sh7372.c +++ b/arch/arm/mach-shmobile/clock-sh7372.c | |||
@@ -561,10 +561,6 @@ static struct clk mstp_clks[MSTP_NR] = { | |||
561 | [MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */ | 561 | [MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */ |
562 | }; | 562 | }; |
563 | 563 | ||
564 | #define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk } | ||
565 | #define CLKDEV_DEV_ID(_id, _clk) { .dev_id = _id, .clk = _clk } | ||
566 | #define CLKDEV_ICK_ID(_cid, _did, _clk) { .con_id = _cid, .dev_id = _did, .clk = _clk } | ||
567 | |||
568 | static struct clk_lookup lookups[] = { | 564 | static struct clk_lookup lookups[] = { |
569 | /* main clocks */ | 565 | /* main clocks */ |
570 | CLKDEV_CON_ID("dv_clki_div2_clk", &sh7372_dv_clki_div2_clk), | 566 | CLKDEV_CON_ID("dv_clki_div2_clk", &sh7372_dv_clki_div2_clk), |
diff --git a/arch/arm/mach-shmobile/clock-sh7377.c b/arch/arm/mach-shmobile/clock-sh7377.c index 95942466e63..8cee7b151ae 100644 --- a/arch/arm/mach-shmobile/clock-sh7377.c +++ b/arch/arm/mach-shmobile/clock-sh7377.c | |||
@@ -267,9 +267,6 @@ static struct clk mstp_clks[] = { | |||
267 | [MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */ | 267 | [MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */ |
268 | }; | 268 | }; |
269 | 269 | ||
270 | #define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk } | ||
271 | #define CLKDEV_DEV_ID(_id, _clk) { .dev_id = _id, .clk = _clk } | ||
272 | |||
273 | static struct clk_lookup lookups[] = { | 270 | static struct clk_lookup lookups[] = { |
274 | /* main clocks */ | 271 | /* main clocks */ |
275 | CLKDEV_CON_ID("r_clk", &r_clk), | 272 | CLKDEV_CON_ID("r_clk", &r_clk), |
diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c index bcacb1e8cf8..6db2ccabc2b 100644 --- a/arch/arm/mach-shmobile/clock-sh73a0.c +++ b/arch/arm/mach-shmobile/clock-sh73a0.c | |||
@@ -306,10 +306,6 @@ static struct clk mstp_clks[MSTP_NR] = { | |||
306 | [MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */ | 306 | [MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */ |
307 | }; | 307 | }; |
308 | 308 | ||
309 | #define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk } | ||
310 | #define CLKDEV_DEV_ID(_id, _clk) { .dev_id = _id, .clk = _clk } | ||
311 | #define CLKDEV_ICK_ID(_cid, _did, _clk) { .con_id = _cid, .dev_id = _did, .clk = _clk } | ||
312 | |||
313 | static struct clk_lookup lookups[] = { | 309 | static struct clk_lookup lookups[] = { |
314 | /* main clocks */ | 310 | /* main clocks */ |
315 | CLKDEV_CON_ID("r_clk", &r_clk), | 311 | CLKDEV_CON_ID("r_clk", &r_clk), |