Merge branch 'cross-platform/clkdev' into next/cross-platform

+6

arch/arm/Kconfig

··· 239 239 select ARM_AMBA 240 240 select ARCH_HAS_CPUFREQ 241 241 select CLKDEV_LOOKUP 242 + select HAVE_MACH_CLKDEV 242 243 select ICST 243 244 select GENERIC_CLOCKEVENTS 244 245 select PLAT_VERSATILE ··· 251 250 bool "ARM Ltd. RealView family" 252 251 select ARM_AMBA 253 252 select CLKDEV_LOOKUP 253 + select HAVE_MACH_CLKDEV 254 254 select ICST 255 255 select GENERIC_CLOCKEVENTS 256 256 select ARCH_WANT_OPTIONAL_GPIOLIB ··· 267 265 select ARM_AMBA 268 266 select ARM_VIC 269 267 select CLKDEV_LOOKUP 268 + select HAVE_MACH_CLKDEV 270 269 select ICST 271 270 select GENERIC_CLOCKEVENTS 272 271 select ARCH_WANT_OPTIONAL_GPIOLIB ··· 284 281 select ARM_AMBA 285 282 select ARM_TIMER_SP804 286 283 select CLKDEV_LOOKUP 284 + select HAVE_MACH_CLKDEV 287 285 select GENERIC_CLOCKEVENTS 288 286 select HAVE_CLK 289 287 select HAVE_PATA_PLATFORM ··· 642 638 bool "Renesas SH-Mobile / R-Mobile" 643 639 select HAVE_CLK 644 640 select CLKDEV_LOOKUP 641 + select HAVE_MACH_CLKDEV 645 642 select GENERIC_CLOCKEVENTS 646 643 select NO_IOPORT 647 644 select SPARSE_IRQ ··· 813 808 select ARM_VIC 814 809 select GENERIC_CLOCKEVENTS 815 810 select CLKDEV_LOOKUP 811 + select HAVE_MACH_CLKDEV 816 812 select GENERIC_GPIO 817 813 help 818 814 Support for ST-Ericsson U300 series mobile platforms.

+5

arch/arm/include/asm/clkdev.h

··· 14 14 15 15 #include <linux/slab.h> 16 16 17 + #ifdef CONFIG_HAVE_MACH_CLKDEV 17 18 #include <mach/clkdev.h> 19 + #else 20 + #define __clk_get(clk) ({ 1; }) 21 + #define __clk_put(clk) do { } while (0) 22 + #endif 18 23 19 24 static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size) 20 25 {

-7

arch/arm/mach-at91/include/mach/clkdev.h

··· 1 - #ifndef __ASM_MACH_CLKDEV_H 2 - #define __ASM_MACH_CLKDEV_H 3 - 4 - #define __clk_get(clk) ({ 1; }) 5 - #define __clk_put(clk) do { } while (0) 6 - 7 - #endif

-7

arch/arm/mach-bcmring/include/mach/clkdev.h

··· 1 - #ifndef __ASM_MACH_CLKDEV_H 2 - #define __ASM_MACH_CLKDEV_H 3 - 4 - #define __clk_get(clk) ({ 1; }) 5 - #define __clk_put(clk) do { } while (0) 6 - 7 - #endif

-15

arch/arm/mach-davinci/include/mach/clkdev.h

··· 1 - #ifndef __MACH_CLKDEV_H 2 - #define __MACH_CLKDEV_H 3 - 4 - struct clk; 5 - 6 - static inline int __clk_get(struct clk *clk) 7 - { 8 - return 1; 9 - } 10 - 11 - static inline void __clk_put(struct clk *clk) 12 - { 13 - } 14 - 15 - #endif

-11

arch/arm/mach-ep93xx/include/mach/clkdev.h

··· 1 - /* 2 - * arch/arm/mach-ep93xx/include/mach/clkdev.h 3 - */ 4 - 5 - #ifndef __ASM_MACH_CLKDEV_H 6 - #define __ASM_MACH_CLKDEV_H 7 - 8 - #define __clk_get(clk) ({ 1; }) 9 - #define __clk_put(clk) do { } while (0) 10 - 11 - #endif

-25

arch/arm/mach-lpc32xx/include/mach/clkdev.h

··· 1 - /* 2 - * arch/arm/mach-lpc32xx/include/mach/clkdev.h 3 - * 4 - * Author: Kevin Wells <kevin.wells@nxp.com> 5 - * 6 - * Copyright (C) 2010 NXP Semiconductors 7 - * 8 - * This program is free software; you can redistribute it and/or modify 9 - * it under the terms of the GNU General Public License as published by 10 - * the Free Software Foundation; either version 2 of the License, or 11 - * (at your option) any later version. 12 - * 13 - * This program is distributed in the hope that it will be useful, 14 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 - * GNU General Public License for more details. 17 - */ 18 - 19 - #ifndef __ASM_ARCH_CLKDEV_H 20 - #define __ASM_ARCH_CLKDEV_H 21 - 22 - #define __clk_get(clk) ({ 1; }) 23 - #define __clk_put(clk) do { } while (0) 24 - 25 - #endif

-7

arch/arm/mach-mmp/include/mach/clkdev.h

··· 1 - #ifndef __ASM_MACH_CLKDEV_H 2 - #define __ASM_MACH_CLKDEV_H 3 - 4 - #define __clk_get(clk) ({ 1; }) 5 - #define __clk_put(clk) do { } while (0) 6 - 7 - #endif /* __ASM_MACH_CLKDEV_H */

-19

arch/arm/mach-msm/include/mach/clkdev.h

··· 1 - /* Copyright (c) 2011, Code Aurora Forum. All rights reserved. 2 - * 3 - * This program is free software; you can redistribute it and/or modify 4 - * it under the terms of the GNU General Public License version 2 and 5 - * only version 2 as published by the Free Software Foundation. 6 - * 7 - * This program is distributed in the hope that it will be useful, 8 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 9 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 - * GNU General Public License for more details. 11 - */ 12 - #ifndef __ASM_ARCH_MSM_CLKDEV_H 13 - #define __ASM_ARCH_MSM_CLKDEV_H 14 - 15 - struct clk; 16 - 17 - static inline int __clk_get(struct clk *clk) { return 1; } 18 - static inline void __clk_put(struct clk *clk) { } 19 - #endif

-7

arch/arm/mach-mxs/include/mach/clkdev.h

··· 1 - #ifndef __MACH_MXS_CLKDEV_H__ 2 - #define __MACH_MXS_CLKDEV_H__ 3 - 4 - #define __clk_get(clk) ({ 1; }) 5 - #define __clk_put(clk) do { } while (0) 6 - 7 - #endif

-7

arch/arm/mach-nomadik/include/mach/clkdev.h

··· 1 - #ifndef __ASM_MACH_CLKDEV_H 2 - #define __ASM_MACH_CLKDEV_H 3 - 4 - #define __clk_get(clk) ({ 1; }) 5 - #define __clk_put(clk) do { } while (0) 6 - 7 - #endif

-7

arch/arm/mach-nuc93x/include/mach/clkdev.h

··· 1 - #ifndef __ASM_MACH_CLKDEV_H 2 - #define __ASM_MACH_CLKDEV_H 3 - 4 - #define __clk_get(clk) ({ 1; }) 5 - #define __clk_put(clk) do { } while (0) 6 - 7 - #endif

-5

arch/arm/mach-omap1/include/mach/clkdev.h

··· 1 - /* 2 - * arch/arm/mach-omap1/include/mach/clkdev.h 3 - */ 4 - 5 - #include <plat/clkdev.h>

-5

arch/arm/mach-omap2/include/mach/clkdev.h

··· 1 - /* 2 - * arch/arm/mach-omap2/include/mach/clkdev.h 3 - */ 4 - 5 - #include <plat/clkdev.h>

-7

arch/arm/mach-pnx4008/include/mach/clkdev.h

··· 1 - #ifndef __ASM_MACH_CLKDEV_H 2 - #define __ASM_MACH_CLKDEV_H 3 - 4 - #define __clk_get(clk) ({ 1; }) 5 - #define __clk_put(clk) do { } while (0) 6 - 7 - #endif

-7

arch/arm/mach-pxa/include/mach/clkdev.h

··· 1 - #ifndef __ASM_MACH_CLKDEV_H 2 - #define __ASM_MACH_CLKDEV_H 3 - 4 - #define __clk_get(clk) ({ 1; }) 5 - #define __clk_put(clk) do { } while (0) 6 - 7 - #endif

-19

arch/arm/mach-spear3xx/include/mach/clkdev.h

··· 1 - /* 2 - * arch/arm/mach-spear3xx/include/mach/clkdev.h 3 - * 4 - * Clock Dev framework definitions for SPEAr3xx machine family 5 - * 6 - * Copyright (C) 2009 ST Microelectronics 7 - * Viresh Kumar<viresh.kumar@st.com> 8 - * 9 - * This file is licensed under the terms of the GNU General Public 10 - * License version 2. This program is licensed "as is" without any 11 - * warranty of any kind, whether express or implied. 12 - */ 13 - 14 - #ifndef __MACH_CLKDEV_H 15 - #define __MACH_CLKDEV_H 16 - 17 - #include <plat/clkdev.h> 18 - 19 - #endif /* __MACH_CLKDEV_H */

-19

arch/arm/mach-spear6xx/include/mach/clkdev.h

··· 1 - /* 2 - * arch/arm/mach-spear6xx/include/mach/clkdev.h 3 - * 4 - * Clock Dev framework definitions for SPEAr6xx machine family 5 - * 6 - * Copyright (C) 2009 ST Microelectronics 7 - * Viresh Kumar<viresh.kumar@st.com> 8 - * 9 - * This file is licensed under the terms of the GNU General Public 10 - * License version 2. This program is licensed "as is" without any 11 - * warranty of any kind, whether express or implied. 12 - */ 13 - 14 - #ifndef __MACH_CLKDEV_H 15 - #define __MACH_CLKDEV_H 16 - 17 - #include <plat/clkdev.h> 18 - 19 - #endif /* __MACH_CLKDEV_H */

-34

arch/arm/mach-tegra/include/mach/clkdev.h

··· 1 - /* 2 - * arch/arm/mach-tegra/include/mach/clkdev.h 3 - * 4 - * Copyright (C) 2010 Google, Inc. 5 - * 6 - * Author: 7 - * Colin Cross <ccross@google.com> 8 - * 9 - * This software is licensed under the terms of the GNU General Public 10 - * License version 2, as published by the Free Software Foundation, and 11 - * may be copied, distributed, and modified under those terms. 12 - * 13 - * This program is distributed in the hope that it will be useful, 14 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 - * GNU General Public License for more details. 17 - * 18 - */ 19 - 20 - #ifndef __MACH_CLKDEV_H 21 - #define __MACH_CLKDEV_H 22 - 23 - struct clk; 24 - 25 - static inline int __clk_get(struct clk *clk) 26 - { 27 - return 1; 28 - } 29 - 30 - static inline void __clk_put(struct clk *clk) 31 - { 32 - } 33 - 34 - #endif

-7

arch/arm/mach-ux500/include/mach/clkdev.h

··· 1 - #ifndef __ASM_MACH_CLKDEV_H 2 - #define __ASM_MACH_CLKDEV_H 3 - 4 - #define __clk_get(clk) ({ 1; }) 5 - #define __clk_put(clk) do { } while (0) 6 - 7 - #endif

-7

arch/arm/mach-w90x900/include/mach/clkdev.h

··· 1 - #ifndef __ASM_MACH_CLKDEV_H 2 - #define __ASM_MACH_CLKDEV_H 3 - 4 - #define __clk_get(clk) ({ 1; }) 5 - #define __clk_put(clk) do { } while (0) 6 - 7 - #endif

-7

arch/arm/plat-mxc/include/mach/clkdev.h

··· 1 - #ifndef __ASM_MACH_CLKDEV_H 2 - #define __ASM_MACH_CLKDEV_H 3 - 4 - #define __clk_get(clk) ({ 1; }) 5 - #define __clk_put(clk) do { } while (0) 6 - 7 - #endif

-13

arch/arm/plat-omap/include/plat/clkdev.h

··· 1 - #ifndef __MACH_CLKDEV_H 2 - #define __MACH_CLKDEV_H 3 - 4 - static inline int __clk_get(struct clk *clk) 5 - { 6 - return 1; 7 - } 8 - 9 - static inline void __clk_put(struct clk *clk) 10 - { 11 - } 12 - 13 - #endif

-20

arch/arm/plat-spear/include/plat/clkdev.h

··· 1 - /* 2 - * arch/arm/plat-spear/include/plat/clkdev.h 3 - * 4 - * Clock Dev framework definitions for SPEAr platform 5 - * 6 - * Copyright (C) 2009 ST Microelectronics 7 - * Viresh Kumar<viresh.kumar@st.com> 8 - * 9 - * This file is licensed under the terms of the GNU General Public 10 - * License version 2. This program is licensed "as is" without any 11 - * warranty of any kind, whether express or implied. 12 - */ 13 - 14 - #ifndef __PLAT_CLKDEV_H 15 - #define __PLAT_CLKDEV_H 16 - 17 - #define __clk_get(clk) ({ 1; }) 18 - #define __clk_put(clk) do { } while (0) 19 - 20 - #endif /* __PLAT_CLKDEV_H */

-7

arch/arm/plat-tcc/include/mach/clkdev.h

··· 1 - #ifndef __ASM_MACH_CLKDEV_H 2 - #define __ASM_MACH_CLKDEV_H 3 - 4 - #define __clk_get(clk) ({ 1; }) 5 - #define __clk_put(clk) do { } while (0) 6 - 7 - #endif

+3

drivers/clk/Kconfig

··· 2 2 config CLKDEV_LOOKUP 3 3 bool 4 4 select HAVE_CLK 5 + 6 + config HAVE_MACH_CLKDEV 7 + bool