Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: OMAP36xx: remove clock36xx.c/.h files

These files contain legacy clock implementations which are no longer used
for anything, thus remove them completely.

Signed-off-by: Tero Kristo <t-kristo@ti.com>

+1 -83
+1 -1
arch/arm/mach-omap2/Makefile
··· 188 188 obj-$(CONFIG_SOC_OMAP2430) += clock2430.o 189 189 obj-$(CONFIG_ARCH_OMAP3) += $(clock-common) clock3xxx.o 190 190 obj-$(CONFIG_ARCH_OMAP3) += clock34xx.o clkt34xx_dpll3m2.o 191 - obj-$(CONFIG_ARCH_OMAP3) += clock3517.o clock36xx.o 191 + obj-$(CONFIG_ARCH_OMAP3) += clock3517.o 192 192 obj-$(CONFIG_ARCH_OMAP3) += dpll3xxx.o 193 193 obj-$(CONFIG_ARCH_OMAP4) += $(clock-common) 194 194 obj-$(CONFIG_ARCH_OMAP4) += dpll3xxx.o
-69
arch/arm/mach-omap2/clock36xx.c
··· 1 - /* 2 - * OMAP36xx-specific clkops 3 - * 4 - * Copyright (C) 2010 Texas Instruments, Inc. 5 - * Copyright (C) 2010 Nokia Corporation 6 - * 7 - * Mike Turquette 8 - * Vijaykumar GN 9 - * Paul Walmsley 10 - * 11 - * Parts of this code are based on code written by 12 - * Richard Woodruff, Tony Lindgren, Tuukka Tikkanen, Karthik Dasu, 13 - * Russell King 14 - * 15 - * This program is free software; you can redistribute it and/or modify 16 - * it under the terms of the GNU General Public License version 2 as 17 - * published by the Free Software Foundation. 18 - */ 19 - #undef DEBUG 20 - 21 - #include <linux/kernel.h> 22 - #include <linux/clk.h> 23 - #include <linux/clk-provider.h> 24 - #include <linux/io.h> 25 - 26 - #include "clock.h" 27 - #include "clock36xx.h" 28 - #define to_clk_divider(_hw) container_of(_hw, struct clk_divider, hw) 29 - 30 - /** 31 - * omap36xx_pwrdn_clk_enable_with_hsdiv_restore - enable clocks suffering 32 - * from HSDivider PWRDN problem Implements Errata ID: i556. 33 - * @clk: DPLL output struct clk 34 - * 35 - * 3630 only: dpll3_m3_ck, dpll4_m2_ck, dpll4_m3_ck, dpll4_m4_ck, 36 - * dpll4_m5_ck & dpll4_m6_ck dividers gets loaded with reset 37 - * valueafter their respective PWRDN bits are set. Any dummy write 38 - * (Any other value different from the Read value) to the 39 - * corresponding CM_CLKSEL register will refresh the dividers. 40 - */ 41 - int omap36xx_pwrdn_clk_enable_with_hsdiv_restore(struct clk_hw *clk) 42 - { 43 - struct clk_divider *parent; 44 - struct clk_hw *parent_hw; 45 - u32 dummy_v, orig_v; 46 - struct clk_hw_omap *omap_clk = to_clk_hw_omap(clk); 47 - int ret; 48 - 49 - /* Clear PWRDN bit of HSDIVIDER */ 50 - ret = omap2_dflt_clk_enable(clk); 51 - 52 - parent_hw = __clk_get_hw(__clk_get_parent(clk->clk)); 53 - parent = to_clk_divider(parent_hw); 54 - 55 - /* Restore the dividers */ 56 - if (!ret) { 57 - orig_v = omap2_clk_readl(omap_clk, parent->reg); 58 - dummy_v = orig_v; 59 - 60 - /* Write any other value different from the Read value */ 61 - dummy_v ^= (1 << parent->shift); 62 - omap2_clk_writel(dummy_v, omap_clk, parent->reg); 63 - 64 - /* Write the original divider */ 65 - omap2_clk_writel(orig_v, omap_clk, parent->reg); 66 - } 67 - 68 - return ret; 69 - }
-13
arch/arm/mach-omap2/clock36xx.h
··· 1 - /* 2 - * OMAP36xx clock function prototypes and macros 3 - * 4 - * Copyright (C) 2010 Texas Instruments, Inc. 5 - * Copyright (C) 2010 Nokia Corporation 6 - */ 7 - 8 - #ifndef __ARCH_ARM_MACH_OMAP2_CLOCK36XX_H 9 - #define __ARCH_ARM_MACH_OMAP2_CLOCK36XX_H 10 - 11 - extern int omap36xx_pwrdn_clk_enable_with_hsdiv_restore(struct clk_hw *hw); 12 - 13 - #endif