diff options
| -rw-r--r-- | arch/powerpc/include/asm/mpc5121.h | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/512x/clock.c | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/mpc5121.h b/arch/powerpc/include/asm/mpc5121.h index 8ae133eaf9fa..885c040d6194 100644 --- a/arch/powerpc/include/asm/mpc5121.h +++ b/arch/powerpc/include/asm/mpc5121.h | |||
| @@ -68,5 +68,6 @@ struct mpc512x_lpc { | |||
| 68 | }; | 68 | }; |
| 69 | 69 | ||
| 70 | int mpc512x_cs_config(unsigned int cs, u32 val); | 70 | int mpc512x_cs_config(unsigned int cs, u32 val); |
| 71 | int __init mpc5121_clk_init(void); | ||
| 71 | 72 | ||
| 72 | #endif /* __ASM_POWERPC_MPC5121_H__ */ | 73 | #endif /* __ASM_POWERPC_MPC5121_H__ */ |
diff --git a/arch/powerpc/platforms/512x/clock.c b/arch/powerpc/platforms/512x/clock.c index 8a784d46f40c..52d57d281724 100644 --- a/arch/powerpc/platforms/512x/clock.c +++ b/arch/powerpc/platforms/512x/clock.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #include <linux/of_platform.h> | 27 | #include <linux/of_platform.h> |
| 28 | #include <asm/mpc5xxx.h> | 28 | #include <asm/mpc5xxx.h> |
| 29 | #include <asm/mpc5121.h> | ||
| 29 | #include <asm/clk_interface.h> | 30 | #include <asm/clk_interface.h> |
| 30 | 31 | ||
| 31 | #undef CLK_DEBUG | 32 | #undef CLK_DEBUG |
| @@ -122,7 +123,7 @@ struct mpc512x_clockctl { | |||
| 122 | u32 dccr; /* DIU Clk Cnfg Reg */ | 123 | u32 dccr; /* DIU Clk Cnfg Reg */ |
| 123 | }; | 124 | }; |
| 124 | 125 | ||
| 125 | struct mpc512x_clockctl __iomem *clockctl; | 126 | static struct mpc512x_clockctl __iomem *clockctl; |
| 126 | 127 | ||
| 127 | static int mpc5121_clk_enable(struct clk *clk) | 128 | static int mpc5121_clk_enable(struct clk *clk) |
| 128 | { | 129 | { |
| @@ -551,7 +552,7 @@ static struct clk ac97_clk = { | |||
| 551 | .calc = ac97_clk_calc, | 552 | .calc = ac97_clk_calc, |
| 552 | }; | 553 | }; |
| 553 | 554 | ||
| 554 | struct clk *rate_clks[] = { | 555 | static struct clk *rate_clks[] = { |
| 555 | &ref_clk, | 556 | &ref_clk, |
| 556 | &sys_clk, | 557 | &sys_clk, |
| 557 | &diu_clk, | 558 | &diu_clk, |
| @@ -607,7 +608,7 @@ static void rate_clks_init(void) | |||
| 607 | * There are two clk enable registers with 32 enable bits each | 608 | * There are two clk enable registers with 32 enable bits each |
| 608 | * psc clocks and device clocks are all stored in dev_clks | 609 | * psc clocks and device clocks are all stored in dev_clks |
| 609 | */ | 610 | */ |
| 610 | struct clk dev_clks[2][32]; | 611 | static struct clk dev_clks[2][32]; |
| 611 | 612 | ||
| 612 | /* | 613 | /* |
| 613 | * Given a psc number return the dev_clk | 614 | * Given a psc number return the dev_clk |
