linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: t-kristo@ti.com (Tero Kristo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 08/24] ARM: OMAP36xx: remove clock36xx.c/.h files
Date: Fri, 6 Mar 2015 14:28:43 +0200	[thread overview]
Message-ID: <1425644939-3232-9-git-send-email-t-kristo@ti.com> (raw)
In-Reply-To: <1425644939-3232-1-git-send-email-t-kristo@ti.com>

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>
---
 arch/arm/mach-omap2/Makefile    |    2 +-
 arch/arm/mach-omap2/clock36xx.c |   69 ---------------------------------------
 arch/arm/mach-omap2/clock36xx.h |   13 --------
 3 files changed, 1 insertion(+), 83 deletions(-)
 delete mode 100644 arch/arm/mach-omap2/clock36xx.c
 delete mode 100644 arch/arm/mach-omap2/clock36xx.h

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index c172cf1..db627b2 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -188,7 +188,7 @@ obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpll.o
 obj-$(CONFIG_SOC_OMAP2430)		+= clock2430.o
 obj-$(CONFIG_ARCH_OMAP3)		+= $(clock-common) clock3xxx.o
 obj-$(CONFIG_ARCH_OMAP3)		+= clock34xx.o clkt34xx_dpll3m2.o
-obj-$(CONFIG_ARCH_OMAP3)		+= clock3517.o clock36xx.o
+obj-$(CONFIG_ARCH_OMAP3)		+= clock3517.o
 obj-$(CONFIG_ARCH_OMAP3)		+= dpll3xxx.o
 obj-$(CONFIG_ARCH_OMAP4)		+= $(clock-common)
 obj-$(CONFIG_ARCH_OMAP4)		+= dpll3xxx.o
diff --git a/arch/arm/mach-omap2/clock36xx.c b/arch/arm/mach-omap2/clock36xx.c
deleted file mode 100644
index 91ccb96..0000000
--- a/arch/arm/mach-omap2/clock36xx.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * OMAP36xx-specific clkops
- *
- * Copyright (C) 2010 Texas Instruments, Inc.
- * Copyright (C) 2010 Nokia Corporation
- *
- * Mike Turquette
- * Vijaykumar GN
- * Paul Walmsley
- *
- * Parts of this code are based on code written by
- * Richard Woodruff, Tony Lindgren, Tuukka Tikkanen, Karthik Dasu,
- * Russell King
- *
- * 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/clk-provider.h>
-#include <linux/io.h>
-
-#include "clock.h"
-#include "clock36xx.h"
-#define to_clk_divider(_hw) container_of(_hw, struct clk_divider, hw)
-
-/**
- * omap36xx_pwrdn_clk_enable_with_hsdiv_restore - enable clocks suffering
- *         from HSDivider PWRDN problem Implements Errata ID: i556.
- * @clk: DPLL output struct clk
- *
- * 3630 only: dpll3_m3_ck, dpll4_m2_ck, dpll4_m3_ck, dpll4_m4_ck,
- * dpll4_m5_ck & dpll4_m6_ck dividers gets loaded with reset
- * valueafter their respective PWRDN bits are set.  Any dummy write
- * (Any other value different from the Read value) to the
- * corresponding CM_CLKSEL register will refresh the dividers.
- */
-int omap36xx_pwrdn_clk_enable_with_hsdiv_restore(struct clk_hw *clk)
-{
-	struct clk_divider *parent;
-	struct clk_hw *parent_hw;
-	u32 dummy_v, orig_v;
-	struct clk_hw_omap *omap_clk = to_clk_hw_omap(clk);
-	int ret;
-
-	/* Clear PWRDN bit of HSDIVIDER */
-	ret = omap2_dflt_clk_enable(clk);
-
-	parent_hw = __clk_get_hw(__clk_get_parent(clk->clk));
-	parent = to_clk_divider(parent_hw);
-
-	/* Restore the dividers */
-	if (!ret) {
-		orig_v = omap2_clk_readl(omap_clk, parent->reg);
-		dummy_v = orig_v;
-
-		/* Write any other value different from the Read value */
-		dummy_v ^= (1 << parent->shift);
-		omap2_clk_writel(dummy_v, omap_clk, parent->reg);
-
-		/* Write the original divider */
-		omap2_clk_writel(orig_v, omap_clk, parent->reg);
-	}
-
-	return ret;
-}
diff --git a/arch/arm/mach-omap2/clock36xx.h b/arch/arm/mach-omap2/clock36xx.h
deleted file mode 100644
index 945bb7f..0000000
--- a/arch/arm/mach-omap2/clock36xx.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * OMAP36xx clock function prototypes and macros
- *
- * Copyright (C) 2010 Texas Instruments, Inc.
- * Copyright (C) 2010 Nokia Corporation
- */
-
-#ifndef __ARCH_ARM_MACH_OMAP2_CLOCK36XX_H
-#define __ARCH_ARM_MACH_OMAP2_CLOCK36XX_H
-
-extern int omap36xx_pwrdn_clk_enable_with_hsdiv_restore(struct clk_hw *hw);
-
-#endif
-- 
1.7.9.5

  parent reply	other threads:[~2015-03-06 12:28 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-06 12:28 [PATCH 00/24] ARM: OMAP2+: move clock implementations under clock driver Tero Kristo
2015-03-06 12:28 ` [PATCH 01/24] ARM: OMAP2+: clock: export driver API to setup/get clock features Tero Kristo
2015-03-06 12:28 ` [PATCH 02/24] clk: ti: move generic OMAP DPLL implementation under drivers/clk Tero Kristo
2015-03-06 12:28 ` [PATCH 03/24] clk: ti: move OMAP4+ " Tero Kristo
2015-03-06 12:28 ` [PATCH 04/24] clk: ti: move interface clock " Tero Kristo
2015-03-06 12:28 ` [PATCH 05/24] ARM: OMAP3: dpll3-m2: get rid of obsolete omap2_clksel_round_rate_div call Tero Kristo
2015-03-06 12:28 ` [PATCH 06/24] ARM: OMAP2+: clk: remove obsolete clksel support code Tero Kristo
2015-03-06 12:28 ` [PATCH 07/24] ARM: OMAP2+: clock: remove clock_common_data.c file Tero Kristo
2015-03-06 12:28 ` Tero Kristo [this message]
2015-03-06 12:28 ` [PATCH 09/24] clk: ti: autoidle: move generic autoidle handling code to clock driver Tero Kristo
2015-03-06 12:28 ` [PATCH 10/24] clk: ti: move omap2_clk_enable_init_clocks under " Tero Kristo
2015-03-06 12:28 ` [PATCH 11/24] ARM: OMAP2+: clock: remove support for legacy mpurate command line param Tero Kristo
2015-03-06 15:32   ` Tony Lindgren
2015-03-06 16:10     ` Tero Kristo
2015-03-06 16:25       ` Tony Lindgren
2015-03-09  9:08         ` Tero Kristo
2015-03-09 15:24           ` Tony Lindgren
2015-03-06 12:28 ` [PATCH 12/24] ARM: OMAP2+: clock: add support for clkdm ops to the low level clk ops Tero Kristo
2015-03-06 12:28 ` [PATCH 13/24] ARM: OMAP2+: clock: add support for specific CM ops to ti_clk_ll_ops Tero Kristo
2015-03-06 12:28 ` [PATCH 14/24] clk: ti: dpll: move omap3 DPLL functionality to clock driver Tero Kristo
2015-03-06 12:28 ` [PATCH 15/24] ARM: OMAP3: clock: remove clock3xxx.c file Tero Kristo
2015-03-06 12:28 ` [PATCH 16/24] ARM: OMAP2+: clock: remove clkdm_control static boolean from code Tero Kristo
2015-03-06 12:28 ` [PATCH 17/24] clk: ti: dflt: move support for default gate clock to clock driver Tero Kristo
2015-03-06 12:28 ` [PATCH 18/24] clk: ti: omap2430: move clock support code under " Tero Kristo
2015-03-06 12:28 ` [PATCH 19/24] clk: ti: clkdm: move clkdm gate clock support code to " Tero Kristo
2015-03-06 12:28 ` [PATCH 20/24] clk: ti: omap34xx: move omap34xx clock type " Tero Kristo
2015-03-06 12:28 ` [PATCH 21/24] ARM: OMAP4: clock: remove clock44xx.h header Tero Kristo
2015-03-06 12:28 ` [PATCH 22/24] clk: ti: am3517: move remaining am3517 clock support code to clock driver Tero Kristo
2015-03-06 12:28 ` [PATCH 23/24] clk: ti: move some public definitions to private header Tero Kristo
2015-03-06 12:28 ` [PATCH 24/24] ARM: OMAP2+: clock: remove dead definitions from the clock header file Tero Kristo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1425644939-3232-9-git-send-email-t-kristo@ti.com \
    --to=t-kristo@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).