Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8f85523 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

parents cc22b4c1 aa3831cf

arch/arm/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ config ARCH_INTEGRATOR 
	select ARM_AMBA

	select ARCH_HAS_CPUFREQ

	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select ICST

	select GENERIC_CLOCKEVENTS

	select PLAT_VERSATILE
@@ -250,6 +251,7 @@ config ARCH_REALVIEW 
	bool "ARM Ltd. RealView family"

	select ARM_AMBA

	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select ICST

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -265,6 +267,7 @@ config ARCH_VERSATILE 
	select ARM_AMBA

	select ARM_VIC

	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select ICST

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -281,6 +284,7 @@ config ARCH_VEXPRESS 
	select ARM_AMBA

	select ARM_TIMER_SP804

	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select HAVE_PATA_PLATFORM
@@ -638,6 +642,7 @@ config ARCH_SHMOBILE 
	bool "Renesas SH-Mobile / R-Mobile"

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select GENERIC_CLOCKEVENTS

	select NO_IOPORT

	select SPARSE_IRQ
@@ -808,6 +813,7 @@ config ARCH_U300 
	select ARM_VIC

	select GENERIC_CLOCKEVENTS

	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select GENERIC_GPIO

	help

	  Support for ST-Ericsson U300 series mobile platforms.

arch/arm/include/asm/clkdev.h

+5 −0
Original line number Diff line number Diff line
@@ -14,7 +14,12 @@ 


#include <linux/slab.h>



#ifdef CONFIG_HAVE_MACH_CLKDEV

#include <mach/clkdev.h>

#else

#define __clk_get(clk)	({ 1; })

#define __clk_put(clk)	do { } while (0)

#endif



static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size)

{

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

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#ifndef __ASM_MACH_CLKDEV_H

#define __ASM_MACH_CLKDEV_H



#define __clk_get(clk) ({ 1; })

#define __clk_put(clk) do { } while (0)



#endif

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

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#ifndef __ASM_MACH_CLKDEV_H

#define __ASM_MACH_CLKDEV_H



#define __clk_get(clk) ({ 1; })

#define __clk_put(clk) do { } while (0)



#endif

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

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
#ifndef __MACH_CLKDEV_H

#define __MACH_CLKDEV_H



struct clk;



static inline int __clk_get(struct clk *clk)

{

	return 1;

}



static inline void __clk_put(struct clk *clk)

{

}



#endif