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

Commit 56ad6691 authored by Tero Kristo's avatar Tero Kristo Committed by Tony Lindgren
Browse files

ARM: OMAP2: clock: remove unused apll code 



APLL clock type is no longer needed as the legacy clock support is removed.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
[tony@atomide.com: updated to apply]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 9b455e8d

arch/arm/mach-omap2/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ obj-$(CONFIG_SOC_DRA7XX) += clockdomains7xx_data.o 
obj-$(CONFIG_ARCH_OMAP2)		+= $(clock-common) clock2xxx.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpllcore.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_virt_prcm_set.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_apll.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpll.o clkt_iclk.o

obj-$(CONFIG_SOC_OMAP2430)		+= clock2430.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(clock-common) clock3xxx.o

arch/arm/mach-omap2/clkt2xxx_apll.c

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

 * OMAP2xxx APLL clock control functions

 *

 * 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 "clock.h"

#include "clock2xxx.h"

#include "cm2xxx.h"

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



/* CM_CLKEN_PLL.EN_{54,96}M_PLL options (24XX) */

#define EN_APLL_STOPPED			0

#define EN_APLL_LOCKED			3



/* CM_CLKSEL1_PLL.APLLS_CLKIN options (24XX) */

#define APLLS_CLKIN_19_2MHZ		0

#define APLLS_CLKIN_13MHZ		2

#define APLLS_CLKIN_12MHZ		3



/* Private functions */



static void _apll96_allow_idle(struct clk_hw_omap *clk)

{

	omap2xxx_cm_set_apll96_auto_low_power_stop();

}



static void _apll96_deny_idle(struct clk_hw_omap *clk)

{

	omap2xxx_cm_set_apll96_disable_autoidle();

}



static void _apll54_allow_idle(struct clk_hw_omap *clk)

{

	omap2xxx_cm_set_apll54_auto_low_power_stop();

}



static void _apll54_deny_idle(struct clk_hw_omap *clk)

{

	omap2xxx_cm_set_apll54_disable_autoidle();

}



/* Public data */

const struct clk_hw_omap_ops clkhwops_apll54 = {

	.allow_idle	= _apll54_allow_idle,

	.deny_idle	= _apll54_deny_idle,

};



const struct clk_hw_omap_ops clkhwops_apll96 = {

	.allow_idle	= _apll96_allow_idle,

	.deny_idle	= _apll96_deny_idle,

};

arch/arm/mach-omap2/clock2xxx.h

+0 −2
Original line number Diff line number Diff line
@@ -41,7 +41,5 @@ int omap2430_clk_init(void); 
#endif



extern struct clk_hw *dclk_hw;

int omap2_enable_osc_ck(struct clk_hw *hw);

void omap2_disable_osc_ck(struct clk_hw *hw);



#endif