Skip to contentSkip to conversation

cpufreq for freescale mx51

PATCH Superseded yong.shen at linaro.org 3 participants 7 messages Oct 18, 2010 – Oct 19, 2010 1 message not in the archive

Subsystems (3)

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 cpufreq for freescale mx51

From: Yong Shen <[email protected]>

the operating points are tested on babbage 3.0

---
 arch/arm/Kconfig                       |    6 +
 arch/arm/mach-mx5/Kconfig              |    1 +
 arch/arm/mach-mx5/Makefile             |    1 +
 arch/arm/mach-mx5/board-mx51_babbage.c |   12 ++-
 arch/arm/mach-mx5/clock-mx51.c         |   22 +++-
 arch/arm/mach-mx5/cpu.c                |    2 +
 arch/arm/mach-mx5/cpu_op-mx51.c        |   29 +++++
 arch/arm/mach-mx5/cpu_op-mx51.h        |   14 +++
 arch/arm/plat-mxc/Makefile             |    1 +
 arch/arm/plat-mxc/cpufreq.c            |  202 ++++++++++++++++++++++++++++++++
 arch/arm/plat-mxc/include/mach/mxc.h   |   20 +++-
 11 files changed, 306 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/mach-mx5/cpu_op-mx51.c
 create mode 100644 arch/arm/mach-mx5/cpu_op-mx51.h
 create mode 100644 arch/arm/plat-mxc/cpufreq.c
arch/arm/Kconfig +6 -0
index e4ea9cb..d9ad605 100644
@@ -1692,6 +1692,12 @@ if ARCH_HAS_CPUFREQ
 
 source "drivers/cpufreq/Kconfig"
 
+config CPU_FREQ_IMX
+	tristate "CPUfreq driver for i.MX CPUs"
+	depends on ARCH_MXC && CPU_FREQ
+	help
+	  This enables the CPUfreq driver for i.MX CPUs.
+
 config CPU_FREQ_SA1100
 	bool
 
arch/arm/mach-mx5/Kconfig +1 -0
index 0848db5..7a621b4 100644
@@ -5,6 +5,7 @@ config ARCH_MX51
 	default y
 	select MXC_TZIC
 	select ARCH_MXC_IOMUX_V3
+	select ARCH_HAS_CPUFREQ
 
 comment "MX5 platforms:"
 
arch/arm/mach-mx5/Makefile +1 -0
index 86c66e7..2fadac5 100644
@@ -5,6 +5,7 @@
 # Object file lists.
 obj-y   := cpu.o mm.o clock-mx51.o devices.o
 
+obj-$(CONFIG_CPU_FREQ_IMX)    += cpu_op-mx51.o
 obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
 obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
 obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o
arch/arm/mach-mx5/board-mx51_babbage.c +11 -1
index 6e384d9..74c796f 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
  * Copyright (C) 2009-2010 Amit Kucheria <[email protected]>
  *
  * The code contained herein is licensed under the GNU General Public
@@ -32,6 +32,7 @@
 #include <asm/mach/time.h>
 
 #include "devices.h"
+#include "cpu_op-mx51.h"
 
 #define BABBAGE_USB_HUB_RESET	(0*32 + 7)	/* GPIO_1_7 */
 #define BABBAGE_USBH1_STP	(0*32 + 27)	/* GPIO_1_27 */
@@ -279,8 +280,17 @@ static struct sys_timer mxc_timer = {
 	.init	= mx51_babbage_timer_init,
 };
 
+static void __init fixup_mxc_board(struct machine_desc *desc, struct tag *tags,
+				   char **cmdline, struct meminfo *mi)
+{
+#if defined(CONFIG_CPU_FREQ_IMX)
+	get_cpu_op = mx51_get_cpu_op;
+#endif
+}
+
 MACHINE_START(MX51_BABBAGE, "Freescale MX51 Babbage Board")
 	/* Maintainer: Amit Kucheria <[email protected]> */
+	.fixup = fixup_mxc_board,
 	.phys_io = MX51_AIPS1_BASE_ADDR,
 	.io_pg_offst = ((MX51_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
 	.boot_params = PHYS_OFFSET + 0x100,
arch/arm/mach-mx5/clock-mx51.c +20 -2
index 6af69de..f89d8a0 100644
@@ -330,7 +330,7 @@ static int _clk_lp_apm_set_parent(struct clk *clk, struct clk *parent)
 	return 0;
 }
 
-static unsigned long clk_arm_get_rate(struct clk *clk)
+static unsigned long clk_cpu_get_rate(struct clk *clk)
 {
 	u32 cacrr, div;
 	unsigned long parent_rate;
@@ -342,6 +342,22 @@ static unsigned long clk_arm_get_rate(struct clk *clk)
 	return parent_rate / div;
 }
 
+static int clk_cpu_set_rate(struct clk *clk, unsigned long rate)
+{
+	u32 reg, cpu_podf;
+	unsigned long parent_rate;
+
+	parent_rate = clk_get_rate(clk->parent);
+	cpu_podf = parent_rate / rate - 1;
+	/* use post divider to change freq */
+	reg = __raw_readl(MXC_CCM_CACRR);
+	reg &= ~MXC_CCM_CACRR_ARM_PODF_MASK;
+	reg |= cpu_podf << MXC_CCM_CACRR_ARM_PODF_OFFSET;
+	__raw_writel(reg, MXC_CCM_CACRR);
+
+	return 0;
+}
+
 static int _clk_periph_apm_set_parent(struct clk *clk, struct clk *parent)
 {
 	u32 reg, mux;
@@ -693,7 +709,8 @@ static struct clk periph_apm_clk = {
 
 static struct clk cpu_clk = {
 	.parent = &pll1_sw_clk,
-	.get_rate = clk_arm_get_rate,
+	.get_rate = clk_cpu_get_rate,
+	.set_rate = clk_cpu_set_rate,
 };
 
 static struct clk ahb_clk = {
@@ -837,6 +854,7 @@ static struct clk_lookup lookups[] = {
 	_REGISTER_CLOCK("fsl-usb2-udc", "usb", usboh3_clk)
 	_REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", ahb_clk)
 	_REGISTER_CLOCK("imx-keypad.0", NULL, kpp_clk)
+	_REGISTER_CLOCK(NULL, "cpu_clk", cpu_clk)
 };
 
 static void clk_tree_init(void)
arch/arm/mach-mx5/cpu.c +2 -0
index 2d37785..f3fe51a 100644
@@ -22,6 +22,8 @@ static int cpu_silicon_rev = -1;
 
 #define SI_REV 0x48
 
+struct cpu_op *(*get_cpu_op)(int *op);
+
 static void query_silicon_parameter(void)
 {
 	void __iomem *rom = ioremap(MX51_IROM_BASE_ADDR, MX51_IROM_SIZE);
arch/arm/mach-mx5/cpu_op-mx51.c new file +29 -0
new file mode 100644
index 0000000..9d34c3d
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later@the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/types.h>
+#include <mach/hardware.h>
+#include <linux/kernel.h>
+
+static struct cpu_op mx51_cpu_op[] = {
+	{
+	.cpu_rate = 160000000,},
+	{
+	.cpu_rate = 800000000,},
+};
+
+struct cpu_op *mx51_get_cpu_op(int *op)
+{
+	*op = ARRAY_SIZE(mx51_cpu_op);
+	return mx51_cpu_op;
+}
arch/arm/mach-mx5/cpu_op-mx51.h new file +14 -0
new file mode 100644
index 0000000..97477fe
@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+extern struct cpu_op *mx51_get_cpu_op(int *op);
arch/arm/plat-mxc/Makefile +1 -0
index 78d405e..a833d38 100644
@@ -16,6 +16,7 @@ obj-$(CONFIG_MXC_ULPI) += ulpi.o
 obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o
 obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o
 obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
+obj-$(CONFIG_CPU_FREQ_IMX)    += cpufreq.o
 ifdef CONFIG_SND_IMX_SOC
 obj-y += ssi-fiq.o
 obj-y += ssi-fiq-ksym.o
arch/arm/plat-mxc/cpufreq.c new file +202 -0

202 lines not on this page · raw message

arch/arm/plat-mxc/include/mach/mxc.h +19 -1
index a790bf2..888dddc 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2004-2007, 2010 Freescale Semiconductor, Inc. All Rights Reserved.
  * Copyright (C) 2008 Juergen Beisert (kernel at pengutronix.de)
  *
  * This program is free software; you can redistribute it and/or
@@ -133,6 +133,24 @@ extern unsigned int __mxc_cpu_type;
 # define cpu_is_mxc91231()	(0)
 #endif
 
+#ifndef __ASSEMBLY__
+
+struct cpu_op {
+	u32 pll_reg;
+	u32 pll_rate;
+	u32 cpu_rate;
+	u32 pdr0_reg;
+	u32 pdf;
+	u32 mfi;
+	u32 mfd;
+	u32 mfn;
+	u32 cpu_voltage;
+	u32 cpu_podf;
+};
+
+extern struct cpu_op *(*get_cpu_op)(int *op);
+#endif
+
 #if defined(CONFIG_ARCH_MX3) || defined(CONFIG_ARCH_MX2)
 /* These are deprecated, use mx[23][157]_setup_weimcs instead. */
 #define CSCR_U(n) (IO_ADDRESS(WEIM_BASE_ADDR + n * 0x10))
Signature · 1 line
1.6.3.3
#1 lore raw

PATCH v3 1/1 cpufreq for freescale mx51

Yong,

I get the following errors if I try to compile this with the Linaro toolchain.

In file included from /home/amit/work/sources/linux-amit-upstream.git/arch/arm/plat-mxc/include/mach/hardware.h:63:0,
from /home/amit/work/sources/linux-amit-upstream.git/arch/arm/plat-mxc/devices/platform-fec.c:10:
/home/amit/work/sources/linux-amit-upstream.git/arch/arm/plat-mxc/include/mach/mxc.h:139:2:
error: expected specifier-qualifier-list before ?u32?

Perhap following patch is required?

(quoted diff) +0 -0

b/arch/arm/plat-mxc/include/mach/hardware.h
index ebadf4a..c9587fd 100644

arch/arm/plat-mxc/include/mach/hardware.h +0 -0
@@ -21,6 +21,7 @@
 #define __ASM_ARCH_MXC_HARDWARE_H__
  
   #include <asm/sizes.h>
   +#include <asm/types.h>
 
 
Quoted 29 lines · Yong Shen

From: Yong Shen <[email protected]>

the operating points are tested on babbage 3.0

---
 arch/arm/Kconfig                       |    6 +
 arch/arm/mach-mx5/Kconfig              |    1 +
 arch/arm/mach-mx5/Makefile             |    1 +
 arch/arm/mach-mx5/board-mx51_babbage.c |   12 ++-
 arch/arm/mach-mx5/clock-mx51.c         |   22 +++-
 arch/arm/mach-mx5/cpu.c                |    2 +
 arch/arm/mach-mx5/cpu_op-mx51.c        |   29 +++++
 arch/arm/mach-mx5/cpu_op-mx51.h        |   14 +++
 arch/arm/plat-mxc/Makefile             |    1 +
 arch/arm/plat-mxc/cpufreq.c            |  202 ++++++++++++++++++++++++++++++++
 arch/arm/plat-mxc/include/mach/mxc.h   |   20 +++-
 11 files changed, 306 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/mach-mx5/cpu_op-mx51.c
 create mode 100644 arch/arm/mach-mx5/cpu_op-mx51.h
 create mode 100644 arch/arm/plat-mxc/cpufreq.c
arch/arm/Kconfig +0 -0
index e4ea9cb..d9ad605 100644
@@ -1692,6 +1692,12 @@ if ARCH_HAS_CPUFREQ
 
 source "drivers/cpufreq/Kconfig"

<snip>

Quoted 12 lines
arch/arm/plat-mxc/include/mach/mxc.h +1 -1
index a790bf2..888dddc 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2004-2007, 2010 Freescale Semiconductor, Inc. All Rights Reserved.
  * Copyright (C) 2008 Juergen Beisert (kernel at pengutronix.de)
  *
  * This program is free software; you can redistribute it and/or

arch/arm/plat-mxc/include/mach/mxc.h extern unsigned int __mxc_cpu_type; · line 138

Quoted 6 lines
arch/arm/plat-mxc/include/mach/mxc.h +3 -0
@@ -133,6 +133,24 @@ extern unsigned int __mxc_cpu_type;
 # define cpu_is_mxc91231()	(0)
 #endif
 
+#ifndef __ASSEMBLY__
+
+struct cpu_op {

struct mx51_cpu_op ?

IIUC, other I.MX SoCs use different 'variables' so this struct is SoC-specific.

arch/arm/plat-mxc/include/mach/mxc.h extern unsigned int __mxc_cpu_type; · line 150

Quoted 12 lines
arch/arm/plat-mxc/include/mach/mxc.h +12 -0
+	u32 pll_reg;
+	u32 pll_rate;
+	u32 cpu_rate;
+	u32 pdr0_reg;
+	u32 pdf;
+	u32 mfi;
+	u32 mfd;
+	u32 mfn;
+	u32 cpu_voltage;
+	u32 cpu_podf;
+};
+

Get rid of all members of struct cpu_op except cpu_rate for now. We can re-add it later.

Also, I wonder if this struct and the external declaration should be moved out to plat/mxc_cpufreq.h

Quoted 8 lines
arch/arm/plat-mxc/include/mach/mxc.h +3 -0
+extern struct cpu_op *(*get_cpu_op)(int *op);
+#endif
+
 #if defined(CONFIG_ARCH_MX3) || defined(CONFIG_ARCH_MX2)
 /* These are deprecated, use mx[23][157]_setup_weimcs instead. */
 #define CSCR_U(n) (IO_ADDRESS(WEIM_BASE_ADDR + n * 0x10))
Signature · 1 line
1.6.3.3
author
#2 lore raw

PATCH v3 1/1 cpufreq for freescale mx51

Hi amit,

Quoted 23 lines · Amit Kucheria

Yong,

I get the following errors if I try to compile this with the Linaro toolchain.

In file included from

/home/amit/work/sources/linux-amit-upstream.git/arch/arm/plat-mxc/include/mach/hardware.h:63:0,
from

/home/amit/work/sources/linux-amit-upstream.git/arch/arm/plat-mxc/devices/platform-fec.c:10:

/home/amit/work/sources/linux-amit-upstream.git/arch/arm/plat-mxc/include/mach/mxc.h:139:2:
error: expected specifier-qualifier-list before ?u32?

Perhap following patch is required?

arch/arm/plat-mxc/include/mach/hardware.h +0 -0
index ebadf4a..c9587fd 100644

arch/arm/plat-mxc/include/mach/hardware.h line 25

Quoted 5 lines
arch/arm/plat-mxc/include/mach/hardware.h +0 -0
@@ -21,6 +21,7 @@
 #define __ASM_ARCH_MXC_HARDWARE_H__
 
  #include <asm/sizes.h>
  +#include <asm/types.h>
 

Although I did not meet this problem, I also think it is an issue.

Quoted 17 lines
arch/arm/plat-mxc/include/mach/hardware.h +0 -0
 > +     u32 pll_reg;

Review

Quoted 11 lines
(quoted diff) +11 -0
+     u32 pll_rate;
+     u32 cpu_rate;
+     u32 pdr0_reg;
+     u32 pdf;
+     u32 mfi;
+     u32 mfd;
+     u32 mfn;
+     u32 cpu_voltage;
+     u32 cpu_podf;
+};
+

Get rid of all members of struct cpu_op except cpu_rate for now. We can re-add it later.

Quoted 3 lines

Also, I wonder if this struct and the external declaration should be moved out to plat/mxc_cpufreq.h

Maybe to mach/mxc.h which is the place for keeping platform related definitions.

Quoted 10 lines
Quoted 9 lines
(quoted diff) +3 -1
+extern struct cpu_op *(*get_cpu_op)(int *op);
+#endif
+
 #if defined(CONFIG_ARCH_MX3) || defined(CONFIG_ARCH_MX2)
 /* These are deprecated, use mx[23][157]_setup_weimcs instead. */
 #define CSCR_U(n) (IO_ADDRESS(WEIM_BASE_ADDR + n * 0x10))
--

1.6.3.3

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20101019/e46aab58/attachment-0001.html>

maintainer
#3 lore raw

PATCH v3 1/1 cpufreq for freescale mx51

In reply to yong.shen at linaro.org
Quoted 84 lines · yong.shen at linaro.org

From: Yong Shen <[email protected]>

the operating points are tested on babbage 3.0

---
 arch/arm/Kconfig                       |    6 +
 arch/arm/mach-mx5/Kconfig              |    1 +
 arch/arm/mach-mx5/Makefile             |    1 +
 arch/arm/mach-mx5/board-mx51_babbage.c |   12 ++-
 arch/arm/mach-mx5/clock-mx51.c         |   22 +++-
 arch/arm/mach-mx5/cpu.c                |    2 +
 arch/arm/mach-mx5/cpu_op-mx51.c        |   29 +++++
 arch/arm/mach-mx5/cpu_op-mx51.h        |   14 +++
 arch/arm/plat-mxc/Makefile             |    1 +
 arch/arm/plat-mxc/cpufreq.c            |  202 ++++++++++++++++++++++++++++++++
 arch/arm/plat-mxc/include/mach/mxc.h   |   20 +++-
 11 files changed, 306 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/mach-mx5/cpu_op-mx51.c
 create mode 100644 arch/arm/mach-mx5/cpu_op-mx51.h
 create mode 100644 arch/arm/plat-mxc/cpufreq.c
arch/arm/Kconfig +6 -0
index e4ea9cb..d9ad605 100644
@@ -1692,6 +1692,12 @@ if ARCH_HAS_CPUFREQ
 
 source "drivers/cpufreq/Kconfig"
 
+config CPU_FREQ_IMX
+	tristate "CPUfreq driver for i.MX CPUs"
+	depends on ARCH_MXC && CPU_FREQ
+	help
+	  This enables the CPUfreq driver for i.MX CPUs.
+
 config CPU_FREQ_SA1100
 	bool
 
arch/arm/mach-mx5/Kconfig +1 -0
index 0848db5..7a621b4 100644
@@ -5,6 +5,7 @@ config ARCH_MX51
 	default y
 	select MXC_TZIC
 	select ARCH_MXC_IOMUX_V3
+	select ARCH_HAS_CPUFREQ
 
 comment "MX5 platforms:"
 
arch/arm/mach-mx5/Makefile +1 -0
index 86c66e7..2fadac5 100644
@@ -5,6 +5,7 @@
 # Object file lists.
 obj-y   := cpu.o mm.o clock-mx51.o devices.o
 
+obj-$(CONFIG_CPU_FREQ_IMX)    += cpu_op-mx51.o
 obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
 obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
 obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o
arch/arm/mach-mx5/board-mx51_babbage.c +2 -1
index 6e384d9..74c796f 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
  * Copyright (C) 2009-2010 Amit Kucheria <[email protected]>
  *
  * The code contained herein is licensed under the GNU General Public
@@ -32,6 +32,7 @@
 #include <asm/mach/time.h>
 
 #include "devices.h"
+#include "cpu_op-mx51.h"
 
 #define BABBAGE_USB_HUB_RESET	(0*32 + 7)	/* GPIO_1_7 */
 #define BABBAGE_USBH1_STP	(0*32 + 27)	/* GPIO_1_27 */
@@ -279,8 +280,17 @@ static struct sys_timer mxc_timer = {
 	.init	= mx51_babbage_timer_init,

arch/arm/mach-mx5/board-mx51_babbage.c static struct sys_timer mxc_timer = { · line 290

Quoted 10 lines
arch/arm/mach-mx5/board-mx51_babbage.c +8 -0
 };
 
+static void __init fixup_mxc_board(struct machine_desc *desc, struct tag *tags,
+				   char **cmdline, struct meminfo *mi)
+{
+#if defined(CONFIG_CPU_FREQ_IMX)
+	get_cpu_op = mx51_get_cpu_op;
+#endif
+}
+

Why has this to live in .fixup? .init_machine should be fine here.

Quoted 92 lines
arch/arm/mach-mx5/board-mx51_babbage.c +1 -0
 MACHINE_START(MX51_BABBAGE, "Freescale MX51 Babbage Board")
 	/* Maintainer: Amit Kucheria <[email protected]> */
+	.fixup = fixup_mxc_board,
 	.phys_io = MX51_AIPS1_BASE_ADDR,
 	.io_pg_offst = ((MX51_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
 	.boot_params = PHYS_OFFSET + 0x100,
arch/arm/mach-mx5/clock-mx51.c +20 -2
index 6af69de..f89d8a0 100644
@@ -330,7 +330,7 @@ static int _clk_lp_apm_set_parent(struct clk *clk, struct clk *parent)
 	return 0;
 }
 
-static unsigned long clk_arm_get_rate(struct clk *clk)
+static unsigned long clk_cpu_get_rate(struct clk *clk)
 {
 	u32 cacrr, div;
 	unsigned long parent_rate;
@@ -342,6 +342,22 @@ static unsigned long clk_arm_get_rate(struct clk *clk)
 	return parent_rate / div;
 }
 
+static int clk_cpu_set_rate(struct clk *clk, unsigned long rate)
+{
+	u32 reg, cpu_podf;
+	unsigned long parent_rate;
+
+	parent_rate = clk_get_rate(clk->parent);
+	cpu_podf = parent_rate / rate - 1;
+	/* use post divider to change freq */
+	reg = __raw_readl(MXC_CCM_CACRR);
+	reg &= ~MXC_CCM_CACRR_ARM_PODF_MASK;
+	reg |= cpu_podf << MXC_CCM_CACRR_ARM_PODF_OFFSET;
+	__raw_writel(reg, MXC_CCM_CACRR);
+
+	return 0;
+}
+
 static int _clk_periph_apm_set_parent(struct clk *clk, struct clk *parent)
 {
 	u32 reg, mux;
@@ -693,7 +709,8 @@ static struct clk periph_apm_clk = {
 
 static struct clk cpu_clk = {
 	.parent = &pll1_sw_clk,
-	.get_rate = clk_arm_get_rate,
+	.get_rate = clk_cpu_get_rate,
+	.set_rate = clk_cpu_set_rate,
 };
 
 static struct clk ahb_clk = {
@@ -837,6 +854,7 @@ static struct clk_lookup lookups[] = {
 	_REGISTER_CLOCK("fsl-usb2-udc", "usb", usboh3_clk)
 	_REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", ahb_clk)
 	_REGISTER_CLOCK("imx-keypad.0", NULL, kpp_clk)
+	_REGISTER_CLOCK(NULL, "cpu_clk", cpu_clk)
 };
 
 static void clk_tree_init(void)
arch/arm/mach-mx5/cpu.c +2 -0
index 2d37785..f3fe51a 100644
@@ -22,6 +22,8 @@ static int cpu_silicon_rev = -1;
 
 #define SI_REV 0x48
 
+struct cpu_op *(*get_cpu_op)(int *op);
+
 static void query_silicon_parameter(void)
 {
 	void __iomem *rom = ioremap(MX51_IROM_BASE_ADDR, MX51_IROM_SIZE);
arch/arm/mach-mx5/cpu_op-mx51.c new file +13 -0
new file mode 100644
index 0000000..9d34c3d
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+

arch/arm/mach-mx5/cpu_op-mx51.c line 23

Quoted 10 lines
arch/arm/mach-mx5/cpu_op-mx51.c new file +10 -0
+#include <linux/types.h>
+#include <mach/hardware.h>
+#include <linux/kernel.h>
+
+static struct cpu_op mx51_cpu_op[] = {
+	{
+	.cpu_rate = 160000000,},
+	{
+	.cpu_rate = 800000000,},
+};

Why did you remove the values between 800MHz and 160MHz? 400MHz and 200Mhz should work also, no?

Quoted 81 lines
arch/arm/mach-mx5/cpu_op-mx51.c new file +6 -0
+
+struct cpu_op *mx51_get_cpu_op(int *op)
+{
+	*op = ARRAY_SIZE(mx51_cpu_op);
+	return mx51_cpu_op;
+}
arch/arm/mach-mx5/cpu_op-mx51.h new file +14 -0
new file mode 100644
index 0000000..97477fe
@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+extern struct cpu_op *mx51_get_cpu_op(int *op);
arch/arm/plat-mxc/Makefile +1 -0
index 78d405e..a833d38 100644
@@ -16,6 +16,7 @@ obj-$(CONFIG_MXC_ULPI) += ulpi.o
 obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o
 obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o
 obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
+obj-$(CONFIG_CPU_FREQ_IMX)    += cpufreq.o
 ifdef CONFIG_SND_IMX_SOC
 obj-y += ssi-fiq.o
 obj-y += ssi-fiq-ksym.o
arch/arm/plat-mxc/cpufreq.c new file +37 -0
new file mode 100644
index 0000000..9cabeb9
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/*
+ * A driver for the Freescale Semiconductor i.MXC CPUfreq module.
+ * The CPUFREQ driver is for controling CPU frequency. It allows you to change
+ * the CPU clock speed on the fly.
+ */
+
+#include <linux/cpufreq.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/slab.h>
+#include <mach/hardware.h>
+#include <mach/clock.h>
+
+#define CLK32_FREQ	32768
+#define NANOSECOND	(1000 * 1000 * 1000)
+
+static int cpu_freq_khz_min;
+static int cpu_freq_khz_max;
+static int arm_normal_clk;
+
+static struct clk *cpu_clk;
+static struct cpufreq_frequency_table *imx_freq_table;
+
+static int cpu_op_nr;

arch/arm/plat-mxc/cpufreq.c line 47

Quoted 10 lines
arch/arm/plat-mxc/cpufreq.c new file +10 -0
+static struct cpu_op *cpu_op_tbl;
+
+static int set_cpu_freq(int freq)
+{
+	int ret = 0;
+	int org_cpu_rate;
+
+	org_cpu_rate = clk_get_rate(cpu_clk);
+	if (org_cpu_rate == freq)
+		return ret;

You already checked this in mxc_set_target. Once is enough.

Quoted 59 lines
arch/arm/plat-mxc/cpufreq.c new file +59 -0
+
+	ret = clk_set_rate(cpu_clk, freq);
+	if (ret != 0) {
+		printk(KERN_DEBUG "cannot set CPU clock rate\n");
+		return ret;
+	}
+
+	return ret;
+}
+
+static int mxc_verify_speed(struct cpufreq_policy *policy)
+{
+	if (policy->cpu != 0)
+		return -EINVAL;
+
+	return cpufreq_frequency_table_verify(policy, imx_freq_table);
+}
+
+static unsigned int mxc_get_speed(unsigned int cpu)
+{
+	if (cpu)
+		return 0;
+
+	return clk_get_rate(cpu_clk) / 1000;
+}
+
+static int mxc_set_target(struct cpufreq_policy *policy,
+			  unsigned int target_freq, unsigned int relation)
+{
+	struct cpufreq_freqs freqs;
+	int freq_Hz;
+	int ret = 0;
+	unsigned int index;
+
+	cpufreq_frequency_table_target(policy, imx_freq_table,
+			target_freq, relation, &index);
+	freq_Hz = imx_freq_table[index].frequency * 1000;
+
+	freqs.old = clk_get_rate(cpu_clk) / 1000;
+	freqs.new = freq_Hz / 1000;
+	freqs.cpu = 0;
+	freqs.flags = 0;
+	cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+
+	if (freqs.old != freqs.new)
+		ret = set_cpu_freq(freq_Hz);
+
+	cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+
+	return ret;
+}
+
+static int __init mxc_cpufreq_init(struct cpufreq_policy *policy)
+{
+	int ret;
+	int i;
+
+	printk(KERN_INFO "i.MXC CPU frequency driver\n");
+

arch/arm/plat-mxc/cpufreq.c line 116

Quoted 10 lines
arch/arm/plat-mxc/cpufreq.c new file +10 -0
+	if (policy->cpu != 0)
+		return -EINVAL;
+
+	cpu_clk = clk_get(NULL, "cpu_clk");
+	if (IS_ERR(cpu_clk)) {
+		printk(KERN_ERR "%s: failed to get cpu clock\n", __func__);
+		return PTR_ERR(cpu_clk);
+	}
+
+	cpu_op_tbl = get_cpu_op(&cpu_op_nr);

This will crash every board except the babbage board which happens to set this function pointer.

Quoted 6 lines
arch/arm/plat-mxc/cpufreq.c new file +6 -0
+
+	cpu_freq_khz_min = cpu_op_tbl[0].cpu_rate / 1000;
+	cpu_freq_khz_max = cpu_op_tbl[0].cpu_rate / 1000;
+
+	imx_freq_table = kmalloc(
+		sizeof(struct cpufreq_frequency_table) * (cpu_op_nr + 1),

arch/arm/plat-mxc/cpufreq.c line 132

Quoted 10 lines
arch/arm/plat-mxc/cpufreq.c new file +10 -0
+			GFP_KERNEL);
+	if (!imx_freq_table) {
+		clk_put(cpu_clk);
+		return -ENOMEM;
+	}
+
+	for (i = 0; i < cpu_op_nr; i++) {
+		imx_freq_table[i].index = i;
+		imx_freq_table[i].frequency =
+		    cpu_op_tbl[i].cpu_rate / 1000;

unnecessary line break.

Quoted 10 lines
arch/arm/plat-mxc/cpufreq.c new file +10 -0
+
+		if ((cpu_op_tbl[i].cpu_rate / 1000) < cpu_freq_khz_min)
+			cpu_freq_khz_min = cpu_op_tbl[i].cpu_rate / 1000;
+
+		if ((cpu_op_tbl[i].cpu_rate / 1000) > cpu_freq_khz_max)
+			cpu_freq_khz_max = cpu_op_tbl[i].cpu_rate / 1000;
+	}
+
+	imx_freq_table[i].index = i;
+	imx_freq_table[i].frequency = CPUFREQ_TABLE_END;

arch/arm/plat-mxc/cpufreq.c line 152

Quoted 10 lines
arch/arm/plat-mxc/cpufreq.c new file +10 -0
+
+	policy->cur = clk_get_rate(cpu_clk) / 1000;
+	policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
+	policy->min = policy->cpuinfo.min_freq = cpu_freq_khz_min;
+	policy->max = policy->cpuinfo.max_freq = cpu_freq_khz_max;
+
+	arm_normal_clk = cpu_freq_khz_max * 1000;
+
+	/* Manual states, that PLL stabilizes in two CLK32 periods */
+	policy->cpuinfo.transition_latency = 2 / CLK32_FREQ * NANOSECOND;

These are evaluated from left to right, so this is 0.

arch/arm/plat-mxc/cpufreq.c line 161

Quoted 9 lines
arch/arm/plat-mxc/cpufreq.c new file +9 -0
+
+	ret = cpufreq_frequency_table_cpuinfo(policy, imx_freq_table);
+
+	if (ret < 0) {
+		clk_put(cpu_clk);
+		printk(KERN_ERR "%s: failed to register i.MXC CPUfreq\n",
+		       __func__);
+		return ret;
+	}

You forget to kfree the resources allocated above. This is one of the valid usecases for goto, see a driver probe function of your choice how they do this right.
Also, the actual error code is of interest in this printk.

arch/arm/plat-mxc/cpufreq.c line 171

Quoted 10 lines
arch/arm/plat-mxc/cpufreq.c new file +10 -0
+
+	cpufreq_frequency_table_get_attr(imx_freq_table, policy->cpu);
+	return 0;
+}
+
+static int mxc_cpufreq_exit(struct cpufreq_policy *policy)
+{
+	cpufreq_frequency_table_put_attr(policy->cpu);
+
+	set_cpu_freq(arm_normal_clk);

As said before, please get rid of arm_normal_clk.

Quoted 49 lines
arch/arm/plat-mxc/cpufreq.c new file +31 -0
+	clk_put(cpu_clk);
+	kfree(imx_freq_table);
+	return 0;
+}
+
+static struct cpufreq_driver mxc_driver = {
+	.flags = CPUFREQ_STICKY,
+	.verify = mxc_verify_speed,
+	.target = mxc_set_target,
+	.get = mxc_get_speed,
+	.init = mxc_cpufreq_init,
+	.exit = mxc_cpufreq_exit,
+	.name = "imx",
+};
+
+static int __devinit mxc_cpufreq_driver_init(void)
+{
+	return cpufreq_register_driver(&mxc_driver);
+}
+
+static void mxc_cpufreq_driver_exit(void)
+{
+	cpufreq_unregister_driver(&mxc_driver);
+}
+
+module_init(mxc_cpufreq_driver_init);
+module_exit(mxc_cpufreq_driver_exit);
+
+MODULE_AUTHOR("Freescale Semiconductor Inc. Yong Shen <[email protected]>");
+MODULE_DESCRIPTION("CPUfreq driver for i.MX");
+MODULE_LICENSE("GPL");
arch/arm/plat-mxc/include/mach/mxc.h +4 -1
index a790bf2..888dddc 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2004-2007, 2010 Freescale Semiconductor, Inc. All Rights Reserved.
  * Copyright (C) 2008 Juergen Beisert (kernel at pengutronix.de)
  *
  * This program is free software; you can redistribute it and/or
@@ -133,6 +133,24 @@ extern unsigned int __mxc_cpu_type;
 # define cpu_is_mxc91231()	(0)
 #endif
 
+#ifndef __ASSEMBLY__
+
+struct cpu_op {

arch/arm/plat-mxc/include/mach/mxc.h extern unsigned int __mxc_cpu_type; · line 148

Quoted 10 lines
arch/arm/plat-mxc/include/mach/mxc.h +10 -0
+	u32 pll_reg;
+	u32 pll_rate;
+	u32 cpu_rate;
+	u32 pdr0_reg;
+	u32 pdf;
+	u32 mfi;
+	u32 mfd;
+	u32 mfn;
+	u32 cpu_voltage;
+	u32 cpu_podf;

Many unused fields here.

Quoted 17 lines
arch/arm/plat-mxc/include/mach/mxc.h +5 -0
+};
+
+extern struct cpu_op *(*get_cpu_op)(int *op);
+#endif
+
 #if defined(CONFIG_ARCH_MX3) || defined(CONFIG_ARCH_MX2)
 /* These are deprecated, use mx[23][157]_setup_weimcs instead. */
 #define CSCR_U(n) (IO_ADDRESS(WEIM_BASE_ADDR + n * 0x10))
Signature · 7 lines
1.6.3.3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 4 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
author
#4 lore raw

PATCH v3 1/1 cpufreq for freescale mx51

Quoted 105 lines

arch/arm/mach-mx5/cpu_op-mx51.c line 23

Quoted 11 lines
arch/arm/mach-mx5/cpu_op-mx51.c new file +8 -0
+#include <linux/kernel.h>
+
+static struct cpu_op mx51_cpu_op[] = {
+     {
+     .cpu_rate = 160000000,},
+     {
+     .cpu_rate = 800000000,},
+};

Why did you remove the values between 800MHz and 160MHz? 400MHz and 200Mhz should work also, no?

It proved that those operating points don't work well.

Review

Quoted 7 lines
arch/arm/mach-mx5/cpu_op-mx51.c new file +6 -0
+
+struct cpu_op *mx51_get_cpu_op(int *op)
+{
+     *op = ARRAY_SIZE(mx51_cpu_op);
+     return mx51_cpu_op;
+}
(quoted diff) +0 -0

b/arch/arm/mach-mx5/cpu_op-mx51.h

Quoted 43 lines

new file mode 100644
index 0000000..97477fe

arch/arm/mach-mx5/cpu_op-mx51.h new file +14 -0
@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+extern struct cpu_op *mx51_get_cpu_op(int *op);
arch/arm/plat-mxc/Makefile +1 -0
index 78d405e..a833d38 100644
@@ -16,6 +16,7 @@ obj-$(CONFIG_MXC_ULPI) += ulpi.o
 obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o
 obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o
 obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
+obj-$(CONFIG_CPU_FREQ_IMX)    += cpufreq.o
 ifdef CONFIG_SND_IMX_SOC
 obj-y += ssi-fiq.o
 obj-y += ssi-fiq-ksym.o
arch/arm/plat-mxc/cpufreq.c new file +6 -0
new file mode 100644
index 0000000..9cabeb9
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public

arch/arm/plat-mxc/cpufreq.c line 16

Quoted 10 lines
arch/arm/plat-mxc/cpufreq.c new file +10 -0
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/*
+ * A driver for the Freescale Semiconductor i.MXC CPUfreq module.
+ * The CPUFREQ driver is for controling CPU frequency. It allows you to

change

Quoted 25 lines
arch/arm/plat-mxc/cpufreq.c new file +25 -0
+ * the CPU clock speed on the fly.
+ */
+
+#include <linux/cpufreq.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/slab.h>
+#include <mach/hardware.h>
+#include <mach/clock.h>
+
+#define CLK32_FREQ   32768
+#define NANOSECOND   (1000 * 1000 * 1000)
+
+static int cpu_freq_khz_min;
+static int cpu_freq_khz_max;
+static int arm_normal_clk;
+
+static struct clk *cpu_clk;
+static struct cpufreq_frequency_table *imx_freq_table;
+
+static int cpu_op_nr;
+static struct cpu_op *cpu_op_tbl;
+
+static int set_cpu_freq(int freq)
+{
Quoted 9 lines

arch/arm/plat-mxc/cpufreq.c line 47

Quoted 6 lines
arch/arm/plat-mxc/cpufreq.c new file +6 -0
+     int ret = 0;
+     int org_cpu_rate;
+
+     org_cpu_rate = clk_get_rate(cpu_clk);
+     if (org_cpu_rate == freq)
+             return ret;

You already checked this in mxc_set_target. Once is enough.

Well, this fucntion is not only used in mxc_set_target, so it is safer to still keep checking here.

Quoted 65 lines
Quoted 65 lines
arch/arm/plat-mxc/cpufreq.c new file +64 -0
+
+     ret = clk_set_rate(cpu_clk, freq);
+     if (ret != 0) {
+             printk(KERN_DEBUG "cannot set CPU clock rate\n");
+             return ret;
+     }
+
+     return ret;
+}
+
+static int mxc_verify_speed(struct cpufreq_policy *policy)
+{
+     if (policy->cpu != 0)
+             return -EINVAL;
+
+     return cpufreq_frequency_table_verify(policy, imx_freq_table);
+}
+
+static unsigned int mxc_get_speed(unsigned int cpu)
+{
+     if (cpu)
+             return 0;
+
+     return clk_get_rate(cpu_clk) / 1000;
+}
+
+static int mxc_set_target(struct cpufreq_policy *policy,
+                       unsigned int target_freq, unsigned int relation)
+{
+     struct cpufreq_freqs freqs;
+     int freq_Hz;
+     int ret = 0;
+     unsigned int index;
+
+     cpufreq_frequency_table_target(policy, imx_freq_table,
+                     target_freq, relation, &index);
+     freq_Hz = imx_freq_table[index].frequency * 1000;
+
+     freqs.old = clk_get_rate(cpu_clk) / 1000;
+     freqs.new = freq_Hz / 1000;
+     freqs.cpu = 0;
+     freqs.flags = 0;
+     cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+
+     if (freqs.old != freqs.new)
+             ret = set_cpu_freq(freq_Hz);
+
+     cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+
+     return ret;
+}
+
+static int __init mxc_cpufreq_init(struct cpufreq_policy *policy)
+{
+     int ret;
+     int i;
+
+     printk(KERN_INFO "i.MXC CPU frequency driver\n");
+
+     if (policy->cpu != 0)
+             return -EINVAL;
+
+     cpu_clk = clk_get(NULL, "cpu_clk");
+     if (IS_ERR(cpu_clk)) {
Quoted 9 lines

arch/arm/plat-mxc/cpufreq.c line 116

Quoted 5 lines
arch/arm/plat-mxc/cpufreq.c new file +5 -0
+             printk(KERN_ERR "%s: failed to get cpu clock\n", __func__);
+             return PTR_ERR(cpu_clk);
+     }
+
+     cpu_op_tbl = get_cpu_op(&cpu_op_nr);

This will crash every board except the babbage board which happens to set this function pointer.

Add a checking here should avoid that.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20101019/68fec7b5/attachment-0001.html>

maintainer
#5 lore raw

PATCH v3 1/1 cpufreq for freescale mx51

Quoted 15 lines · Yong Shen
Quoted 15 lines

arch/arm/mach-mx5/cpu_op-mx51.c line 23

Quoted 11 lines
arch/arm/mach-mx5/cpu_op-mx51.c new file +8 -0
+#include <linux/kernel.h>
+
+static struct cpu_op mx51_cpu_op[] = {
+     {
+     .cpu_rate = 160000000,},
+     {
+     .cpu_rate = 800000000,},
+};

Why did you remove the values between 800MHz and 160MHz? 400MHz and 200Mhz should work also, no?

Quoted 1 line
Quoted 1 line

It proved that those operating points don't work well.

ok

Quoted 14 lines
Quoted 4 lines
Quoted 4 lines
arch/arm/plat-mxc/cpufreq.c new file +4 -0
+static struct cpu_op *cpu_op_tbl;
+
+static int set_cpu_freq(int freq)
+{
Quoted 9 lines

arch/arm/plat-mxc/cpufreq.c line 47

Quoted 6 lines
arch/arm/plat-mxc/cpufreq.c new file +6 -0
+     int ret = 0;
+     int org_cpu_rate;
+
+     org_cpu_rate = clk_get_rate(cpu_clk);
+     if (org_cpu_rate == freq)
+             return ret;

You already checked this in mxc_set_target. Once is enough.

Quoted 2 lines

Well, this fucntion is not only used in mxc_set_target, so it is safer to still keep checking here.

Then you can skip the check in the calling function.

Quoted 22 lines
Quoted 13 lines
Quoted 13 lines
arch/arm/plat-mxc/cpufreq.c new file +13 -0
+
+static int __init mxc_cpufreq_init(struct cpufreq_policy *policy)
+{
+     int ret;
+     int i;
+
+     printk(KERN_INFO "i.MXC CPU frequency driver\n");
+
+     if (policy->cpu != 0)
+             return -EINVAL;
+
+     cpu_clk = clk_get(NULL, "cpu_clk");
+     if (IS_ERR(cpu_clk)) {
Quoted 9 lines

arch/arm/plat-mxc/cpufreq.c line 116

Quoted 5 lines
arch/arm/plat-mxc/cpufreq.c new file +5 -0
+             printk(KERN_ERR "%s: failed to get cpu clock\n", __func__);
+             return PTR_ERR(cpu_clk);
+     }
+
+     cpu_op_tbl = get_cpu_op(&cpu_op_nr);

This will crash every board except the babbage board which happens to set this function pointer.

Quoted 1 line

Add a checking here should avoid that.

indeed

Sascha

Signature · 4 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

A message that is not in the archive (sent off-list or not yet received): [email protected]

author
#7 lore raw

PATCH v3 1/1 cpufreq for freescale mx51

Vishwanath,

Thanks for suggestion.
Voltage change is not a must for frequency change, and it can be integrate in after regulator driver is ready for mx51.

Yong

Quoted 498 lines · Vishwanath Sripathy

Yong,

Quoted 4 lines · On Mon, Oct 18, 2010 at 1:51 PM, <[email protected]> wrote:

From: Yong Shen <[email protected]>

the operating points are tested on babbage 3.0

Commit log needs more description like
What are the supported operating points,
Is there any link between mpu OPP and other devices? What are the platforms this patch is tested against which codebase/tree this patch is based upon

Quoted 13 lines

---

arch/arm/Kconfig                       |    6 +
arch/arm/mach-mx5/Kconfig              |    1 +
arch/arm/mach-mx5/Makefile             |    1 +
arch/arm/mach-mx5/board-mx51_babbage.c |   12 ++-
arch/arm/mach-mx5/clock-mx51.c         |   22 +++-
arch/arm/mach-mx5/cpu.c                |    2 +
arch/arm/mach-mx5/cpu_op-mx51.c        |   29 +++++
arch/arm/mach-mx5/cpu_op-mx51.h        |   14 +++
arch/arm/plat-mxc/Makefile             |    1 +
arch/arm/plat-mxc/cpufreq.c            |  202

++++++++++++++++++++++++++++++++

Quoted 43 lines

arch/arm/plat-mxc/include/mach/mxc.h | 20 +++-

11 files changed, 306 insertions(+), 4 deletions(-)

create mode 100644 arch/arm/mach-mx5/cpu_op-mx51.c create mode 100644 arch/arm/mach-mx5/cpu_op-mx51.h create mode 100644 arch/arm/plat-mxc/cpufreq.c

arch/arm/Kconfig +0 -0
index e4ea9cb..d9ad605 100644
@@ -1692,6 +1692,12 @@ if ARCH_HAS_CPUFREQ
 

source "drivers/cpufreq/Kconfig"

arch/arm/Kconfig +6 -0
+config CPU_FREQ_IMX
+       tristate "CPUfreq driver for i.MX CPUs"
+       depends on ARCH_MXC && CPU_FREQ
+       help
+         This enables the CPUfreq driver for i.MX CPUs.
+

config CPU_FREQ_SA1100
bool

arch/arm/mach-mx5/Kconfig +1 -0
index 0848db5..7a621b4 100644
@@ -5,6 +5,7 @@ config ARCH_MX51
      default y
      select MXC_TZIC
      select ARCH_MXC_IOMUX_V3
+       select ARCH_HAS_CPUFREQ
 

comment "MX5 platforms:"

arch/arm/mach-mx5/Makefile +0 -0
index 86c66e7..2fadac5 100644
@@ -5,6 +5,7 @@
 # Object file lists.

obj-y := cpu.o mm.o clock-mx51.o devices.o

Review

Quoted 5 lines

+obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o
obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o

(quoted diff) +0 -0

b/arch/arm/mach-mx5/board-mx51_babbage.c

Quoted 19 lines

index 6e384d9..74c796f 100644

arch/arm/mach-mx5/board-mx51_babbage.c +2 -1
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
 * Copyright (C) 2009-2010 Amit Kucheria <[email protected]>
 *
 * The code contained herein is licensed under the GNU General Public
@@ -32,6 +32,7 @@
 #include <asm/mach/time.h>
 
 #include "devices.h"
+#include "cpu_op-mx51.h"
 
 #define BABBAGE_USB_HUB_RESET  (0*32 + 7)      /* GPIO_1_7 */
 #define BABBAGE_USBH1_STP      (0*32 + 27)     /* GPIO_1_27 */

arch/arm/mach-mx5/board-mx51_babbage.c static struct sys_timer mxc_timer = { · line 283

Quoted 4 lines
arch/arm/mach-mx5/board-mx51_babbage.c +1 -0
@@ -279,8 +280,17 @@ static struct sys_timer mxc_timer = {
      .init   = mx51_babbage_timer_init,
 };
 
+static void __init fixup_mxc_board(struct machine_desc *desc, struct tag

*tags,

Review

Quoted 14 lines
arch/arm/mach-mx5/board-mx51_babbage.c +8 -0
+                                  char **cmdline, struct meminfo *mi)
+{
+#if defined(CONFIG_CPU_FREQ_IMX)
+       get_cpu_op = mx51_get_cpu_op;
+#endif
+}
+
 MACHINE_START(MX51_BABBAGE, "Freescale MX51 Babbage Board")
      /* Maintainer: Amit Kucheria <[email protected]> */
+       .fixup = fixup_mxc_board,
      .phys_io = MX51_AIPS1_BASE_ADDR,
      .io_pg_offst = ((MX51_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
      .boot_params = PHYS_OFFSET + 0x100,
(quoted diff) +0 -0

b/arch/arm/mach-mx5/clock-mx51.c

arch/arm/mach-mx5/clock-mx51.c static int _clk_lp_apm_set_parent(struct clk *clk,

Quoted 4 lines

index 6af69de..f89d8a0 100644

arch/arm/mach-mx5/clock-mx51.c +0 -0
@@ -330,7 +330,7 @@ static int _clk_lp_apm_set_parent(struct clk *clk,

struct clk *parent)

arch/arm/mach-mx5/clock-mx51.c static unsigned long clk_arm_get_rate(struct clk

Quoted 9 lines
arch/arm/mach-mx5/clock-mx51.c +1 -1
      return 0;
 }
 
-static unsigned long clk_arm_get_rate(struct clk *clk)
+static unsigned long clk_cpu_get_rate(struct clk *clk)
 {
      u32 cacrr, div;
      unsigned long parent_rate;
@@ -342,6 +342,22 @@ static unsigned long clk_arm_get_rate(struct clk

*clk)

Quoted 19 lines
arch/arm/mach-mx5/clock-mx51.c +16 -0
      return parent_rate / div;
 }
 
+static int clk_cpu_set_rate(struct clk *clk, unsigned long rate)
+{
+       u32 reg, cpu_podf;
+       unsigned long parent_rate;
+
+       parent_rate = clk_get_rate(clk->parent);
+       cpu_podf = parent_rate / rate - 1;
+       /* use post divider to change freq */
+       reg = __raw_readl(MXC_CCM_CACRR);
+       reg &= ~MXC_CCM_CACRR_ARM_PODF_MASK;
+       reg |= cpu_podf << MXC_CCM_CACRR_ARM_PODF_OFFSET;
+       __raw_writel(reg, MXC_CCM_CACRR);
+
+       return 0;
+}
+
Quoted 1 line

static int _clk_periph_apm_set_parent(struct clk *clk, struct clk

*parent)

Review

Quoted 34 lines
{
      u32 reg, mux;
arch/arm/mach-mx5/clock-mx51.c +3 -1
@@ -693,7 +709,8 @@ static struct clk periph_apm_clk = {
 
 static struct clk cpu_clk = {
      .parent = &pll1_sw_clk,
-       .get_rate = clk_arm_get_rate,
+       .get_rate = clk_cpu_get_rate,
+       .set_rate = clk_cpu_set_rate,
 };
 
 static struct clk ahb_clk = {
@@ -837,6 +854,7 @@ static struct clk_lookup lookups[] = {
      _REGISTER_CLOCK("fsl-usb2-udc", "usb", usboh3_clk)
      _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", ahb_clk)
      _REGISTER_CLOCK("imx-keypad.0", NULL, kpp_clk)
+       _REGISTER_CLOCK(NULL, "cpu_clk", cpu_clk)
 };
 
 static void clk_tree_init(void)
arch/arm/mach-mx5/cpu.c +2 -0
index 2d37785..f3fe51a 100644
@@ -22,6 +22,8 @@ static int cpu_silicon_rev = -1;
 
 #define SI_REV 0x48
 
+struct cpu_op *(*get_cpu_op)(int *op);
+
 static void query_silicon_parameter(void)
 {
      void __iomem *rom = ioremap(MX51_IROM_BASE_ADDR, MX51_IROM_SIZE);
(quoted diff) +0 -0

b/arch/arm/mach-mx5/cpu_op-mx51.c

Review

Quoted 35 lines

new file mode 100644
index 0000000..9d34c3d

arch/arm/mach-mx5/cpu_op-mx51.c new file +29 -0
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/types.h>
+#include <mach/hardware.h>
+#include <linux/kernel.h>
+
+static struct cpu_op mx51_cpu_op[] = {
+       {
+       .cpu_rate = 160000000,},
+       {
+       .cpu_rate = 800000000,},
+};
+
+struct cpu_op *mx51_get_cpu_op(int *op)
+{
+       *op = ARRAY_SIZE(mx51_cpu_op);
+       return mx51_cpu_op;
+}
(quoted diff) +0 -0

b/arch/arm/mach-mx5/cpu_op-mx51.h

Quoted 43 lines

new file mode 100644
index 0000000..97477fe

arch/arm/mach-mx5/cpu_op-mx51.h new file +14 -0
@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+extern struct cpu_op *mx51_get_cpu_op(int *op);
arch/arm/plat-mxc/Makefile +0 -0
index 78d405e..a833d38 100644
@@ -16,6 +16,7 @@ obj-$(CONFIG_MXC_ULPI) += ulpi.o

obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o
obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o
obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
+obj-$(CONFIG_CPU_FREQ_IMX) += cpufreq.o
ifdef CONFIG_SND_IMX_SOC
obj-y += ssi-fiq.o
obj-y += ssi-fiq-ksym.o

arch/arm/plat-mxc/cpufreq.c new file +6 -0
new file mode 100644
index 0000000..9cabeb9
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public

arch/arm/plat-mxc/cpufreq.c line 16

Quoted 10 lines
arch/arm/plat-mxc/cpufreq.c new file +10 -0
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/*
+ * A driver for the Freescale Semiconductor i.MXC CPUfreq module.
+ * The CPUFREQ driver is for controling CPU frequency. It allows you to

change

Quoted 58 lines
arch/arm/plat-mxc/cpufreq.c new file +58 -0
+ * the CPU clock speed on the fly.
+ */
+
+#include <linux/cpufreq.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/slab.h>
+#include <mach/hardware.h>
+#include <mach/clock.h>
+
+#define CLK32_FREQ     32768
+#define NANOSECOND     (1000 * 1000 * 1000)
+
+static int cpu_freq_khz_min;
+static int cpu_freq_khz_max;
+static int arm_normal_clk;
+
+static struct clk *cpu_clk;
+static struct cpufreq_frequency_table *imx_freq_table;
+
+static int cpu_op_nr;
+static struct cpu_op *cpu_op_tbl;
+
+static int set_cpu_freq(int freq)
+{
+       int ret = 0;
+       int org_cpu_rate;
+
+       org_cpu_rate = clk_get_rate(cpu_clk);
+       if (org_cpu_rate == freq)
+               return ret;
+
+       ret = clk_set_rate(cpu_clk, freq);
+       if (ret != 0) {
+               printk(KERN_DEBUG "cannot set CPU clock rate\n");
+               return ret;
+       }
+
+       return ret;
+}
+
+static int mxc_verify_speed(struct cpufreq_policy *policy)
+{
+       if (policy->cpu != 0)
+               return -EINVAL;
+
+       return cpufreq_frequency_table_verify(policy, imx_freq_table);
+}
+
+static unsigned int mxc_get_speed(unsigned int cpu)
+{
+       if (cpu)
+               return 0;
+
+       return clk_get_rate(cpu_clk) / 1000;
+}
+
+static int mxc_set_target(struct cpufreq_policy *policy,

arch/arm/plat-mxc/cpufreq.c line 84

Quoted 10 lines
arch/arm/plat-mxc/cpufreq.c new file +10 -0
+                         unsigned int target_freq, unsigned int relation)
+{
+       struct cpufreq_freqs freqs;
+       int freq_Hz;
+       int ret = 0;
+       unsigned int index;
+
+       cpufreq_frequency_table_target(policy, imx_freq_table,
+                       target_freq, relation, &index);
+       freq_Hz = imx_freq_table[index].frequency * 1000;

Is it not needed to scale voltage also along with frequency?

Quoted 18 lines
arch/arm/plat-mxc/cpufreq.c new file +18 -0
+
+       freqs.old = clk_get_rate(cpu_clk) / 1000;
+       freqs.new = freq_Hz / 1000;
+       freqs.cpu = 0;
+       freqs.flags = 0;
+       cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+
+       if (freqs.old != freqs.new)
+               ret = set_cpu_freq(freq_Hz);
+
+       cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+
+       return ret;
+}
+
+static int __init mxc_cpufreq_init(struct cpufreq_policy *policy)
+{
+       int ret;

arch/arm/plat-mxc/cpufreq.c

Quoted 10 lines
arch/arm/plat-mxc/cpufreq.c new file +10 -0
+       int i;
+
+       printk(KERN_INFO "i.MXC CPU frequency driver\n");
+
+       if (policy->cpu != 0)
+               return -EINVAL;
+
+       cpu_clk = clk_get(NULL, "cpu_clk");
+       if (IS_ERR(cpu_clk)) {
+               printk(KERN_ERR "%s: failed to get cpu clock\n",

__func__);

Quoted 78 lines
arch/arm/plat-mxc/cpufreq.c new file +78 -0
+               return PTR_ERR(cpu_clk);
+       }
+
+       cpu_op_tbl = get_cpu_op(&cpu_op_nr);
+
+       cpu_freq_khz_min = cpu_op_tbl[0].cpu_rate / 1000;
+       cpu_freq_khz_max = cpu_op_tbl[0].cpu_rate / 1000;
+
+       imx_freq_table = kmalloc(
+               sizeof(struct cpufreq_frequency_table) * (cpu_op_nr + 1),
+                       GFP_KERNEL);
+       if (!imx_freq_table) {
+               clk_put(cpu_clk);
+               return -ENOMEM;
+       }
+
+       for (i = 0; i < cpu_op_nr; i++) {
+               imx_freq_table[i].index = i;
+               imx_freq_table[i].frequency =
+                   cpu_op_tbl[i].cpu_rate / 1000;
+
+               if ((cpu_op_tbl[i].cpu_rate / 1000) < cpu_freq_khz_min)
+                       cpu_freq_khz_min = cpu_op_tbl[i].cpu_rate / 1000;
+
+               if ((cpu_op_tbl[i].cpu_rate / 1000) > cpu_freq_khz_max)
+                       cpu_freq_khz_max = cpu_op_tbl[i].cpu_rate / 1000;
+       }
+
+       imx_freq_table[i].index = i;
+       imx_freq_table[i].frequency = CPUFREQ_TABLE_END;
+
+       policy->cur = clk_get_rate(cpu_clk) / 1000;
+       policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
+       policy->min = policy->cpuinfo.min_freq = cpu_freq_khz_min;
+       policy->max = policy->cpuinfo.max_freq = cpu_freq_khz_max;
+
+       arm_normal_clk = cpu_freq_khz_max * 1000;
+
+       /* Manual states, that PLL stabilizes in two CLK32 periods */
+       policy->cpuinfo.transition_latency = 2 / CLK32_FREQ * NANOSECOND;
+
+       ret = cpufreq_frequency_table_cpuinfo(policy, imx_freq_table);
+
+       if (ret < 0) {
+               clk_put(cpu_clk);
+               printk(KERN_ERR "%s: failed to register i.MXC CPUfreq\n",
+                      __func__);
+               return ret;
+       }
+
+       cpufreq_frequency_table_get_attr(imx_freq_table, policy->cpu);
+       return 0;
+}
+
+static int mxc_cpufreq_exit(struct cpufreq_policy *policy)
+{
+       cpufreq_frequency_table_put_attr(policy->cpu);
+
+       set_cpu_freq(arm_normal_clk);
+       clk_put(cpu_clk);
+       kfree(imx_freq_table);
+       return 0;
+}
+
+static struct cpufreq_driver mxc_driver = {
+       .flags = CPUFREQ_STICKY,
+       .verify = mxc_verify_speed,
+       .target = mxc_set_target,
+       .get = mxc_get_speed,
+       .init = mxc_cpufreq_init,
+       .exit = mxc_cpufreq_exit,
+       .name = "imx",
+};
+
+static int __devinit mxc_cpufreq_driver_init(void)
+{
+       return cpufreq_register_driver(&mxc_driver);
+}

arch/arm/plat-mxc/cpufreq.c

Quoted 10 lines
arch/arm/plat-mxc/cpufreq.c new file +10 -0
+
+static void mxc_cpufreq_driver_exit(void)
+{
+       cpufreq_unregister_driver(&mxc_driver);
+}
+
+module_init(mxc_cpufreq_driver_init);
+module_exit(mxc_cpufreq_driver_exit);
+
+MODULE_AUTHOR("Freescale Semiconductor Inc. Yong Shen <

yong.shen at linaro.org>");

Review

Quoted 3 lines
arch/arm/plat-mxc/cpufreq.c new file +2 -0
+MODULE_DESCRIPTION("CPUfreq driver for i.MX");
+MODULE_LICENSE("GPL");
(quoted diff) +0 -0

b/arch/arm/plat-mxc/include/mach/mxc.h

arch/arm/plat-mxc/include/mach/mxc.h line 2

Quoted 7 lines

index a790bf2..888dddc 100644

arch/arm/plat-mxc/include/mach/mxc.h +1 -1
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2004-2007, 2010 Freescale Semiconductor, Inc. All Rights

Reserved.

Quoted 23 lines
arch/arm/plat-mxc/include/mach/mxc.h +16 -0
 * Copyright (C) 2008 Juergen Beisert (kernel at pengutronix.de)
 *
 * This program is free software; you can redistribute it and/or
@@ -133,6 +133,24 @@ extern unsigned int __mxc_cpu_type;
 # define cpu_is_mxc91231()     (0)
 #endif
 
+#ifndef __ASSEMBLY__
+
+struct cpu_op {
+       u32 pll_reg;
+       u32 pll_rate;
+       u32 cpu_rate;
+       u32 pdr0_reg;
+       u32 pdf;
+       u32 mfi;
+       u32 mfd;
+       u32 mfn;
+       u32 cpu_voltage;
+       u32 cpu_podf;
+};
+
+extern struct cpu_op *(*get_cpu_op)(int *op);
Quoted 9 lines
Quoted 8 lines
arch/arm/plat-mxc/include/mach/mxc.h +2 -1
+#endif
+
 #if defined(CONFIG_ARCH_MX3) || defined(CONFIG_ARCH_MX2)
 /* These are deprecated, use mx[23][157]_setup_weimcs instead. */
 #define CSCR_U(n) (IO_ADDRESS(WEIM_BASE_ADDR + n * 0x10))
--

1.6.3.3

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20101019/8f9d4b79/attachment-0001.html>