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

Commit 6d803ba7 authored by Jean-Christop PLAGNIOL-VILLARD's avatar Jean-Christop PLAGNIOL-VILLARD Committed by Russell King
Browse files

ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 



factorise some generic infrastructure to assist looking up struct clks
for the ARM & SH architecture.

as the code is identical at 99%

put the arch specific code for allocation as example in asm/clkdev.h

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 64d2dc38

arch/arm/Kconfig

+21 −21
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ config ARCH_INTEGRATOR 
	bool "ARM Ltd. Integrator family"

	select ARM_AMBA

	select ARCH_HAS_CPUFREQ

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select ICST

	select GENERIC_CLOCKEVENTS

	select PLAT_VERSATILE
@@ -231,7 +231,7 @@ config ARCH_INTEGRATOR 
config ARCH_REALVIEW

	bool "ARM Ltd. RealView family"

	select ARM_AMBA

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select ICST

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -245,7 +245,7 @@ config ARCH_VERSATILE 
	bool "ARM Ltd. Versatile family"

	select ARM_AMBA

	select ARM_VIC

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select ICST

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -259,7 +259,7 @@ config ARCH_VEXPRESS 
	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_AMBA

	select ARM_TIMER_SP804

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select ICST
@@ -280,7 +280,7 @@ config ARCH_BCMRING 
	depends on MMU

	select CPU_V6

	select ARM_AMBA

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	help
@@ -327,7 +327,7 @@ config ARCH_EP93XX 
	select CPU_ARM920T

	select ARM_AMBA

	select ARM_VIC

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_USES_GETTIMEOFFSET
@@ -347,14 +347,14 @@ config ARCH_MXC 
	bool "Freescale MXC/iMX-based"

	select GENERIC_CLOCKEVENTS

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	help

	  Support for Freescale MXC/iMX-based family of processors



config ARCH_STMP3XXX

	bool "Freescale STMP3xxx"

	select CPU_ARM926T

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_CLOCKEVENTS

	select USB_ARCH_HAS_EHCI
@@ -472,7 +472,7 @@ config ARCH_LPC32XX 
	select HAVE_IDE

	select ARM_AMBA

	select USB_ARCH_HAS_OHCI

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	help
@@ -506,7 +506,7 @@ config ARCH_MMP 
	bool "Marvell PXA168/910/MMP2"

	depends on MMU

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select TICK_ONESHOT

	select PLAT_PXA
@@ -539,7 +539,7 @@ config ARCH_W90X900 
	bool "Nuvoton W90X900 CPU"

	select CPU_ARM926T

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	help

	  Support for Nuvoton (Winbond logic dept.) ARM9 processor,
@@ -553,7 +553,7 @@ config ARCH_W90X900 
config ARCH_NUC93X

	bool "Nuvoton NUC93X CPU"

	select CPU_ARM926T

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	help

	  Support for Nuvoton (Winbond logic dept.) NUC93X MCU,The NUC93X is a

	  low-power and high performance MPEG-4/JPEG multimedia controller chip.
@@ -564,7 +564,7 @@ config ARCH_TEGRA 
	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select HAVE_CLK

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select ARCH_HAS_BARRIERS if CACHE_L2X0

	select ARCH_HAS_CPUFREQ

	help
@@ -574,7 +574,7 @@ config ARCH_TEGRA 
config ARCH_PNX4008

	bool "Philips Nexperia PNX4008 Mobile"

	select CPU_ARM926T

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select ARCH_USES_GETTIMEOFFSET

	help

	  This enables support for Philips PNX4008 mobile platform.
@@ -584,7 +584,7 @@ config ARCH_PXA 
	depends on MMU

	select ARCH_MTD_XIP

	select ARCH_HAS_CPUFREQ

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_CLOCKEVENTS

	select TICK_ONESHOT
@@ -761,7 +761,7 @@ config ARCH_TCC_926 
	bool "Telechips TCC ARM926-based systems"

	select CPU_ARM926T

	select HAVE_CLK

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	help

	  Support for Telechips TCC ARM926-based systems.
@@ -785,7 +785,7 @@ config ARCH_U300 
	select ARM_AMBA

	select ARM_VIC

	select GENERIC_CLOCKEVENTS

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_GPIO

	help

	  Support for ST-Ericsson U300 series mobile platforms.
@@ -795,7 +795,7 @@ config ARCH_U8500 
	select CPU_V7

	select ARM_AMBA

	select GENERIC_CLOCKEVENTS

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for ST-Ericsson's Ux500 architecture
@@ -805,7 +805,7 @@ config ARCH_NOMADIK 
	select ARM_AMBA

	select ARM_VIC

	select CPU_ARM926T

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select ARCH_REQUIRE_GPIOLIB

	help
@@ -817,7 +817,7 @@ config ARCH_DAVINCI 
	select ARCH_REQUIRE_GPIOLIB

	select ZONE_DMA

	select HAVE_IDE

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_ALLOCATOR

	select ARCH_HAS_HOLES_MEMORYMODEL

	help
@@ -837,7 +837,7 @@ config PLAT_SPEAR 
	bool "ST SPEAr"

	select ARM_AMBA

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLKDEV

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	help

arch/arm/common/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -37,7 +37,3 @@ config SHARP_PARAM 


config SHARP_SCOOP

	bool
 


config COMMON_CLKDEV

	bool

	select HAVE_CLK

arch/arm/common/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -16,4 +16,3 @@ obj-$(CONFIG_SHARP_SCOOP) += scoop.o 
obj-$(CONFIG_ARCH_IXP2000)	+= uengine.o

obj-$(CONFIG_ARCH_IXP23XX)	+= uengine.o

obj-$(CONFIG_PCI_HOST_ITE8152)  += it8152.o
 
obj-$(CONFIG_COMMON_CLKDEV)	+= clkdev.o

arch/arm/include/asm/clkdev.h

+6 −16
Original line number Diff line number Diff line
@@ -12,23 +12,13 @@ 
#ifndef __ASM_CLKDEV_H

#define __ASM_CLKDEV_H



struct clk;

struct device;

#include <linux/slab.h>



struct clk_lookup {

	struct list_head	node;

	const char		*dev_id;

	const char		*con_id;

	struct clk		*clk;

};

#include <mach/clkdev.h>



struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id,

	const char *dev_fmt, ...);



void clkdev_add(struct clk_lookup *cl);

void clkdev_drop(struct clk_lookup *cl);



void clkdev_add_table(struct clk_lookup *, size_t);

int clk_add_alias(const char *, const char *, char *, struct device *);

static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size)

{

	return kzalloc(size, GFP_KERNEL);

}



#endif

arch/arm/mach-bcmring/clock.c

+1 −2
Original line number Diff line number Diff line
@@ -21,13 +21,12 @@ 
#include <linux/string.h>

#include <linux/clk.h>

#include <linux/spinlock.h>

#include <linux/clkdev.h>

#include <mach/csp/hw_cfg.h>

#include <mach/csp/chipcHw_def.h>

#include <mach/csp/chipcHw_reg.h>

#include <mach/csp/chipcHw_inline.h>



#include <asm/clkdev.h>



#include "clock.h"



#define clk_is_primary(x)       ((x)->type & CLK_TYPE_PRIMARY)