ARM: mach-shmobile: Use shared clock framework (e47bb515) · Commits · 戴 / test

arch/arm/mach-shmobile/Kconfig

+3 −0

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		#

		# Common objects
		obj-y := timer.o console.o
		obj-y := timer.o console.o clock.o

		# CPU objects
		obj-$(CONFIG_ARCH_SH7367) += setup-sh7367.o clock-sh7367.o intc-sh7367.o

+1 −35

Original line number	Diff line number	Diff line
		@@ -21,43 +21,9 @@
		#include <linux/kernel.h>
		#include <linux/list.h>
		#include <linux/clk.h>

		struct clk {
		const char *name;
		unsigned long rate;
		};

		#include <linux/sh_clk.h>
		#include <asm/clkdev.h>

		int __clk_get(struct clk *clk)
		{
		return 1;
		}
		EXPORT_SYMBOL(__clk_get);

		void __clk_put(struct clk *clk)
		{
		}
		EXPORT_SYMBOL(__clk_put);


		int clk_enable(struct clk *clk)
		{
		return 0;
		}
		EXPORT_SYMBOL(clk_enable);

		void clk_disable(struct clk *clk)
		{
		}
		EXPORT_SYMBOL(clk_disable);

		unsigned long clk_get_rate(struct clk *clk)
		{
		return clk ? clk->rate : 0;
		}
		EXPORT_SYMBOL(clk_get_rate);

		/* a static peripheral clock for now - enough to get sh-sci working */
		static struct clk peripheral_clk = {
		.name = "peripheral_clk",

0 → 100644

+44 −0

Original line number	Diff line number	Diff line
		/*
		* SH-Mobile Timer
		*
		* Copyright (C) 2010 Magnus Damm
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; version 2 of the License.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
		*
		*/
		#include <linux/kernel.h>
		#include <linux/init.h>
		#include <linux/sh_clk.h>

		int __init clk_init(void)
		{
		/* Kick the child clocks.. */
		recalculate_root_clocks();

		/* Enable the necessary init clocks */
		clk_enable_init_clocks();

		return 0;
		}

		int __clk_get(struct clk *clk)
		{
		return 1;
		}
		EXPORT_SYMBOL(__clk_get);

		void __clk_put(struct clk *clk)
		{
		}
		EXPORT_SYMBOL(__clk_put);

+2 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,8 @@
		extern struct sys_timer shmobile_timer;
		extern void shmobile_setup_console(void);

		extern int clk_init(void);

		extern void sh7367_init_irq(void);
		extern void sh7367_add_early_devices(void);
		extern void sh7367_add_standard_devices(void);