diff options
| -rw-r--r-- | arch/arm/mach-ux500/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/clock.c | 715 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/clock.h | 164 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/cpu.c | 14 | ||||
| -rw-r--r-- | drivers/clk/Makefile | 1 |
6 files changed, 11 insertions, 886 deletions
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index c013bbf79cac..2d76e4f9c97e 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig | |||
| @@ -11,6 +11,7 @@ config UX500_SOC_COMMON | |||
| 11 | select CACHE_L2X0 | 11 | select CACHE_L2X0 |
| 12 | select PINCTRL | 12 | select PINCTRL |
| 13 | select PINCTRL_NOMADIK | 13 | select PINCTRL_NOMADIK |
| 14 | select COMMON_CLK | ||
| 14 | 15 | ||
| 15 | config UX500_SOC_DB8500 | 16 | config UX500_SOC_DB8500 |
| 16 | bool | 17 | bool |
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index 026086ff9e6c..5691ef679d01 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Makefile for the linux kernel, U8500 machine. | 2 | # Makefile for the linux kernel, U8500 machine. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-y := clock.o cpu.o devices.o devices-common.o \ | 5 | obj-y := cpu.o devices.o devices-common.o \ |
| 6 | id.o usb.o timer.o | 6 | id.o usb.o timer.o |
| 7 | obj-$(CONFIG_CPU_IDLE) += cpuidle.o | 7 | obj-$(CONFIG_CPU_IDLE) += cpuidle.o |
| 8 | obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o | 8 | obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o |
diff --git a/arch/arm/mach-ux500/clock.c b/arch/arm/mach-ux500/clock.c deleted file mode 100644 index 8d73b066a18d..000000000000 --- a/arch/arm/mach-ux500/clock.c +++ /dev/null | |||
| @@ -1,715 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2009 ST-Ericsson | ||
| 3 | * Copyright (C) 2009 STMicroelectronics | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify | ||
| 6 | * it under the terms of the GNU General Public License version 2 as | ||
| 7 | * published by the Free Software Foundation. | ||
| 8 | */ | ||
| 9 | #include <linux/module.h> | ||
| 10 | #include <linux/kernel.h> | ||
| 11 | #include <linux/list.h> | ||
| 12 | #include <linux/errno.h> | ||
| 13 | #include <linux/err.h> | ||
| 14 | #include <linux/clk.h> | ||
| 15 | #include <linux/io.h> | ||
| 16 | #include <linux/clkdev.h> | ||
| 17 | #include <linux/cpufreq.h> | ||
| 18 | |||
| 19 | #include <plat/mtu.h> | ||
| 20 | #include <mach/hardware.h> | ||
| 21 | #include "clock.h" | ||
| 22 | |||
| 23 | #ifdef CONFIG_DEBUG_FS | ||
| 24 | #include <linux/debugfs.h> | ||
| 25 | #include <linux/uaccess.h> /* for copy_from_user */ | ||
| 26 | static LIST_HEAD(clk_list); | ||
| 27 | #endif | ||
| 28 | |||
| 29 | #define PRCC_PCKEN 0x00 | ||
| 30 | #define PRCC_PCKDIS 0x04 | ||
| 31 | #define PRCC_KCKEN 0x08 | ||
| 32 | #define PRCC_KCKDIS 0x0C | ||
| 33 | |||
| 34 | #define PRCM_YYCLKEN0_MGT_SET 0x510 | ||
| 35 | #define PRCM_YYCLKEN1_MGT_SET 0x514 | ||
| 36 | #define PRCM_YYCLKEN0_MGT_CLR 0x518 | ||
| 37 | #define PRCM_YYCLKEN1_MGT_CLR 0x51C | ||
| 38 | #define PRCM_YYCLKEN0_MGT_VAL 0x520 | ||
| 39 | #define PRCM_YYCLKEN1_MGT_VAL 0x524 | ||
| 40 | |||
| 41 | #define PRCM_SVAMMDSPCLK_MGT 0x008 | ||
| 42 | #define PRCM_SIAMMDSPCLK_MGT 0x00C | ||
| 43 | #define PRCM_SGACLK_MGT 0x014 | ||
| 44 | #define PRCM_UARTCLK_MGT 0x018 | ||
| 45 | #define PRCM_MSP02CLK_MGT 0x01C | ||
| 46 | #define PRCM_MSP1CLK_MGT 0x288 | ||
| 47 | #define PRCM_I2CCLK_MGT 0x020 | ||
| 48 | #define PRCM_SDMMCCLK_MGT 0x024 | ||
| 49 | #define PRCM_SLIMCLK_MGT 0x028 | ||
| 50 | #define PRCM_PER1CLK_MGT 0x02C | ||
| 51 | #define PRCM_PER2CLK_MGT 0x030 | ||
| 52 | #define PRCM_PER3CLK_MGT 0x034 | ||
| 53 | #define PRCM_PER5CLK_MGT 0x038 | ||
| 54 | #define PRCM_PER6CLK_MGT 0x03C | ||
| 55 | #define PRCM_PER7CLK_MGT 0x040 | ||
| 56 | #define PRCM_LCDCLK_MGT 0x044 | ||
| 57 | #define PRCM_BMLCLK_MGT 0x04C | ||
| 58 | #define PRCM_HSITXCLK_MGT 0x050 | ||
| 59 | #define PRCM_HSIRXCLK_MGT 0x054 | ||
| 60 | #define PRCM_HDMICLK_MGT 0x058 | ||
| 61 | #define PRCM_APEATCLK_MGT 0x05C | ||
| 62 | #define PRCM_APETRACECLK_MGT 0x060 | ||
| 63 | #define PRCM_MCDECLK_MGT 0x064 | ||
| 64 | #define PRCM_IPI2CCLK_MGT 0x068 | ||
| 65 | #define PRCM_DSIALTCLK_MGT 0x06C | ||
| 66 | #define PRCM_DMACLK_MGT 0x074 | ||
| 67 | #define PRCM_B2R2CLK_MGT 0x078 | ||
| 68 | #define PRCM_TVCLK_MGT 0x07C | ||
| 69 | #define PRCM_TCR 0x1C8 | ||
| 70 | #define PRCM_TCR_STOPPED (1 << 16) | ||
| 71 | #define PRCM_TCR_DOZE_MODE (1 << 17) | ||
| 72 | #define PRCM_UNIPROCLK_MGT 0x278 | ||
| 73 | #define PRCM_SSPCLK_MGT 0x280 | ||
| 74 | #define PRCM_RNGCLK_MGT 0x284 | ||
| 75 | #define PRCM_UICCCLK_MGT 0x27C | ||
| 76 | |||
| 77 | #define PRCM_MGT_ENABLE (1 << 8) | ||
| 78 | |||
| 79 | static DEFINE_SPINLOCK(clocks_lock); | ||
| 80 | |||
| 81 | static void __clk_enable(struct clk *clk) | ||
| 82 | { | ||
| 83 | if (clk->enabled++ == 0) { | ||
| 84 | if (clk->parent_cluster) | ||
| 85 | __clk_enable(clk->parent_cluster); | ||
| 86 | |||
| 87 | if (clk->parent_periph) | ||
| 88 | __clk_enable(clk->parent_periph); | ||
| 89 | |||
| 90 | if (clk->ops && clk->ops->enable) | ||
| 91 | clk->ops->enable(clk); | ||
| 92 | } | ||
| 93 | } | ||
| 94 | |||
| 95 | int clk_enable(struct clk *clk) | ||
| 96 | { | ||
| 97 | unsigned long flags; | ||
| 98 | |||
| 99 | spin_lock_irqsave(&clocks_lock, flags); | ||
| 100 | __clk_enable(clk); | ||
| 101 | spin_unlock_irqrestore(&clocks_lock, flags); | ||
| 102 | |||
| 103 | return 0; | ||
| 104 | } | ||
| 105 | EXPORT_SYMBOL(clk_enable); | ||
| 106 | |||
| 107 | static void __clk_disable(struct clk *clk) | ||
| 108 | { | ||
| 109 | if (--clk->enabled == 0) { | ||
| 110 | if (clk->ops && clk->ops->disable) | ||
| 111 | clk->ops->disable(clk); | ||
| 112 | |||
| 113 | if (clk->parent_periph) | ||
| 114 | __clk_disable(clk->parent_periph); | ||
| 115 | |||
| 116 | if (clk->parent_cluster) | ||
| 117 | __clk_disable(clk->parent_cluster); | ||
| 118 | } | ||
| 119 | } | ||
| 120 | |||
| 121 | void clk_disable(struct clk *clk) | ||
| 122 | { | ||
| 123 | unsigned long flags; | ||
| 124 | |||
| 125 | WARN_ON(!clk->enabled); | ||
| 126 | |||
| 127 | spin_lock_irqsave(&clocks_lock, flags); | ||
| 128 | __clk_disable(clk); | ||
| 129 | spin_unlock_irqrestore(&clocks_lock, flags); | ||
| 130 | } | ||
| 131 | EXPORT_SYMBOL(clk_disable); | ||
| 132 | |||
| 133 | /* | ||
| 134 | * The MTU has a separate, rather complex muxing setup | ||
| 135 | * with alternative parents (peripheral cluster or | ||
| 136 | * ULP or fixed 32768 Hz) depending on settings | ||
| 137 | */ | ||
| 138 | static unsigned long clk_mtu_get_rate(struct clk *clk) | ||
| 139 | { | ||
| 140 | void __iomem *addr; | ||
| 141 | u32 tcr; | ||
| 142 | int mtu = (int) clk->data; | ||
| 143 | /* | ||
| 144 | * One of these is selected eventually | ||
| 145 | * TODO: Replace the constant with a reference | ||
| 146 | * to the ULP source once this is modeled. | ||
| 147 | */ | ||
| 148 | unsigned long clk32k = 32768; | ||
| 149 | unsigned long mturate; | ||
| 150 | unsigned long retclk; | ||
| 151 | |||
| 152 | if (cpu_is_u8500_family()) | ||
| 153 | addr = __io_address(U8500_PRCMU_BASE); | ||
| 154 | else | ||
| 155 | ux500_unknown_soc(); | ||
| 156 | |||
| 157 | /* | ||
| 158 | * On a startup, always conifgure the TCR to the doze mode; | ||
| 159 | * bootloaders do it for us. Do this in the kernel too. | ||
| 160 | */ | ||
| 161 | writel(PRCM_TCR_DOZE_MODE, addr + PRCM_TCR); | ||
| 162 | |||
| 163 | tcr = readl(addr + PRCM_TCR); | ||
| 164 | |||
| 165 | /* Get the rate from the parent as a default */ | ||
| 166 | if (clk->parent_periph) | ||
| 167 | mturate = clk_get_rate(clk->parent_periph); | ||
| 168 | else if (clk->parent_cluster) | ||
| 169 | mturate = clk_get_rate(clk->parent_cluster); | ||
| 170 | else | ||
| 171 | /* We need to be connected SOMEWHERE */ | ||
| 172 | BUG(); | ||
| 173 | |||
| 174 | /* Return the clock selected for this MTU */ | ||
| 175 | if (tcr & (1 << mtu)) | ||
| 176 | retclk = clk32k; | ||
| 177 | else | ||
| 178 | retclk = mturate; | ||
| 179 | |||
| 180 | pr_info("MTU%d clock rate: %lu Hz\n", mtu, retclk); | ||
| 181 | return retclk; | ||
| 182 | } | ||
| 183 | |||
| 184 | unsigned long clk_get_rate(struct clk *clk) | ||
| 185 | { | ||
| 186 | unsigned long rate; | ||
| 187 | |||
| 188 | /* | ||
| 189 | * If there is a custom getrate callback for this clock, | ||
| 190 | * it will take precedence. | ||
| 191 | */ | ||
| 192 | if (clk->get_rate) | ||
| 193 | return clk->get_rate(clk); | ||
| 194 | |||
| 195 | if (clk->ops && clk->ops->get_rate) | ||
| 196 | return clk->ops->get_rate(clk); | ||
| 197 | |||
| 198 | rate = clk->rate; | ||
| 199 | if (!rate) { | ||
| 200 | if (clk->parent_periph) | ||
| 201 | rate = clk_get_rate(clk->parent_periph); | ||
| 202 | else if (clk->parent_cluster) | ||
| 203 | rate = clk_get_rate(clk->parent_cluster); | ||
| 204 | } | ||
| 205 | |||
| 206 | return rate; | ||
| 207 | } | ||
| 208 | EXPORT_SYMBOL(clk_get_rate); | ||
| 209 | |||
| 210 | long clk_round_rate(struct clk *clk, unsigned long rate) | ||
| 211 | { | ||
| 212 | /*TODO*/ | ||
| 213 | return rate; | ||
| 214 | } | ||
| 215 | EXPORT_SYMBOL(clk_round_rate); | ||
| 216 | |||
| 217 | int clk_set_rate(struct clk *clk, unsigned long rate) | ||
| 218 | { | ||
| 219 | clk->rate = rate; | ||
| 220 | return 0; | ||
| 221 | } | ||
| 222 | EXPORT_SYMBOL(clk_set_rate); | ||
| 223 | |||
| 224 | int clk_set_parent(struct clk *clk, struct clk *parent) | ||
| 225 | { | ||
| 226 | /*TODO*/ | ||
| 227 | return -ENOSYS; | ||
| 228 | } | ||
| 229 | EXPORT_SYMBOL(clk_set_parent); | ||
| 230 | |||
| 231 | static void clk_prcmu_enable(struct clk *clk) | ||
| 232 | { | ||
| 233 | void __iomem *cg_set_reg = __io_address(U8500_PRCMU_BASE) | ||
| 234 | + PRCM_YYCLKEN0_MGT_SET + clk->prcmu_cg_off; | ||
| 235 | |||
| 236 | writel(1 << clk->prcmu_cg_bit, cg_set_reg); | ||
| 237 | } | ||
| 238 | |||
| 239 | static void clk_prcmu_disable(struct clk *clk) | ||
| 240 | { | ||
| 241 | void __iomem *cg_clr_reg = __io_address(U8500_PRCMU_BASE) | ||
| 242 | + PRCM_YYCLKEN0_MGT_CLR + clk->prcmu_cg_off; | ||
| 243 | |||
| 244 | writel(1 << clk->prcmu_cg_bit, cg_clr_reg); | ||
| 245 | } | ||
| 246 | |||
| 247 | static struct clkops clk_prcmu_ops = { | ||
| 248 | .enable = clk_prcmu_enable, | ||
| 249 | .disable = clk_prcmu_disable, | ||
| 250 | }; | ||
| 251 | |||
| 252 | static unsigned int clkrst_base[] = { | ||
| 253 | [1] = U8500_CLKRST1_BASE, | ||
| 254 | [2] = U8500_CLKRST2_BASE, | ||
| 255 | [3] = U8500_CLKRST3_BASE, | ||
| 256 | [5] = U8500_CLKRST5_BASE, | ||
| 257 | [6] = U8500_CLKRST6_BASE, | ||
| 258 | }; | ||
| 259 | |||
| 260 | static void clk_prcc_enable(struct clk *clk) | ||
| 261 | { | ||
| 262 | void __iomem *addr = __io_address(clkrst_base[clk->cluster]); | ||
| 263 | |||
| 264 | if (clk->prcc_kernel != -1) | ||
| 265 | writel(1 << clk->prcc_kernel, addr + PRCC_KCKEN); | ||
| 266 | |||
| 267 | if (clk->prcc_bus != -1) | ||
| 268 | writel(1 << clk->prcc_bus, addr + PRCC_PCKEN); | ||
| 269 | } | ||
| 270 | |||
| 271 | static void clk_prcc_disable(struct clk *clk) | ||
| 272 | { | ||
| 273 | void __iomem *addr = __io_address(clkrst_base[clk->cluster]); | ||
| 274 | |||
| 275 | if (clk->prcc_bus != -1) | ||
| 276 | writel(1 << clk->prcc_bus, addr + PRCC_PCKDIS); | ||
| 277 | |||
| 278 | if (clk->prcc_kernel != -1) | ||
| 279 | writel(1 << clk->prcc_kernel, addr + PRCC_KCKDIS); | ||
| 280 | } | ||
| 281 | |||
| 282 | static struct clkops clk_prcc_ops = { | ||
| 283 | .enable = clk_prcc_enable, | ||
| 284 | .disable = clk_prcc_disable, | ||
| 285 | }; | ||
| 286 | |||
| 287 | static struct clk clk_32khz = { | ||
| 288 | .name = "clk_32khz", | ||
| 289 | .rate = 32000, | ||
| 290 | }; | ||
| 291 | |||
| 292 | /* | ||
| 293 | * PRCMU level clock gating | ||
| 294 | */ | ||
| 295 | |||
| 296 | /* Bank 0 */ | ||
| 297 | static DEFINE_PRCMU_CLK(svaclk, 0x0, 2, SVAMMDSPCLK); | ||
| 298 | static DEFINE_PRCMU_CLK(siaclk, 0x0, 3, SIAMMDSPCLK); | ||
| 299 | static DEFINE_PRCMU_CLK(sgaclk, 0x0, 4, SGACLK); | ||
| 300 | static DEFINE_PRCMU_CLK_RATE(uartclk, 0x0, 5, UARTCLK, 38400000); | ||
| 301 | static DEFINE_PRCMU_CLK(msp02clk, 0x0, 6, MSP02CLK); | ||
| 302 | static DEFINE_PRCMU_CLK(msp1clk, 0x0, 7, MSP1CLK); /* v1 */ | ||
| 303 | static DEFINE_PRCMU_CLK_RATE(i2cclk, 0x0, 8, I2CCLK, 48000000); | ||
| 304 | static DEFINE_PRCMU_CLK_RATE(sdmmcclk, 0x0, 9, SDMMCCLK, 100000000); | ||
| 305 | static DEFINE_PRCMU_CLK(slimclk, 0x0, 10, SLIMCLK); | ||
| 306 | static DEFINE_PRCMU_CLK(per1clk, 0x0, 11, PER1CLK); | ||
| 307 | static DEFINE_PRCMU_CLK(per2clk, 0x0, 12, PER2CLK); | ||
| 308 | static DEFINE_PRCMU_CLK(per3clk, 0x0, 13, PER3CLK); | ||
| 309 | static DEFINE_PRCMU_CLK(per5clk, 0x0, 14, PER5CLK); | ||
| 310 | static DEFINE_PRCMU_CLK_RATE(per6clk, 0x0, 15, PER6CLK, 133330000); | ||
| 311 | static DEFINE_PRCMU_CLK(lcdclk, 0x0, 17, LCDCLK); | ||
| 312 | static DEFINE_PRCMU_CLK(bmlclk, 0x0, 18, BMLCLK); | ||
| 313 | static DEFINE_PRCMU_CLK(hsitxclk, 0x0, 19, HSITXCLK); | ||
| 314 | static DEFINE_PRCMU_CLK(hsirxclk, 0x0, 20, HSIRXCLK); | ||
| 315 | static DEFINE_PRCMU_CLK(hdmiclk, 0x0, 21, HDMICLK); | ||
| 316 | static DEFINE_PRCMU_CLK(apeatclk, 0x0, 22, APEATCLK); | ||
| 317 | static DEFINE_PRCMU_CLK(apetraceclk, 0x0, 23, APETRACECLK); | ||
| 318 | static DEFINE_PRCMU_CLK(mcdeclk, 0x0, 24, MCDECLK); | ||
| 319 | static DEFINE_PRCMU_CLK(ipi2clk, 0x0, 25, IPI2CCLK); | ||
| 320 | static DEFINE_PRCMU_CLK(dsialtclk, 0x0, 26, DSIALTCLK); /* v1 */ | ||
| 321 | static DEFINE_PRCMU_CLK(dmaclk, 0x0, 27, DMACLK); | ||
| 322 | static DEFINE_PRCMU_CLK(b2r2clk, 0x0, 28, B2R2CLK); | ||
| 323 | static DEFINE_PRCMU_CLK(tvclk, 0x0, 29, TVCLK); | ||
| 324 | static DEFINE_PRCMU_CLK(uniproclk, 0x0, 30, UNIPROCLK); /* v1 */ | ||
| 325 | static DEFINE_PRCMU_CLK_RATE(sspclk, 0x0, 31, SSPCLK, 48000000); /* v1 */ | ||
| 326 | |||
| 327 | /* Bank 1 */ | ||
| 328 | static DEFINE_PRCMU_CLK(rngclk, 0x4, 0, RNGCLK); /* v1 */ | ||
| 329 | static DEFINE_PRCMU_CLK(uiccclk, 0x4, 1, UICCCLK); /* v1 */ | ||
| 330 | |||
| 331 | /* | ||
| 332 | * PRCC level clock gating | ||
| 333 | * Format: per#, clk, PCKEN bit, KCKEN bit, parent | ||
| 334 | */ | ||
| 335 | |||
| 336 | /* Peripheral Cluster #1 */ | ||
| 337 | static DEFINE_PRCC_CLK(1, msp3, 11, 10, &clk_msp1clk); | ||
| 338 | static DEFINE_PRCC_CLK(1, i2c4, 10, 9, &clk_i2cclk); | ||
| 339 | static DEFINE_PRCC_CLK(1, gpio0, 9, -1, NULL); | ||
| 340 | static DEFINE_PRCC_CLK(1, slimbus0, 8, 8, &clk_slimclk); | ||
| 341 | static DEFINE_PRCC_CLK(1, spi3, 7, -1, NULL); | ||
| 342 | static DEFINE_PRCC_CLK(1, i2c2, 6, 6, &clk_i2cclk); | ||
| 343 | static DEFINE_PRCC_CLK(1, sdi0, 5, 5, &clk_sdmmcclk); | ||
| 344 | static DEFINE_PRCC_CLK(1, msp1, 4, 4, &clk_msp1clk); | ||
| 345 | static DEFINE_PRCC_CLK(1, msp0, 3, 3, &clk_msp02clk); | ||
| 346 | static DEFINE_PRCC_CLK(1, i2c1, 2, 2, &clk_i2cclk); | ||
| 347 | static DEFINE_PRCC_CLK(1, uart1, 1, 1, &clk_uartclk); | ||
| 348 | static DEFINE_PRCC_CLK(1, uart0, 0, 0, &clk_uartclk); | ||
| 349 | |||
| 350 | /* Peripheral Cluster #2 */ | ||
| 351 | static DEFINE_PRCC_CLK(2, gpio1, 11, -1, NULL); | ||
| 352 | static DEFINE_PRCC_CLK(2, ssitx, 10, 7, NULL); | ||
| 353 | static DEFINE_PRCC_CLK(2, ssirx, 9, 6, NULL); | ||
| 354 | static DEFINE_PRCC_CLK(2, spi0, 8, -1, NULL); | ||
| 355 | static DEFINE_PRCC_CLK(2, sdi3, 7, 5, &clk_sdmmcclk); | ||
| 356 | static DEFINE_PRCC_CLK(2, sdi1, 6, 4, &clk_sdmmcclk); | ||
| 357 | static DEFINE_PRCC_CLK(2, msp2, 5, 3, &clk_msp02clk); | ||
| 358 | static DEFINE_PRCC_CLK(2, sdi4, 4, 2, &clk_sdmmcclk); | ||
| 359 | static DEFINE_PRCC_CLK(2, pwl, 3, 1, NULL); | ||
| 360 | static DEFINE_PRCC_CLK(2, spi1, 2, -1, NULL); | ||
| 361 | static DEFINE_PRCC_CLK(2, spi2, 1, -1, NULL); | ||
| 362 | static DEFINE_PRCC_CLK(2, i2c3, 0, 0, &clk_i2cclk); | ||
| 363 | |||
| 364 | /* Peripheral Cluster #3 */ | ||
| 365 | static DEFINE_PRCC_CLK(3, gpio2, 8, -1, NULL); | ||
| 366 | static DEFINE_PRCC_CLK(3, sdi5, 7, 7, &clk_sdmmcclk); | ||
| 367 | static DEFINE_PRCC_CLK(3, uart2, 6, 6, &clk_uartclk); | ||
| 368 | static DEFINE_PRCC_CLK(3, ske, 5, 5, &clk_32khz); | ||
| 369 | static DEFINE_PRCC_CLK(3, sdi2, 4, 4, &clk_sdmmcclk); | ||
| 370 | static DEFINE_PRCC_CLK(3, i2c0, 3, 3, &clk_i2cclk); | ||
| 371 | static DEFINE_PRCC_CLK(3, ssp1, 2, 2, &clk_sspclk); | ||
| 372 | static DEFINE_PRCC_CLK(3, ssp0, 1, 1, &clk_sspclk); | ||
| 373 | static DEFINE_PRCC_CLK(3, fsmc, 0, -1, NULL); | ||
| 374 | |||
| 375 | /* Peripheral Cluster #4 is in the always on domain */ | ||
| 376 | |||
| 377 | /* Peripheral Cluster #5 */ | ||
| 378 | static DEFINE_PRCC_CLK(5, gpio3, 1, -1, NULL); | ||
| 379 | static DEFINE_PRCC_CLK(5, usb, 0, 0, NULL); | ||
| 380 | |||
| 381 | /* Peripheral Cluster #6 */ | ||
| 382 | |||
| 383 | /* MTU ID in data */ | ||
| 384 | static DEFINE_PRCC_CLK_CUSTOM(6, mtu1, 9, -1, NULL, clk_mtu_get_rate, 1); | ||
| 385 | static DEFINE_PRCC_CLK_CUSTOM(6, mtu0, 8, -1, NULL, clk_mtu_get_rate, 0); | ||
| 386 | static DEFINE_PRCC_CLK(6, cfgreg, 7, 7, NULL); | ||
| 387 | static DEFINE_PRCC_CLK(6, hash1, 6, -1, NULL); | ||
| 388 | static DEFINE_PRCC_CLK(6, unipro, 5, 1, &clk_uniproclk); | ||
| 389 | static DEFINE_PRCC_CLK(6, pka, 4, -1, NULL); | ||
| 390 | static DEFINE_PRCC_CLK(6, hash0, 3, -1, NULL); | ||
| 391 | static DEFINE_PRCC_CLK(6, cryp0, 2, -1, NULL); | ||
| 392 | static DEFINE_PRCC_CLK(6, cryp1, 1, -1, NULL); | ||
| 393 | static DEFINE_PRCC_CLK(6, rng, 0, 0, &clk_rngclk); | ||
| 394 | |||
| 395 | static struct clk clk_dummy_apb_pclk = { | ||
| 396 | .name = "apb_pclk", | ||
| 397 | }; | ||
| 398 | |||
| 399 | static struct clk_lookup u8500_clks[] = { | ||
| 400 | CLK(dummy_apb_pclk, NULL, "apb_pclk"), | ||
| 401 | |||
| 402 | /* Peripheral Cluster #1 */ | ||
| 403 | CLK(gpio0, "gpio.0", NULL), | ||
| 404 | CLK(gpio0, "gpio.1", NULL), | ||
| 405 | CLK(slimbus0, "slimbus0", NULL), | ||
| 406 | CLK(i2c2, "nmk-i2c.2", NULL), | ||
| 407 | CLK(sdi0, "sdi0", NULL), | ||
| 408 | CLK(msp0, "ux500-msp-i2s.0", NULL), | ||
| 409 | CLK(i2c1, "nmk-i2c.1", NULL), | ||
| 410 | CLK(uart1, "uart1", NULL), | ||
| 411 | CLK(uart0, "uart0", NULL), | ||
| 412 | |||
| 413 | /* Peripheral Cluster #3 */ | ||
| 414 | CLK(gpio2, "gpio.2", NULL), | ||
| 415 | CLK(gpio2, "gpio.3", NULL), | ||
| 416 | CLK(gpio2, "gpio.4", NULL), | ||
| 417 | CLK(gpio2, "gpio.5", NULL), | ||
| 418 | CLK(sdi5, "sdi5", NULL), | ||
| 419 | CLK(uart2, "uart2", NULL), | ||
| 420 | CLK(ske, "ske", NULL), | ||
| 421 | CLK(ske, "nmk-ske-keypad", NULL), | ||
| 422 | CLK(sdi2, "sdi2", NULL), | ||
| 423 | CLK(i2c0, "nmk-i2c.0", NULL), | ||
| 424 | CLK(fsmc, "fsmc", NULL), | ||
| 425 | |||
| 426 | /* Peripheral Cluster #5 */ | ||
| 427 | CLK(gpio3, "gpio.8", NULL), | ||
| 428 | |||
| 429 | /* Peripheral Cluster #6 */ | ||
| 430 | CLK(hash1, "hash1", NULL), | ||
| 431 | CLK(pka, "pka", NULL), | ||
| 432 | CLK(hash0, "hash0", NULL), | ||
| 433 | CLK(cryp0, "cryp0", NULL), | ||
| 434 | CLK(cryp1, "cryp1", NULL), | ||
| 435 | |||
| 436 | /* PRCMU level clock gating */ | ||
| 437 | |||
| 438 | /* Bank 0 */ | ||
| 439 | CLK(svaclk, "sva", NULL), | ||
| 440 | CLK(siaclk, "sia", NULL), | ||
| 441 | CLK(sgaclk, "sga", NULL), | ||
| 442 | CLK(slimclk, "slim", NULL), | ||
| 443 | CLK(lcdclk, "lcd", NULL), | ||
| 444 | CLK(bmlclk, "bml", NULL), | ||
| 445 | CLK(hsitxclk, "stm-hsi.0", NULL), | ||
| 446 | CLK(hsirxclk, "stm-hsi.1", NULL), | ||
| 447 | CLK(hdmiclk, "hdmi", NULL), | ||
| 448 | CLK(apeatclk, "apeat", NULL), | ||
| 449 | CLK(apetraceclk, "apetrace", NULL), | ||
| 450 | CLK(mcdeclk, "mcde", NULL), | ||
| 451 | CLK(ipi2clk, "ipi2", NULL), | ||
| 452 | CLK(dmaclk, "dma40.0", NULL), | ||
| 453 | CLK(b2r2clk, "b2r2", NULL), | ||
| 454 | CLK(tvclk, "tv", NULL), | ||
| 455 | |||
| 456 | /* Peripheral Cluster #1 */ | ||
| 457 | CLK(i2c4, "nmk-i2c.4", NULL), | ||
| 458 | CLK(spi3, "spi3", NULL), | ||
| 459 | CLK(msp1, "ux500-msp-i2s.1", NULL), | ||
| 460 | CLK(msp3, "ux500-msp-i2s.3", NULL), | ||
| 461 | |||
| 462 | /* Peripheral Cluster #2 */ | ||
| 463 | CLK(gpio1, "gpio.6", NULL), | ||
| 464 | CLK(gpio1, "gpio.7", NULL), | ||
| 465 | CLK(ssitx, "ssitx", NULL), | ||
| 466 | CLK(ssirx, "ssirx", NULL), | ||
| 467 | CLK(spi0, "spi0", NULL), | ||
| 468 | CLK(sdi3, "sdi3", NULL), | ||
| 469 | CLK(sdi1, "sdi1", NULL), | ||
| 470 | CLK(msp2, "ux500-msp-i2s.2", NULL), | ||
| 471 | CLK(sdi4, "sdi4", NULL), | ||
| 472 | CLK(pwl, "pwl", NULL), | ||
| 473 | CLK(spi1, "spi1", NULL), | ||
| 474 | CLK(spi2, "spi2", NULL), | ||
| 475 | CLK(i2c3, "nmk-i2c.3", NULL), | ||
| 476 | |||
| 477 | /* Peripheral Cluster #3 */ | ||
| 478 | CLK(ssp1, "ssp1", NULL), | ||
| 479 | CLK(ssp0, "ssp0", NULL), | ||
| 480 | |||
| 481 | /* Peripheral Cluster #5 */ | ||
| 482 | CLK(usb, "musb-ux500.0", "usb"), | ||
| 483 | |||
| 484 | /* Peripheral Cluster #6 */ | ||
| 485 | CLK(mtu1, "mtu1", NULL), | ||
| 486 | CLK(mtu0, "mtu0", NULL), | ||
| 487 | CLK(cfgreg, "cfgreg", NULL), | ||
| 488 | CLK(hash1, "hash1", NULL), | ||
| 489 | CLK(unipro, "unipro", NULL), | ||
| 490 | CLK(rng, "rng", NULL), | ||
| 491 | |||
| 492 | /* PRCMU level clock gating */ | ||
| 493 | |||
| 494 | /* Bank 0 */ | ||
| 495 | CLK(uniproclk, "uniproclk", NULL), | ||
| 496 | CLK(dsialtclk, "dsialt", NULL), | ||
| 497 | |||
| 498 | /* Bank 1 */ | ||
| 499 | CLK(rngclk, "rng", NULL), | ||
| 500 | CLK(uiccclk, "uicc", NULL), | ||
| 501 | }; | ||
| 502 | |||
| 503 | #ifdef CONFIG_DEBUG_FS | ||
| 504 | /* | ||
| 505 | * debugfs support to trace clock tree hierarchy and attributes with | ||
| 506 | * powerdebug | ||
| 507 | */ | ||
| 508 | static struct dentry *clk_debugfs_root; | ||
| 509 | |||
| 510 | void __init clk_debugfs_add_table(struct clk_lookup *cl, size_t num) | ||
| 511 | { | ||
| 512 | while (num--) { | ||
| 513 | /* Check that the clock has not been already registered */ | ||
| 514 | if (!(cl->clk->list.prev != cl->clk->list.next)) | ||
| 515 | list_add_tail(&cl->clk->list, &clk_list); | ||
| 516 | |||
| 517 | cl++; | ||
| 518 | } | ||
| 519 | } | ||
| 520 | |||
| 521 | static ssize_t usecount_dbg_read(struct file *file, char __user *buf, | ||
| 522 | size_t size, loff_t *off) | ||
| 523 | { | ||
| 524 | struct clk *clk = file->f_dentry->d_inode->i_private; | ||
| 525 | char cusecount[128]; | ||
| 526 | unsigned int len; | ||
| 527 | |||
| 528 | len = sprintf(cusecount, "%u\n", clk->enabled); | ||
| 529 | return simple_read_from_buffer(buf, size, off, cusecount, len); | ||
| 530 | } | ||
| 531 | |||
| 532 | static ssize_t rate_dbg_read(struct file *file, char __user *buf, | ||
| 533 | size_t size, loff_t *off) | ||
| 534 | { | ||
| 535 | struct clk *clk = file->f_dentry->d_inode->i_private; | ||
| 536 | char crate[128]; | ||
| 537 | unsigned int rate; | ||
| 538 | unsigned int len; | ||
| 539 | |||
| 540 | rate = clk_get_rate(clk); | ||
| 541 | len = sprintf(crate, "%u\n", rate); | ||
| 542 | return simple_read_from_buffer(buf, size, off, crate, len); | ||
| 543 | } | ||
| 544 | |||
| 545 | static const struct file_operations usecount_fops = { | ||
| 546 | .read = usecount_dbg_read, | ||
| 547 | }; | ||
| 548 | |||
| 549 | static const struct file_operations set_rate_fops = { | ||
| 550 | .read = rate_dbg_read, | ||
| 551 | }; | ||
| 552 | |||
| 553 | static struct dentry *clk_debugfs_register_dir(struct clk *c, | ||
| 554 | struct dentry *p_dentry) | ||
| 555 | { | ||
| 556 | struct dentry *d, *clk_d; | ||
| 557 | const char *p = c->name; | ||
| 558 | |||
| 559 | if (!p) | ||
| 560 | p = "BUG"; | ||
| 561 | |||
| 562 | clk_d = debugfs_create_dir(p, p_dentry); | ||
| 563 | if (!clk_d) | ||
| 564 | return NULL; | ||
| 565 | |||
| 566 | d = debugfs_create_file("usecount", S_IRUGO, | ||
| 567 | clk_d, c, &usecount_fops); | ||
| 568 | if (!d) | ||
| 569 | goto err_out; | ||
| 570 | d = debugfs_create_file("rate", S_IRUGO, | ||
| 571 | clk_d, c, &set_rate_fops); | ||
| 572 | if (!d) | ||
| 573 | goto err_out; | ||
| 574 | /* | ||
| 575 | * TODO : not currently available in ux500 | ||
| 576 | * d = debugfs_create_x32("flags", S_IRUGO, clk_d, (u32 *)&c->flags); | ||
| 577 | * if (!d) | ||
| 578 | * goto err_out; | ||
| 579 | */ | ||
| 580 | |||
| 581 | return clk_d; | ||
| 582 | |||
| 583 | err_out: | ||
| 584 | debugfs_remove_recursive(clk_d); | ||
| 585 | return NULL; | ||
| 586 | } | ||
| 587 | |||
| 588 | static int clk_debugfs_register_one(struct clk *c) | ||
| 589 | { | ||
| 590 | struct clk *pa = c->parent_periph; | ||
| 591 | struct clk *bpa = c->parent_cluster; | ||
| 592 | |||
| 593 | if (!(bpa && !pa)) { | ||
| 594 | c->dent = clk_debugfs_register_dir(c, | ||
| 595 | pa ? pa->dent : clk_debugfs_root); | ||
| 596 | if (!c->dent) | ||
| 597 | return -ENOMEM; | ||
| 598 | } | ||
| 599 | |||
| 600 | if (bpa) { | ||
| 601 | c->dent_bus = clk_debugfs_register_dir(c, | ||
| 602 | bpa->dent_bus ? bpa->dent_bus : bpa->dent); | ||
| 603 | if ((!c->dent_bus) && (c->dent)) { | ||
| 604 | debugfs_remove_recursive(c->dent); | ||
| 605 | c->dent = NULL; | ||
| 606 | return -ENOMEM; | ||
| 607 | } | ||
| 608 | } | ||
| 609 | return 0; | ||
| 610 | } | ||
| 611 | |||
| 612 | static int clk_debugfs_register(struct clk *c) | ||
| 613 | { | ||
| 614 | int err; | ||
| 615 | struct clk *pa = c->parent_periph; | ||
| 616 | struct clk *bpa = c->parent_cluster; | ||
| 617 | |||
| 618 | if (pa && (!pa->dent && !pa->dent_bus)) { | ||
| 619 | err = clk_debugfs_register(pa); | ||
| 620 | if (err) | ||
| 621 | return err; | ||
| 622 | } | ||
| 623 | |||
| 624 | if (bpa && (!bpa->dent && !bpa->dent_bus)) { | ||
| 625 | err = clk_debugfs_register(bpa); | ||
| 626 | if (err) | ||
| 627 | return err; | ||
| 628 | } | ||
| 629 | |||
| 630 | if ((!c->dent) && (!c->dent_bus)) { | ||
| 631 | err = clk_debugfs_register_one(c); | ||
| 632 | if (err) | ||
| 633 | return err; | ||
| 634 | } | ||
| 635 | return 0; | ||
| 636 | } | ||
| 637 | |||
| 638 | int __init clk_debugfs_init(void) | ||
| 639 | { | ||
| 640 | struct clk *c; | ||
| 641 | struct dentry *d; | ||
| 642 | int err; | ||
| 643 | |||
| 644 | d = debugfs_create_dir("clock", NULL); | ||
| 645 | if (!d) | ||
| 646 | return -ENOMEM; | ||
| 647 | clk_debugfs_root = d; | ||
| 648 | |||
| 649 | list_for_each_entry(c, &clk_list, list) { | ||
| 650 | err = clk_debugfs_register(c); | ||
| 651 | if (err) | ||
| 652 | goto err_out; | ||
| 653 | } | ||
| 654 | return 0; | ||
| 655 | err_out: | ||
| 656 | debugfs_remove_recursive(clk_debugfs_root); | ||
| 657 | return err; | ||
| 658 | } | ||
| 659 | |||
| 660 | #endif /* defined(CONFIG_DEBUG_FS) */ | ||
| 661 | |||
| 662 | unsigned long clk_smp_twd_rate = 500000000; | ||
| 663 | |||
| 664 | unsigned long clk_smp_twd_get_rate(struct clk *clk) | ||
| 665 | { | ||
| 666 | return clk_smp_twd_rate; | ||
| 667 | } | ||
| 668 | |||
| 669 | static struct clk clk_smp_twd = { | ||
| 670 | .get_rate = clk_smp_twd_get_rate, | ||
| 671 | .name = "smp_twd", | ||
| 672 | }; | ||
| 673 | |||
| 674 | static struct clk_lookup clk_smp_twd_lookup = { | ||
| 675 | .dev_id = "smp_twd", | ||
| 676 | .clk = &clk_smp_twd, | ||
| 677 | }; | ||
| 678 | |||
| 679 | #ifdef CONFIG_CPU_FREQ | ||
| 680 | |||
| 681 | static int clk_twd_cpufreq_transition(struct notifier_block *nb, | ||
| 682 | unsigned long state, void *data) | ||
| 683 | { | ||
| 684 | struct cpufreq_freqs *f = data; | ||
| 685 | |||
| 686 | if (state == CPUFREQ_PRECHANGE) { | ||
| 687 | /* Save frequency in simple Hz */ | ||
| 688 | clk_smp_twd_rate = (f->new * 1000) / 2; | ||
| 689 | } | ||
| 690 | |||
| 691 | return NOTIFY_OK; | ||
| 692 | } | ||
| 693 | |||
| 694 | static struct notifier_block clk_twd_cpufreq_nb = { | ||
| 695 | .notifier_call = clk_twd_cpufreq_transition, | ||
| 696 | }; | ||
| 697 | |||
| 698 | int clk_init_smp_twd_cpufreq(void) | ||
| 699 | { | ||
| 700 | return cpufreq_register_notifier(&clk_twd_cpufreq_nb, | ||
| 701 | CPUFREQ_TRANSITION_NOTIFIER); | ||
| 702 | } | ||
| 703 | |||
| 704 | #endif | ||
| 705 | |||
| 706 | int __init clk_init(void) | ||
| 707 | { | ||
| 708 | clkdev_add_table(u8500_clks, ARRAY_SIZE(u8500_clks)); | ||
| 709 | clkdev_add(&clk_smp_twd_lookup); | ||
| 710 | |||
| 711 | #ifdef CONFIG_DEBUG_FS | ||
| 712 | clk_debugfs_add_table(u8500_clks, ARRAY_SIZE(u8500_clks)); | ||
| 713 | #endif | ||
| 714 | return 0; | ||
| 715 | } | ||
diff --git a/arch/arm/mach-ux500/clock.h b/arch/arm/mach-ux500/clock.h deleted file mode 100644 index 65d27a13f46d..000000000000 --- a/arch/arm/mach-ux500/clock.h +++ /dev/null | |||
| @@ -1,164 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2010 ST-Ericsson | ||
| 3 | * Copyright (C) 2009 STMicroelectronics | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify | ||
| 6 | * it under the terms of the GNU General Public License version 2 as | ||
| 7 | * published by the Free Software Foundation. | ||
| 8 | */ | ||
| 9 | |||
| 10 | /** | ||
| 11 | * struct clkops - ux500 clock operations | ||
| 12 | * @enable: function to enable the clock | ||
| 13 | * @disable: function to disable the clock | ||
| 14 | * @get_rate: function to get the current clock rate | ||
| 15 | * | ||
| 16 | * This structure contains function pointers to functions that will be used to | ||
| 17 | * control the clock. All of these functions are optional. If get_rate is | ||
| 18 | * NULL, the rate in the struct clk will be used. | ||
| 19 | */ | ||
| 20 | struct clkops { | ||
| 21 | void (*enable) (struct clk *); | ||
| 22 | void (*disable) (struct clk *); | ||
| 23 | unsigned long (*get_rate) (struct clk *); | ||
| 24 | int (*set_parent)(struct clk *, struct clk *); | ||
| 25 | }; | ||
| 26 | |||
| 27 | /** | ||
| 28 | * struct clk - ux500 clock structure | ||
| 29 | * @ops: pointer to clkops struct used to control this clock | ||
| 30 | * @name: name, for debugging | ||
| 31 | * @enabled: refcount. positive if enabled, zero if disabled | ||
| 32 | * @get_rate: custom callback for getting the clock rate | ||
| 33 | * @data: custom per-clock data for example for the get_rate | ||
| 34 | * callback | ||
| 35 | * @rate: fixed rate for clocks which don't implement | ||
| 36 | * ops->getrate | ||
| 37 | * @prcmu_cg_off: address offset of the combined enable/disable register | ||
| 38 | * (used on u8500v1) | ||
| 39 | * @prcmu_cg_bit: bit in the combined enable/disable register (used on | ||
| 40 | * u8500v1) | ||
| 41 | * @prcmu_cg_mgt: address of the enable/disable register (used on | ||
| 42 | * u8500ed) | ||
| 43 | * @cluster: peripheral cluster number | ||
| 44 | * @prcc_bus: bit for the bus clock in the peripheral's CLKRST | ||
| 45 | * @prcc_kernel: bit for the kernel clock in the peripheral's CLKRST. | ||
| 46 | * -1 if no kernel clock exists. | ||
| 47 | * @parent_cluster: pointer to parent's cluster clk struct | ||
| 48 | * @parent_periph: pointer to parent's peripheral clk struct | ||
| 49 | * | ||
| 50 | * Peripherals are organised into clusters, and each cluster has an associated | ||
| 51 | * bus clock. Some peripherals also have a parent peripheral clock. | ||
| 52 | * | ||
| 53 | * In order to enable a clock for a peripheral, we need to enable: | ||
| 54 | * (1) the parent cluster (bus) clock at the PRCMU level | ||
| 55 | * (2) the parent peripheral clock (if any) at the PRCMU level | ||
| 56 | * (3) the peripheral's bus & kernel clock at the PRCC level | ||
| 57 | * | ||
| 58 | * (1) and (2) are handled by defining clk structs (DEFINE_PRCMU_CLK) for each | ||
| 59 | * of the cluster and peripheral clocks, and hooking these as the parents of | ||
| 60 | * the individual peripheral clocks. | ||
| 61 | * | ||
| 62 | * (3) is handled by specifying the bits in the PRCC control registers required | ||
| 63 | * to enable these clocks and modifying them in the ->enable and | ||
| 64 | * ->disable callbacks of the peripheral clocks (DEFINE_PRCC_CLK). | ||
| 65 | * | ||
| 66 | * This structure describes both the PRCMU-level clocks and PRCC-level clocks. | ||
| 67 | * The prcmu_* fields are only used for the PRCMU clocks, and the cluster, | ||
| 68 | * prcc, and parent pointers are only used for the PRCC-level clocks. | ||
| 69 | */ | ||
| 70 | struct clk { | ||
| 71 | const struct clkops *ops; | ||
| 72 | const char *name; | ||
| 73 | unsigned int enabled; | ||
| 74 | unsigned long (*get_rate)(struct clk *); | ||
| 75 | void *data; | ||
| 76 | |||
| 77 | unsigned long rate; | ||
| 78 | struct list_head list; | ||
| 79 | |||
| 80 | /* These three are only for PRCMU clks */ | ||
| 81 | |||
| 82 | unsigned int prcmu_cg_off; | ||
| 83 | unsigned int prcmu_cg_bit; | ||
| 84 | unsigned int prcmu_cg_mgt; | ||
| 85 | |||
| 86 | /* The rest are only for PRCC clks */ | ||
| 87 | |||
| 88 | int cluster; | ||
| 89 | unsigned int prcc_bus; | ||
| 90 | unsigned int prcc_kernel; | ||
| 91 | |||
| 92 | struct clk *parent_cluster; | ||
| 93 | struct clk *parent_periph; | ||
| 94 | #if defined(CONFIG_DEBUG_FS) | ||
| 95 | struct dentry *dent; /* For visible tree hierarchy */ | ||
| 96 | struct dentry *dent_bus; /* For visible tree hierarchy */ | ||
| 97 | #endif | ||
| 98 | }; | ||
| 99 | |||
| 100 | #define DEFINE_PRCMU_CLK(_name, _cg_off, _cg_bit, _reg) \ | ||
| 101 | struct clk clk_##_name = { \ | ||
| 102 | .name = #_name, \ | ||
| 103 | .ops = &clk_prcmu_ops, \ | ||
| 104 | .prcmu_cg_off = _cg_off, \ | ||
| 105 | .prcmu_cg_bit = _cg_bit, \ | ||
| 106 | .prcmu_cg_mgt = PRCM_##_reg##_MGT \ | ||
| 107 | } | ||
| 108 | |||
| 109 | #define DEFINE_PRCMU_CLK_RATE(_name, _cg_off, _cg_bit, _reg, _rate) \ | ||
| 110 | struct clk clk_##_name = { \ | ||
| 111 | .name = #_name, \ | ||
| 112 | .ops = &clk_prcmu_ops, \ | ||
| 113 | .prcmu_cg_off = _cg_off, \ | ||
| 114 | .prcmu_cg_bit = _cg_bit, \ | ||
| 115 | .rate = _rate, \ | ||
| 116 | .prcmu_cg_mgt = PRCM_##_reg##_MGT \ | ||
| 117 | } | ||
| 118 | |||
| 119 | #define DEFINE_PRCC_CLK(_pclust, _name, _bus_en, _kernel_en, _kernclk) \ | ||
| 120 | struct clk clk_##_name = { \ | ||
| 121 | .name = #_name, \ | ||
| 122 | .ops = &clk_prcc_ops, \ | ||
| 123 | .cluster = _pclust, \ | ||
| 124 | .prcc_bus = _bus_en, \ | ||
| 125 | .prcc_kernel = _kernel_en, \ | ||
| 126 | .parent_cluster = &clk_per##_pclust##clk, \ | ||
| 127 | .parent_periph = _kernclk \ | ||
| 128 | } | ||
| 129 | |||
| 130 | #define DEFINE_PRCC_CLK_CUSTOM(_pclust, _name, _bus_en, _kernel_en, _kernclk, _callback, _data) \ | ||
| 131 | struct clk clk_##_name = { \ | ||
| 132 | .name = #_name, \ | ||
| 133 | .ops = &clk_prcc_ops, \ | ||
| 134 | .cluster = _pclust, \ | ||
| 135 | .prcc_bus = _bus_en, \ | ||
| 136 | .prcc_kernel = _kernel_en, \ | ||
| 137 | .parent_cluster = &clk_per##_pclust##clk, \ | ||
| 138 | .parent_periph = _kernclk, \ | ||
| 139 | .get_rate = _callback, \ | ||
| 140 | .data = (void *) _data \ | ||
| 141 | } | ||
| 142 | |||
| 143 | |||
| 144 | #define CLK(_clk, _devname, _conname) \ | ||
| 145 | { \ | ||
| 146 | .clk = &clk_##_clk, \ | ||
| 147 | .dev_id = _devname, \ | ||
| 148 | .con_id = _conname, \ | ||
| 149 | } | ||
| 150 | |||
| 151 | int __init clk_db8500_ed_fixup(void); | ||
| 152 | int __init clk_init(void); | ||
| 153 | |||
| 154 | #ifdef CONFIG_DEBUG_FS | ||
| 155 | int clk_debugfs_init(void); | ||
| 156 | #else | ||
| 157 | static inline int clk_debugfs_init(void) { return 0; } | ||
| 158 | #endif | ||
| 159 | |||
| 160 | #ifdef CONFIG_CPU_FREQ | ||
| 161 | int clk_init_smp_twd_cpufreq(void); | ||
| 162 | #else | ||
| 163 | static inline int clk_init_smp_twd_cpufreq(void) { return 0; } | ||
| 164 | #endif | ||
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c index e2360e7c770d..17a78ec516ff 100644 --- a/arch/arm/mach-ux500/cpu.c +++ b/arch/arm/mach-ux500/cpu.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | 8 | ||
| 9 | #include <linux/platform_device.h> | 9 | #include <linux/platform_device.h> |
| 10 | #include <linux/io.h> | 10 | #include <linux/io.h> |
| 11 | #include <linux/clk.h> | ||
| 12 | #include <linux/mfd/db8500-prcmu.h> | 11 | #include <linux/mfd/db8500-prcmu.h> |
| 13 | #include <linux/clksrc-dbx500-prcmu.h> | 12 | #include <linux/clksrc-dbx500-prcmu.h> |
| 14 | #include <linux/sys_soc.h> | 13 | #include <linux/sys_soc.h> |
| @@ -17,6 +16,7 @@ | |||
| 17 | #include <linux/stat.h> | 16 | #include <linux/stat.h> |
| 18 | #include <linux/of.h> | 17 | #include <linux/of.h> |
| 19 | #include <linux/of_irq.h> | 18 | #include <linux/of_irq.h> |
| 19 | #include <linux/platform_data/clk-ux500.h> | ||
| 20 | 20 | ||
| 21 | #include <asm/hardware/gic.h> | 21 | #include <asm/hardware/gic.h> |
| 22 | #include <asm/mach/map.h> | 22 | #include <asm/mach/map.h> |
| @@ -25,8 +25,6 @@ | |||
| 25 | #include <mach/setup.h> | 25 | #include <mach/setup.h> |
| 26 | #include <mach/devices.h> | 26 | #include <mach/devices.h> |
| 27 | 27 | ||
| 28 | #include "clock.h" | ||
| 29 | |||
| 30 | void __iomem *_PRCMU_BASE; | 28 | void __iomem *_PRCMU_BASE; |
| 31 | 29 | ||
| 32 | /* | 30 | /* |
| @@ -70,13 +68,17 @@ void __init ux500_init_irq(void) | |||
| 70 | */ | 68 | */ |
| 71 | if (cpu_is_u8500_family()) | 69 | if (cpu_is_u8500_family()) |
| 72 | db8500_prcmu_early_init(); | 70 | db8500_prcmu_early_init(); |
| 73 | clk_init(); | 71 | |
| 72 | if (cpu_is_u8500_family()) | ||
| 73 | u8500_clk_init(); | ||
| 74 | else if (cpu_is_u9540()) | ||
| 75 | u9540_clk_init(); | ||
| 76 | else if (cpu_is_u8540()) | ||
| 77 | u8540_clk_init(); | ||
| 74 | } | 78 | } |
| 75 | 79 | ||
| 76 | void __init ux500_init_late(void) | 80 | void __init ux500_init_late(void) |
| 77 | { | 81 | { |
| 78 | clk_debugfs_init(); | ||
| 79 | clk_init_smp_twd_cpufreq(); | ||
| 80 | } | 82 | } |
| 81 | 83 | ||
| 82 | static const char * __init ux500_get_machine(void) | 84 | static const char * __init ux500_get_machine(void) |
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 649265152bca..d561825a87fc 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile | |||
| @@ -15,6 +15,7 @@ ifeq ($(CONFIG_COMMON_CLK), y) | |||
| 15 | obj-$(CONFIG_ARCH_MMP) += mmp/ | 15 | obj-$(CONFIG_ARCH_MMP) += mmp/ |
| 16 | endif | 16 | endif |
| 17 | obj-$(CONFIG_MACH_LOONGSON1) += clk-ls1x.o | 17 | obj-$(CONFIG_MACH_LOONGSON1) += clk-ls1x.o |
| 18 | obj-$(CONFIG_ARCH_U8500) += ux500/ | ||
| 18 | 19 | ||
| 19 | # Chip specific | 20 | # Chip specific |
| 20 | obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o | 21 | obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o |
