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

Commit d5a04ddd authored by Tero Kristo's avatar Tero Kristo
Browse files

clk: ti: omap2430: move clock support code under clock driver 



With the legacy clock support gone, this is no longer needed under
platform code-base. Thus, move this under the TI clock driver, and
remove the exported API from the public header.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
parent 9f37e90e

arch/arm/mach-omap2/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ obj-$(CONFIG_ARCH_OMAP2) += $(clock-common) 
obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpllcore.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_virt_prcm_set.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpll.o

obj-$(CONFIG_SOC_OMAP2430)		+= clock2430.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(clock-common)

obj-$(CONFIG_ARCH_OMAP3)		+= clock34xx.o clkt34xx_dpll3m2.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock3517.o

arch/arm/mach-omap2/clock2430.c

deleted100644 → 0
+0 −57
Original line number Diff line number Diff line 
/*

 * clock2430.c - OMAP2430-specific clock integration code

 *

 * Copyright (C) 2005-2008 Texas Instruments, Inc.

 * Copyright (C) 2004-2010 Nokia Corporation

 *

 * Contacts:

 * Richard Woodruff <r-woodruff2@ti.com>

 * Paul Walmsley

 *

 * Based on earlier work by Tuukka Tikkanen, Tony Lindgren,

 * Gordon McNutt and RidgeRun, Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#undef DEBUG



#include <linux/kernel.h>

#include <linux/clk.h>

#include <linux/io.h>



#include "soc.h"

#include "iomap.h"

#include "clock.h"

#include "clock2xxx.h"

#include "cm2xxx.h"

#include "cm-regbits-24xx.h"



/**

 * omap2430_clk_i2chs_find_idlest - return CM_IDLEST info for 2430 I2CHS

 * @clk: struct clk * being enabled

 * @idlest_reg: void __iomem ** to store CM_IDLEST reg address into

 * @idlest_bit: pointer to a u8 to store the CM_IDLEST bit shift into

 * @idlest_val: pointer to a u8 to store the CM_IDLEST indicator

 *

 * OMAP2430 I2CHS CM_IDLEST bits are in CM_IDLEST1_CORE, but the

 * CM_*CLKEN bits are in CM_{I,F}CLKEN2_CORE.  This custom function

 * passes back the correct CM_IDLEST register address for I2CHS

 * modules.  No return value.

 */

static void omap2430_clk_i2chs_find_idlest(struct clk_hw_omap *clk,

					   void __iomem **idlest_reg,

					   u8 *idlest_bit,

					   u8 *idlest_val)

{

	*idlest_reg = OMAP2430_CM_REGADDR(CORE_MOD, CM_IDLEST);

	*idlest_bit = clk->enable_bit;

	*idlest_val = OMAP24XX_CM_IDLEST_VAL;

}



/* 2430 I2CHS has non-standard IDLEST register */

const struct clk_hw_omap_ops clkhwops_omap2430_i2chs_wait = {

	.find_idlest	= omap2430_clk_i2chs_find_idlest,

	.find_companion	= omap2_clk_dflt_find_companion,

};

drivers/clk/ti/clkt_iclk.c

+35 −0
Original line number Diff line number Diff line
@@ -18,8 +18,12 @@ 
#include "clock.h"



/* Register offsets */

#define OMAP24XX_CM_FCLKEN2		0x04

#define CM_AUTOIDLE			0x30

#define CM_ICLKEN			0x10

#define CM_IDLEST			0x20



#define OMAP24XX_CM_IDLEST_VAL		0



/* Private functions */
@@ -51,6 +55,31 @@ void omap2_clkt_iclk_deny_idle(struct clk_hw_omap *clk) 
	ti_clk_ll_ops->clk_writel(v, r);

}



/**

 * omap2430_clk_i2chs_find_idlest - return CM_IDLEST info for 2430 I2CHS

 * @clk: struct clk * being enabled

 * @idlest_reg: void __iomem ** to store CM_IDLEST reg address into

 * @idlest_bit: pointer to a u8 to store the CM_IDLEST bit shift into

 * @idlest_val: pointer to a u8 to store the CM_IDLEST indicator

 *

 * OMAP2430 I2CHS CM_IDLEST bits are in CM_IDLEST1_CORE, but the

 * CM_*CLKEN bits are in CM_{I,F}CLKEN2_CORE.  This custom function

 * passes back the correct CM_IDLEST register address for I2CHS

 * modules.  No return value.

 */

static void omap2430_clk_i2chs_find_idlest(struct clk_hw_omap *clk,

					   void __iomem **idlest_reg,

					   u8 *idlest_bit,

					   u8 *idlest_val)

{

	u32 r;



	r = ((__force u32)clk->enable_reg ^ (OMAP24XX_CM_FCLKEN2 ^ CM_IDLEST));

	*idlest_reg = (__force void __iomem *)r;

	*idlest_bit = clk->enable_bit;

	*idlest_val = OMAP24XX_CM_IDLEST_VAL;

}



/* Public data */



const struct clk_hw_omap_ops clkhwops_iclk = {
@@ -64,3 +93,9 @@ const struct clk_hw_omap_ops clkhwops_iclk_wait = { 
	.find_idlest	= omap2_clk_dflt_find_idlest,

	.find_companion	= omap2_clk_dflt_find_companion,

};



/* 2430 I2CHS has non-standard IDLEST register */

const struct clk_hw_omap_ops clkhwops_omap2430_i2chs_wait = {

	.find_idlest	= omap2430_clk_i2chs_find_idlest,

	.find_companion	= omap2_clk_dflt_find_companion,

};

drivers/clk/ti/clock.h

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ extern const struct clk_hw_omap_ops clkhwops_omap4_dpllmx; 
extern const struct clk_hw_omap_ops clkhwops_wait;

extern const struct clk_hw_omap_ops clkhwops_iclk;

extern const struct clk_hw_omap_ops clkhwops_iclk_wait;

extern const struct clk_hw_omap_ops clkhwops_omap2430_i2chs_wait;



int omap2_dflt_clk_enable(struct clk_hw *hw);

void omap2_dflt_clk_disable(struct clk_hw *hw);

include/linux/clk/ti.h

+0 −1
Original line number Diff line number Diff line
@@ -333,7 +333,6 @@ void ti_clk_setup_features(struct ti_clk_features *features); 
const struct ti_clk_features *ti_clk_get_features(void);



extern const struct clk_hw_omap_ops clkhwops_omap2xxx_dpll;

extern const struct clk_hw_omap_ops clkhwops_omap2430_i2chs_wait;

extern const struct clk_hw_omap_ops clkhwops_omap3430es2_dss_usbhost_wait;

extern const struct clk_hw_omap_ops clkhwops_am35xx_ipss_module_wait;

extern const struct clk_hw_omap_ops clkhwops_am35xx_ipss_wait;