clk: exynos4: migrate to common clock framework
Subsystems (6)
v3 cover clk: exynos4: migrate to common clock framework
This patch series migrates the Samsung Exynos4 SoC clock code to adopt the common clock framework. The use of Samsung specific clock structures has been removed and all board support code has been updated. imx-style of clock registration and lookup has been adopted for device tree based exynos4 platforms.
This patch series is based on the for-next branch of Samsung maintainer's tree with all patches merged from clk-next branch of Mike's tree. This series has been tested on Exynos4210 based Origen board and Exynos4412 based smdk board.
Thomas Abraham (11):
clk: samsung: add common clock framework helper functions for Samsung platforms
clk: samsung: add pll clock registration helper functions
clk: exynos4: register clocks using common clock framework
ARM: Exynos4: Migrate clock support to common clock framework
ARM: dts: add exynos4 clock controller nodes
ARM: dts: add xxti and xusbxti fixed rate clock nodes for exynos4 based platforms
ARM: Exynos4: allow legacy board support to specify xxti and xusbxti clock speed
ARM: dts: add clock provider information for all controllers in Exynos4 SoC
ARM: Exynos4: remove auxdata table from machine file
ARM: Exynos: use fin_pll clock as the tick clock source for mct
ARM: Exynos: add support for mct clock setup
.../devicetree/bindings/clock/exynos4-clock.txt | 215 +++
arch/arm/boot/dts/exynos4.dtsi | 48 + arch/arm/boot/dts/exynos4210-origen.dts | 12 + arch/arm/boot/dts/exynos4210-smdkv310.dts | 12 + arch/arm/boot/dts/exynos4210.dtsi | 6 + arch/arm/boot/dts/exynos4412-smdk4412.dts | 12 + arch/arm/boot/dts/exynos4x12.dtsi | 6 + arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-exynos/Makefile | 3 - arch/arm/mach-exynos/clock-exynos4.c | 1602 -------------------- arch/arm/mach-exynos/clock-exynos4.h | 35 - arch/arm/mach-exynos/clock-exynos4210.c | 188 --- arch/arm/mach-exynos/clock-exynos4212.c | 192 --- arch/arm/mach-exynos/common.c | 24 +- arch/arm/mach-exynos/common.h | 4 + arch/arm/mach-exynos/mach-armlex4210.c | 1 - arch/arm/mach-exynos/mach-exynos4-dt.c | 69 +- arch/arm/mach-exynos/mach-nuri.c | 3 +- arch/arm/mach-exynos/mach-origen.c | 3 +- arch/arm/mach-exynos/mach-smdk4x12.c | 1 - arch/arm/mach-exynos/mach-smdkv310.c | 3 +- arch/arm/mach-exynos/mach-universal_c210.c | 3 +- arch/arm/mach-exynos/mct.c | 33 +- arch/arm/plat-samsung/Kconfig | 4 +- drivers/clk/Makefile | 1 + drivers/clk/samsung/Makefile | 6 + drivers/clk/samsung/clk-exynos4.c | 641 ++++++++ drivers/clk/samsung/clk-pll.c | 400 +++++ drivers/clk/samsung/clk-pll.h | 38 + drivers/clk/samsung/clk.c | 176 +++ drivers/clk/samsung/clk.h | 218 +++ 31 files changed, 1842 insertions(+), 2118 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/exynos4-clock.txt delete mode 100644 arch/arm/mach-exynos/clock-exynos4.c delete mode 100644 arch/arm/mach-exynos/clock-exynos4.h delete mode 100644 arch/arm/mach-exynos/clock-exynos4210.c delete mode 100644 arch/arm/mach-exynos/clock-exynos4212.c create mode 100644 drivers/clk/samsung/Makefile create mode 100644 drivers/clk/samsung/clk-exynos4.c create mode 100644 drivers/clk/samsung/clk-pll.c create mode 100644 drivers/clk/samsung/clk-pll.h create mode 100644 drivers/clk/samsung/clk.c create mode 100644 drivers/clk/samsung/clk.h
Signature · 1 line
1.7.4.4
PATCH v3 1/11 clk: samsung: add common clock framework helper functions for Samsung platforms
All Samsung platforms include different types of clock including fixed-rate, mux, divider and gate clock types. There are typically hundreds of such clocks on each of the Samsung platforms. To enable Samsung platforms to register these clocks using the common clock framework, a bunch of utility functions are introduced here which simplify the clock registration process. The clocks are usually statically instantiated and registered with common clock framework.
--- drivers/clk/Makefile | 1 + drivers/clk/samsung/Makefile | 5 + drivers/clk/samsung/clk.c | 176 ++++++++++++++++++++++++++++++++++ drivers/clk/samsung/clk.h | 218 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 400 insertions(+), 0 deletions(-) create mode 100644 drivers/clk/samsung/Makefile create mode 100644 drivers/clk/samsung/clk.c create mode 100644 drivers/clk/samsung/clk.h
drivers/clk/Makefile +1 -0
@@ -19,6 +19,7 @@ endif obj-$(CONFIG_MACH_LOONGSON1) += clk-ls1x.o obj-$(CONFIG_ARCH_U8500) += ux500/ obj-$(CONFIG_ARCH_VT8500) += clk-vt8500.o +obj-$(CONFIG_PLAT_SAMSUNG) += samsung/ # Chip specific obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o
drivers/clk/samsung/Makefile new file +5 -0
@@ -0,0 +1,5 @@ +# +# Samsung Clock specific Makefile +# + +obj-$(CONFIG_PLAT_SAMSUNG) += clk.o
drivers/clk/samsung/clk.c new file +176 -0
176 lines not on this page · raw message
drivers/clk/samsung/clk.h new file +218 -0
218 lines not on this page · raw message
Signature · 1 line
1.7.4.4
PATCH v3 1/11 clk: samsung: add common clock framework helper functions for Samsung platforms
Hi Thomas,
Looks mostly good, but I have some minor comments inline.
Quoted 62 lines · On Thursday 15 of November 2012 03:37:23 Thomas Abraham wrote:
All Samsung platforms include different types of clock including fixed-rate, mux, divider and gate clock types. There are typically hundreds of such clocks on each of the Samsung platforms. To enable Samsung platforms to register these clocks using the common clock framework, a bunch of utility functions are introduced here which simplify the clock registration process. The clocks are usually statically instantiated and registered with common clock framework.
Cc Mike Turquette <[email protected]>Cc Kukjin Kim <[email protected]>Signed-off-by Thomas Abraham <[email protected]>--- drivers/clk/Makefile | 1 + drivers/clk/samsung/Makefile | 5 + drivers/clk/samsung/clk.c | 176 ++++++++++++++++++++++++++++++++++ drivers/clk/samsung/clk.h | 218 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 400 insertions(+), 0 deletions(-) create mode 100644 drivers/clk/samsung/Makefile create mode 100644 drivers/clk/samsung/clk.c create mode 100644 drivers/clk/samsung/clk.hdrivers/clk/Makefile +1
-0@@ -19,6 +19,7 @@ endif obj-$(CONFIG_MACH_LOONGSON1) += clk-ls1x.o obj-$(CONFIG_ARCH_U8500) += ux500/ obj-$(CONFIG_ARCH_VT8500) += clk-vt8500.o +obj-$(CONFIG_PLAT_SAMSUNG) += samsung/ # Chip specific obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.odrivers/clk/samsung/Makefile new file +5
-0@@ -0,0 +1,5 @@ +# +# Samsung Clock specific Makefile +# + +obj-$(CONFIG_PLAT_SAMSUNG) += clk.odrivers/clk/samsung/clk.c new file +7
-0@@ -0,0 +1,176 @@ +/* +* Copyright (c) 2012 Samsung Electronics Co., Ltd. +* Copyright (c) 2012 Linaro Ltd. +* Author: Thomas Abraham <[email protected]> +* +* 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.
+ *
+ * This file includes utility functions to register clocks to common
+ * clock framework for Samsung platforms.
drivers/clk/samsung/clk.c line 19
Quoted 8 lines
drivers/clk/samsung/clk.c new file +8
-0+*/ + +#include "clk.h" + +static DEFINE_SPINLOCK (lock); +static struct clk **clk_table; +static struct clk_onecell_data clk_data; +void __iomem *reg_base;
Shouldn't it be static?
Quoted 21 lines
drivers/clk/samsung/clk.c new file +3
-0+ +/* setup the essentials required to support clock lookup using ccf */ +void __init samsung_clk_init(struct device_node *np, void __iomem*base, + unsigned long
nr_clks)drivers/clk/samsung/clk.c new file +15
-0+{ + reg_base = base; +if (!np) +return ; + + clk_table =kzalloc (sizeof (struct clk *) * nr_clks,GFP_KERNEL ); +if (!clk_table) +panic ("could not allocate clock lookup table\n" ); + + clk_data.clks = clk_table; + clk_data.clk_num = nr_clks; +of_clk_add_provider (np, of_clk_src_onecell_get, &clk_data); +} + +/* add a clock instance to the clock lookup table used for dt based lookup */ +void
samsung_clk_add_lookup(struct clk *clk, unsigned int id)+{
drivers/clk/samsung/clk.c line 41
Quoted 1 line
drivers/clk/samsung/clk.c new file +1
-0+if (clk_table && id)
I'm not sure if we really need this kind of checks, but if we do, then shouldn't we also check id against clk_data.clk_num to prevent out of bound index?
Quoted 13 lines
drivers/clk/samsung/clk.c new file +13
-0+ clk_table[id] = clk; +} + +/* register a list of fixed clocks */ +void __init samsung_clk_register_fixed_rate ( +struct samsung_fixed_rate_clock *list,unsigned int nr_clk) +{ +struct clk *clk; +unsigned int idx, ret; + +for (idx =0 ; idx < nr_clk; idx++, list++) { + clk =clk_register_fixed_rate (NULL , list->name, + list->parent_name, list->flags, list->fixed_rate);
drivers/clk/samsung/clk.c
Quoted 10 lines
drivers/clk/samsung/clk.c new file +10
-0+if (IS_ERR (clk)) { +pr_err ("%s: failed to register clock %s\n" , __func__, + list->name); +continue ; + } + +samsung_clk_add_lookup (clk, list->id); + +/* +* Unconditionally add a clock lookup for the fixed rate
clocks.
Quoted 19 lines
drivers/clk/samsung/clk.c new file +19
-0+* There are not many of these on any of Samsung platforms. +*/ + ret =clk_register_clkdev (clk, list->name,NULL ); +if (ret) +pr_err ("%s: failed to register clock lookup for %s" , + __func__, list->name); + } +} + +/* register a list of mux clocks */ +void __init samsung_clk_register_mux (struct samsung_mux_clock *list, +unsigned int nr_clk) +{ +struct clk *clk; +unsigned int idx, ret; + +for (idx =0 ; idx < nr_clk; idx++, list++) { + clk = clk_register_mux(NULL, list->name, list->parent_names, + list->num_parents, list->flags, reg_base + list->offset,
drivers/clk/samsung/clk.c
Quoted 10 lines
drivers/clk/samsung/clk.c new file +10
-0+ list->shift, list->width, list->mux_flags, &lock); +if (IS_ERR (clk)) { +pr_err ("%s: failed to register clock %s\n" , __func__, + list->name); +continue ; + } + +samsung_clk_add_lookup (clk, list->id); + +/* register a clock lookup only if a clock alias is specified
*/
Quoted 21 lines
drivers/clk/samsung/clk.c new file +19
-0+if (list->alias) { + ret =clk_register_clkdev (clk, list->alias, + list->dev_name); +if (ret) +pr_err ("%s: failed to register lookup %s\n" , + __func__, list->alias); + } + } +} + +/* register a list of div clocks */ +void __init samsung_clk_register_div (struct samsung_div_clock *list, +unsigned int nr_clk) +{ +struct clk *clk; +unsigned int idx, ret; + +for (idx =0 ; idx < nr_clk; idx++, list++) { + clk = clk_register_divider(NULL, list->name, list-
parent_name,drivers/clk/samsung/clk.c new file +1
-0+ list->flags, reg_base + list->offset, list->shift,
drivers/clk/samsung/clk.c
Quoted 10 lines
drivers/clk/samsung/clk.c new file +10
-0+ list->width, list->div_flags, &lock); +if (IS_ERR (clk)) { +pr_err ("clock: failed to register clock %s\n" , + list->name); +continue ; + } + +samsung_clk_add_lookup (clk, list->id); + +/* register a clock lookup only if a clock alias is specified
*/
Quoted 18 lines
drivers/clk/samsung/clk.c new file +18
-0+if (list->alias) { + ret =clk_register_clkdev (clk, list->alias, + list->dev_name); +if (ret) +pr_err ("%s: failed to register lookup %s\n" , + __func__, list->alias); + } + } +} + +/* register a list of gate clocks */ +void __init samsung_clk_register_gate (struct samsung_gate_clock *list, +unsigned int nr_clk) +{ +struct clk *clk; +unsigned int idx, ret; + +for (idx =0 ; idx < nr_clk; idx++, list++) {
drivers/clk/samsung/clk.c
Quoted 10 lines
drivers/clk/samsung/clk.c new file +10
-0+ clk =clk_register_gate (NULL , list->name, list->parent_name, + list->flags, reg_base + list->offset, + list->bit_idx, list->gate_flags, &lock); +if (IS_ERR (clk)) { +pr_err ("clock: failed to register clock %s\n" , + list->name); +continue ; + } + +/* register a clock lookup only if a clock alias is specified
*/
Quoted 56 lines
drivers/clk/samsung/clk.c new file +25
-0+if (list->alias) { + ret =clk_register_clkdev (clk, list->alias, + list->dev_name); +if (ret) +pr_err ("%s: failed to register lookup %s\n" , + __func__, list->alias); + } + +samsung_clk_add_lookup (clk, list->id); + } +} + +/* utility function to get the rate of a specified clock */ +unsigned long _get_rate (const char *clk_name) +{ +struct clk *clk; +unsigned long rate; + + clk =clk_get (NULL , clk_name); +if (IS_ERR (clk)) +return 0 ; + rate =clk_get_rate (clk); +clk_put (clk); +return rate; +}drivers/clk/samsung/clk.h new file +7
-0@@ -0,0 +1,218 @@ +/* +* Copyright (c) 2012 Samsung Electronics Co., Ltd. +* Copyright (c) 2012 Linaro Ltd. +* Author: Thomas Abraham <[email protected]> +* +* 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.
+ *
+ * Common Clock Framework support for all Samsung platformsdrivers/clk/samsung/clk.h new file +15
-0+*/ + +#ifndef __SAMSUNG_CLK_H +#define __SAMSUNG_CLK_H + +#include <linux/clk.h> +#include <linux/clkdev.h> +#include <linux/io.h> +#include <linux/clk-provider.h> +#include <linux/of.h> +#include <linux/of_address.h> + +#include <mach/map.h> + +/**
drivers/clk/samsung/clk.h line 35
Quoted 10 lines
drivers/clk/samsung/clk.h new file +10
-0+* struct samsung_fixed_rate_clock: information about fixed-rate clock +* @id: platform specific id of the clock. +* @name: name of this fixed-rate clock. +* @parent_name: optional parent clock name. +* @flags: optional fixed-rate clock flags. +* @fixed-rate: fixed clock rate of this clock. +*/ +struct samsung_fixed_rate_clock { +unsigned int id; +char *name;
Shouldn't it be const char *name?
Quoted 20 lines
drivers/clk/samsung/clk.h new file +20
-0+const char *parent_name; +unsigned long flags; +unsigned long fixed_rate; +}; + +#define FRATE (_id, cname, pname, f, frate) \ + { \ + .id = _id, \ + .name = cname, \ + .parent_name = pname, \ + .flags = f, \ + .fixed_rate = frate, \ + } + +/** +* struct samsung_mux_clock: information about mux clock +* @id: platform specific id of the clock. +* @dev_name: name of the device to which this clock belongs. +* @name: name of this mux clock. +* @parent_names: array of pointer to parent clock names.
drivers/clk/samsung/clk.h line 65
Quoted 10 lines
drivers/clk/samsung/clk.h new file +10
-0+* @num_parents: number of parents listed in @parent_names. +* @flags: optional flags for basic clock. +* @offset: offset of the register for configuring the mux. +* @shift: starting bit location of the mux control bit-field in @reg. +* @width: width of the mux control bit-field in @reg. +* @mux_flags: flags for mux-type clock. +* @alias: optional clock alias name to be assigned to this clock. +*/ +struct samsung_mux_clock { +const unsigned int id;
Is const unsigned int really correct?
Quoted 40 lines
drivers/clk/samsung/clk.h new file +40
-0+const char *dev_name; +const char *name; +const char **parent_names; +u8 num_parents; +unsigned long flags; +unsigned long offset; +u8 shift; +u8 width; +u8 mux_flags; +const char *alias; +}; + +#define __MUX (_id, dname, cname, pnames, o, s, w, f, mf, a) \ + { \ + .id = _id, \ + .dev_name = dname, \ + .name = cname, \ + .parent_names = pnames, \ + .num_parents = ARRAY_SIZE(pnames), \ + .flags = f, \ + .offset = o, \ + .shift = s, \ + .width = w, \ + .mux_flags = mf, \ + .alias = a, \ + } + +#define MUX (_id, cname, pnames, o, s, w) \ + __MUX(_id, NULL, cname, pnames, o, s, w, 0, 0, NULL) + +#define MUX_A (_id, cname, pnames, o, s, w, a) \ + __MUX(_id, NULL, cname, pnames, o, s, w, 0, 0, a) + +#define MUX_F (_id, cname, pnames, o, s, w, f, mf) \ + __MUX(_id, NULL, cname, pnames, o, s, w, f, mf, NULL) + +/** +* @id: platform specific id of the clock. +* struct samsung_div_clock: information about div clock +* @dev_name: name of the device to which this clock belongs.
drivers/clk/samsung/clk.h line 115
Quoted 10 lines
drivers/clk/samsung/clk.h new file +10
-0+* @name: name of this div clock. +* @parent_name: name of the parent clock. +* @flags: optional flags for basic clock. +* @offset: offset of the register for configuring the div. +* @shift: starting bit location of the div control bit-field in @reg. +* @div_flags: flags for div-type clock. +* @alias: optional clock alias name to be assigned to this clock. +*/ +struct samsung_div_clock { +const unsigned int id;
ditto
Quoted 38 lines
drivers/clk/samsung/clk.h new file +38
-0+const char *dev_name; +const char *name; +const char *parent_name; +unsigned long flags; +unsigned long offset; +u8 shift; +u8 width; +u8 div_flags; +const char *alias; +}; + +#define __DIV (_id, dname, cname, pname, o, s, w, f, df, a) \ + { \ + .id = _id, \ + .dev_name = dname, \ + .name = cname, \ + .parent_name = pname, \ + .flags = f, \ + .offset = o, \ + .shift = s, \ + .width = w, \ + .div_flags = df, \ + .alias = a, \ + } + +#define DIV (_id, cname, pname, o, s, w) \ + __DIV(_id, NULL, cname, pname, o, s, w, 0, 0, NULL) + +#define DIV_A (_id, cname, pname, o, s, w, a) \ + __DIV(_id, NULL, cname, pname, o, s, w, 0, 0, a) + +#define DIV_F (_id, cname, pname, o, s, w, f, df) \ + __DIV(_id, NULL, cname, pname, o, s, w, f, df, NULL) + +/** +* struct samsung_gate_clock: information about gate clock +* @id: platform specific id of the clock. +* @dev_name: name of the device to which this clock belongs.
drivers/clk/samsung/clk.h line 163
Quoted 10 lines
drivers/clk/samsung/clk.h new file +10
-0+* @name: name of this gate clock. +* @parent_name: name of the parent clock. +* @flags: optional flags for basic clock. +* @offset: offset of the register for configuring the gate. +* @bit_idx: bit index of the gate control bit-field in @reg. +* @gate_flags: flags for gate-type clock. +* @alias: optional clock alias name to be assigned to this clock. +*/ +struct samsung_gate_clock { +const unsigned int id;
ditto
Quoted 28 lines
drivers/clk/samsung/clk.h new file +28
-0+const char *dev_name; +const char *name; +const char *parent_name; +unsigned long flags; +unsigned long offset; +u8 bit_idx; +u8 gate_flags; +const char *alias; +}; + +#define __GATE (_id, dname, cname, pname, o, b, f, gf, a) \ + { \ + .id = _id, \ + .dev_name = dname, \ + .name = cname, \ + .parent_name = pname, \ + .flags = f, \ + .offset = o, \ + .bit_idx = b, \ + .gate_flags = gf, \ + .alias = a, \ + } + +#define GATE (_id, cname, pname, o, b, f, gf) \ + __GATE(_id, NULL, cname, pname, o, b, f, gf, NULL) + +#define GATE_A (_id, cname, pname, o, b, f, gf, a) \ + __GATE(_id, NULL, cname, pname, o, b, f, gf, a)
drivers/clk/samsung/clk.h line 201
Quoted 10 lines
drivers/clk/samsung/clk.h new file +10
-0+ +#define GATE_D (_id, dname, cname, pname, o, b, f, gf) \ + __GATE(_id, dname, cname, pname, o, b, f, gf, NULL) + +#define GATE_DA (_id, dname, cname, pname, o, b, f, gf, a) \ + __GATE(_id, dname, cname, pname, o, b, f, gf, a) + +#define PNAME (x) static const char *x[] __initdata + +extern void __iomem *reg_base;
Where is it used? The name suggests that it should rather be static.
--
Best regards,
Tomasz Figa
PATCH v3 1/11 clk: samsung: add common clock framework helper functions for Samsung platforms
Hi Tomasz,
Thanks for reviewing these patches!
Quoted 69 lines · Tomasz Figa
Hi Thomas,
Looks mostly good, but I have some minor comments inline.
Quoted 64 lines · On Thursday 15 of November 2012 03:37:23 Thomas Abraham wrote:
All Samsung platforms include different types of clock including fixed-rate, mux, divider and gate clock types. There are typically hundreds of such clocks on each of the Samsung platforms. To enable Samsung platforms to register these clocks using the common clock framework, a bunch of utility functions are introduced here which simplify the clock registration process. The clocks are usually statically instantiated and registered with common clock framework.
Cc Mike Turquette <[email protected]>Cc Kukjin Kim <[email protected]>Signed-off-by Thomas Abraham <[email protected]>--- drivers/clk/Makefile | 1 + drivers/clk/samsung/Makefile | 5 + drivers/clk/samsung/clk.c | 176 ++++++++++++++++++++++++++++++++++ drivers/clk/samsung/clk.h | 218 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 400 insertions(+), 0 deletions(-) create mode 100644 drivers/clk/samsung/Makefile create mode 100644 drivers/clk/samsung/clk.c create mode 100644 drivers/clk/samsung/clk.hdrivers/clk/Makefile +1
-0@@ -19,6 +19,7 @@ endif obj-$(CONFIG_MACH_LOONGSON1) += clk-ls1x.o obj-$(CONFIG_ARCH_U8500) += ux500/ obj-$(CONFIG_ARCH_VT8500) += clk-vt8500.o +obj-$(CONFIG_PLAT_SAMSUNG) += samsung/ # Chip specific obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.odrivers/clk/samsung/Makefile new file +5
-0@@ -0,0 +1,5 @@ +# +# Samsung Clock specific Makefile +# + +obj-$(CONFIG_PLAT_SAMSUNG) += clk.odrivers/clk/samsung/clk.c new file +7
-0@@ -0,0 +1,176 @@ +/* +* Copyright (c) 2012 Samsung Electronics Co., Ltd. +* Copyright (c) 2012 Linaro Ltd. +* Author: Thomas Abraham <[email protected]> +* +* 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.
+ *
+ * This file includes utility functions to register clocks to common
+ * clock framework for Samsung platforms.drivers/clk/samsung/clk.c new file +2
-0+*/ +
Quoted 8 lines
drivers/clk/samsung/clk.c line 19
Quoted 6 lines
drivers/clk/samsung/clk.c new file +6
-0+#include "clk.h" + +static DEFINE_SPINLOCK (lock); +static struct clk **clk_table; +static struct clk_onecell_data clk_data; +void __iomem *reg_base;Shouldn't it be static?
Yes, I missed that. Will fix.
Quoted 19 lines
Quoted 19 lines
drivers/clk/samsung/clk.c new file +3
-0+ +/* setup the essentials required to support clock lookup using ccf */ +void __init samsung_clk_init(struct device_node *np, void __iomem*base, + unsigned long
nr_clks)drivers/clk/samsung/clk.c new file +14
-0+{ + reg_base = base; +if (!np) +return ; + + clk_table =kzalloc (sizeof (struct clk *) * nr_clks,GFP_KERNEL ); +if (!clk_table) +panic ("could not allocate clock lookup table\n" ); + + clk_data.clks = clk_table; + clk_data.clk_num = nr_clks; +of_clk_add_provider (np, of_clk_src_onecell_get, &clk_data); +} +
Quoted 8 lines
Quoted 4 lines
+/* add a clock instance to the clock lookup table used for dt based lookup */ +void
samsung_clk_add_lookup(struct clk *clk, unsigned int id)+{
+ if (clk_table&& id)I'm not sure if we really need this kind of checks, but if we do, then shouldn't we also check id against clk_data.clk_num to prevent out of bound index?
The entry into the lookup table is required only for device tree based platforms. And clk_table is a dynamically allocated table if booting with device tree support. Since the call to samsung_clk_add_lookup is made for non-dt platforms as well, the check for clk_table ensures that the entry to lookup table is done only for device tree enabled platforms. The check for 'id' ensures that the lookup entry index 0 is not used. There is no clock which has id as 0.
Quoted 176 lines
Quoted 14 lines
drivers/clk/samsung/clk.c new file +13
-0+ clk_table[id] = clk; +} + +/* register a list of fixed clocks */ +void __init samsung_clk_register_fixed_rate ( +struct samsung_fixed_rate_clock *list,unsigned int nr_clk) +{ +struct clk *clk; +unsigned int idx, ret; + +for (idx =0 ; idx < nr_clk; idx++, list++) { + clk =clk_register_fixed_rate (NULL , list->name, + list->parent_name, list->flags, list->fixed_rate);drivers/clk/samsung/clk.c
Quoted 10 lines
drivers/clk/samsung/clk.c new file +10
-0+if (IS_ERR (clk)) { +pr_err ("%s: failed to register clock %s\n" , __func__, + list->name); +continue ; + } + +samsung_clk_add_lookup (clk, list->id); + +/* +* Unconditionally add a clock lookup for the fixed rate clocks.
Quoted 19 lines
drivers/clk/samsung/clk.c new file +19
-0+* There are not many of these on any of Samsung platforms. +*/ + ret =clk_register_clkdev (clk, list->name,NULL ); +if (ret) +pr_err ("%s: failed to register clock lookup for %s" , + __func__, list->name); + } +} + +/* register a list of mux clocks */ +void __init samsung_clk_register_mux (struct samsung_mux_clock *list, +unsigned int nr_clk) +{ +struct clk *clk; +unsigned int idx, ret; + +for (idx =0 ; idx < nr_clk; idx++, list++) { + clk = clk_register_mux(NULL, list->name, list->parent_names, + list->num_parents, list->flags, reg_base + list->offset,drivers/clk/samsung/clk.c
Quoted 10 lines
drivers/clk/samsung/clk.c new file +10
-0+ list->shift, list->width, list->mux_flags, &lock); +if (IS_ERR (clk)) { +pr_err ("%s: failed to register clock %s\n" , __func__, + list->name); +continue ; + } + +samsung_clk_add_lookup (clk, list->id); + +/* register a clock lookup only if a clock alias is specified */
Quoted 21 lines
drivers/clk/samsung/clk.c new file +19
-0+if (list->alias) { + ret =clk_register_clkdev (clk, list->alias, + list->dev_name); +if (ret) +pr_err ("%s: failed to register lookup %s\n" , + __func__, list->alias); + } + } +} + +/* register a list of div clocks */ +void __init samsung_clk_register_div (struct samsung_div_clock *list, +unsigned int nr_clk) +{ +struct clk *clk; +unsigned int idx, ret; + +for (idx =0 ; idx < nr_clk; idx++, list++) { + clk = clk_register_divider(NULL, list->name, list-
parent_name,drivers/clk/samsung/clk.c new file +1
-0+ list->flags, reg_base + list->offset, list->shift,drivers/clk/samsung/clk.c
Quoted 10 lines
drivers/clk/samsung/clk.c new file +10
-0+ list->width, list->div_flags, &lock); +if (IS_ERR (clk)) { +pr_err ("clock: failed to register clock %s\n" , + list->name); +continue ; + } + +samsung_clk_add_lookup (clk, list->id); + +/* register a clock lookup only if a clock alias is specified */
Quoted 18 lines
drivers/clk/samsung/clk.c new file +18
-0+if (list->alias) { + ret =clk_register_clkdev (clk, list->alias, + list->dev_name); +if (ret) +pr_err ("%s: failed to register lookup %s\n" , + __func__, list->alias); + } + } +} + +/* register a list of gate clocks */ +void __init samsung_clk_register_gate (struct samsung_gate_clock *list, +unsigned int nr_clk) +{ +struct clk *clk; +unsigned int idx, ret; + +for (idx =0 ; idx < nr_clk; idx++, list++) {drivers/clk/samsung/clk.c
Quoted 10 lines
drivers/clk/samsung/clk.c new file +10
-0+ clk =clk_register_gate (NULL , list->name, list->parent_name, + list->flags, reg_base + list->offset, + list->bit_idx, list->gate_flags, &lock); +if (IS_ERR (clk)) { +pr_err ("clock: failed to register clock %s\n" , + list->name); +continue ; + } + +/* register a clock lookup only if a clock alias is specified */
Quoted 60 lines
drivers/clk/samsung/clk.c new file +25
-0+if (list->alias) { + ret =clk_register_clkdev (clk, list->alias, + list->dev_name); +if (ret) +pr_err ("%s: failed to register lookup %s\n" , + __func__, list->alias); + } + +samsung_clk_add_lookup (clk, list->id); + } +} + +/* utility function to get the rate of a specified clock */ +unsigned long _get_rate (const char *clk_name) +{ +struct clk *clk; +unsigned long rate; + + clk =clk_get (NULL , clk_name); +if (IS_ERR (clk)) +return 0 ; + rate =clk_get_rate (clk); +clk_put (clk); +return rate; +}drivers/clk/samsung/clk.h new file +7
-0@@ -0,0 +1,218 @@ +/* +* Copyright (c) 2012 Samsung Electronics Co., Ltd. +* Copyright (c) 2012 Linaro Ltd. +* Author: Thomas Abraham <[email protected]> +* +* 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.
+ *
+ * Common Clock Framework support for all Samsung platformsdrivers/clk/samsung/clk.h new file +19
-0+*/ + +#ifndef __SAMSUNG_CLK_H +#define __SAMSUNG_CLK_H + +#include <linux/clk.h> +#include <linux/clkdev.h> +#include <linux/io.h> +#include <linux/clk-provider.h> +#include <linux/of.h> +#include <linux/of_address.h> + +#include <mach/map.h> + +/** +* struct samsung_fixed_rate_clock: information about fixed-rate clock +* @id: platform specific id of the clock. +* @name: name of this fixed-rate clock. +* @parent_name: optional parent clock name.
Quoted 8 lines
drivers/clk/samsung/clk.h line 35
Quoted 6 lines
+ * @flags: optional fixed-rate clock flags.
+ * @fixed-rate: fixed clock rate of this clock.
+ */drivers/clk/samsung/clk.h new file +3
-0+struct samsung_fixed_rate_clock { +unsigned int id; +char *name;Shouldn't it be const char *name?
Yes, I will fix this.
Quoted 25 lines
Quoted 25 lines
drivers/clk/samsung/clk.h new file +24
-0+const char *parent_name; +unsigned long flags; +unsigned long fixed_rate; +}; + +#define FRATE (_id, cname, pname, f, frate) \ + { \ + .id = _id, \ + .name = cname, \ + .parent_name = pname, \ + .flags = f, \ + .fixed_rate = frate, \ + } + +/** +* struct samsung_mux_clock: information about mux clock +* @id: platform specific id of the clock. +* @dev_name: name of the device to which this clock belongs. +* @name: name of this mux clock. +* @parent_names: array of pointer to parent clock names. +* @num_parents: number of parents listed in @parent_names. +* @flags: optional flags for basic clock. +* @offset: offset of the register for configuring the mux. +* @shift: starting bit location of the mux control bit-field in @reg.
Quoted 8 lines
drivers/clk/samsung/clk.h
Quoted 6 lines
+ * @width: width of the mux control bit-field in @reg.
+ * @mux_flags: flags for mux-type clock.
+ * @alias: optional clock alias name to be assigned to this clock.
+ */drivers/clk/samsung/clk.h new file +2
-0+struct samsung_mux_clock { +const unsigned int id;Is const unsigned int really correct?
Sorry, I did not get the problem here.
Quoted 137 lines
Quoted 41 lines
drivers/clk/samsung/clk.h new file +40
-0+const char *dev_name; +const char *name; +const char **parent_names; +u8 num_parents; +unsigned long flags; +unsigned long offset; +u8 shift; +u8 width; +u8 mux_flags; +const char *alias; +}; + +#define __MUX (_id, dname, cname, pnames, o, s, w, f, mf, a) \ + { \ + .id = _id, \ + .dev_name = dname, \ + .name = cname, \ + .parent_names = pnames, \ + .num_parents = ARRAY_SIZE(pnames), \ + .flags = f, \ + .offset = o, \ + .shift = s, \ + .width = w, \ + .mux_flags = mf, \ + .alias = a, \ + } + +#define MUX (_id, cname, pnames, o, s, w) \ + __MUX(_id, NULL, cname, pnames, o, s, w, 0, 0, NULL) + +#define MUX_A (_id, cname, pnames, o, s, w, a) \ + __MUX(_id, NULL, cname, pnames, o, s, w, 0, 0, a) + +#define MUX_F (_id, cname, pnames, o, s, w, f, mf) \ + __MUX(_id, NULL, cname, pnames, o, s, w, f, mf, NULL) + +/** +* @id: platform specific id of the clock. +* struct samsung_div_clock: information about div clock +* @dev_name: name of the device to which this clock belongs. drivers/clk/samsung/clk.h line 115
Quoted 10 lines
drivers/clk/samsung/clk.h new file +10
-0+* @name: name of this div clock. +* @parent_name: name of the parent clock. +* @flags: optional flags for basic clock. +* @offset: offset of the register for configuring the div. +* @shift: starting bit location of the div control bit-field in @reg. +* @div_flags: flags for div-type clock. +* @alias: optional clock alias name to be assigned to this clock. +*/ +struct samsung_div_clock { +const unsigned int id;ditto
Quoted 38 lines
drivers/clk/samsung/clk.h new file +38
-0+const char *dev_name; +const char *name; +const char *parent_name; +unsigned long flags; +unsigned long offset; +u8 shift; +u8 width; +u8 div_flags; +const char *alias; +}; + +#define __DIV (_id, dname, cname, pname, o, s, w, f, df, a) \ + { \ + .id = _id, \ + .dev_name = dname, \ + .name = cname, \ + .parent_name = pname, \ + .flags = f, \ + .offset = o, \ + .shift = s, \ + .width = w, \ + .div_flags = df, \ + .alias = a, \ + } + +#define DIV (_id, cname, pname, o, s, w) \ + __DIV(_id, NULL, cname, pname, o, s, w, 0, 0, NULL) + +#define DIV_A (_id, cname, pname, o, s, w, a) \ + __DIV(_id, NULL, cname, pname, o, s, w, 0, 0, a) + +#define DIV_F (_id, cname, pname, o, s, w, f, df) \ + __DIV(_id, NULL, cname, pname, o, s, w, f, df, NULL) + +/** +* struct samsung_gate_clock: information about gate clock +* @id: platform specific id of the clock. +* @dev_name: name of the device to which this clock belongs. drivers/clk/samsung/clk.h line 163
Quoted 10 lines
drivers/clk/samsung/clk.h new file +10
-0+* @name: name of this gate clock. +* @parent_name: name of the parent clock. +* @flags: optional flags for basic clock. +* @offset: offset of the register for configuring the gate. +* @bit_idx: bit index of the gate control bit-field in @reg. +* @gate_flags: flags for gate-type clock. +* @alias: optional clock alias name to be assigned to this clock. +*/ +struct samsung_gate_clock { +const unsigned int id;ditto
Quoted 32 lines
drivers/clk/samsung/clk.h new file +32
-0+const char *dev_name; +const char *name; +const char *parent_name; +unsigned long flags; +unsigned long offset; +u8 bit_idx; +u8 gate_flags; +const char *alias; +}; + +#define __GATE (_id, dname, cname, pname, o, b, f, gf, a) \ + { \ + .id = _id, \ + .dev_name = dname, \ + .name = cname, \ + .parent_name = pname, \ + .flags = f, \ + .offset = o, \ + .bit_idx = b, \ + .gate_flags = gf, \ + .alias = a, \ + } + +#define GATE (_id, cname, pname, o, b, f, gf) \ + __GATE(_id, NULL, cname, pname, o, b, f, gf, NULL) + +#define GATE_A (_id, cname, pname, o, b, f, gf, a) \ + __GATE(_id, NULL, cname, pname, o, b, f, gf, a) + +#define GATE_D (_id, dname, cname, pname, o, b, f, gf) \ + __GATE(_id, dname, cname, pname, o, b, f, gf, NULL) +
Quoted 8 lines
drivers/clk/samsung/clk.h line 201
Quoted 6 lines
drivers/clk/samsung/clk.h new file +6
-0+#define GATE_DA (_id, dname, cname, pname, o, b, f, gf, a) \ + __GATE(_id, dname, cname, pname, o, b, f, gf, a) + +#define PNAME (x) static const char *x[] __initdata + +extern void __iomem *reg_base;Where is it used? The name suggests that it should rather be static.
Right, this should not have been there. I will remove this.
Thanks,
Thomas.
PATCH v3 1/11 clk: samsung: add common clock framework helper functions for Samsung platforms
Quoted 366 lines · On Thursday 15 of November 2012 14:03:12 Thomas Abraham wrote:
Hi Tomasz,
Thanks for reviewing these patches!
Quoted 76 lines · Tomasz Figa
Hi Thomas,
Looks mostly good, but I have some minor comments inline.
Quoted 71 lines · On Thursday 15 of November 2012 03:37:23 Thomas Abraham wrote:
All Samsung platforms include different types of clock including fixed-rate, mux, divider and gate clock types. There are typically hundreds of such clocks on each of the Samsung platforms. To enable Samsung platforms to register these clocks using the common clock framework, a bunch of utility functions are introduced here which simplify the clock registration process. The clocks are usually statically instantiated and registered with common clock framework.
Cc Mike Turquette <[email protected]>Cc Kukjin Kim <[email protected]>Signed-off-by Thomas Abraham <[email protected]>---
drivers/clk/Makefile | 1 + drivers/clk/samsung/Makefile | 5 + drivers/clk/samsung/clk.c | 176 ++++++++++++++++++++++++++++++++++ drivers/clk/samsung/clk.h | 218++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 400 insertions(+), 0 deletions(-)
create mode 100644 drivers/clk/samsung/Makefile create mode 100644 drivers/clk/samsung/clk.c create mode 100644 drivers/clk/samsung/clk.hdrivers/clk/Makefile +1
-0@@ -19,6 +19,7 @@ endif obj-$(CONFIG_MACH_LOONGSON1) += clk-ls1x.o obj-$(CONFIG_ARCH_U8500) += ux500/ obj-$(CONFIG_ARCH_VT8500) += clk-vt8500.o +obj-$(CONFIG_PLAT_SAMSUNG) += samsung/# Chip specific
obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o(quoted diff) +0
-0b/drivers/clk/samsung/Makefile new file mode 100644 index 0000000..3f926b0
drivers/clk/samsung/Makefile new file +5
-0@@ -0,0 +1,5 @@ +# +# Samsung Clock specific Makefile +# + +obj-$(CONFIG_PLAT_SAMSUNG) += clk.odrivers/clk/samsung/clk.c new file +6
-0@@ -0,0 +1,176 @@ +/* +* Copyright (c) 2012 Samsung Electronics Co., Ltd. +* Copyright (c) 2012 Linaro Ltd. +* Author: Thomas Abraham <[email protected]> +* +* 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.
+ *
+ * This file includes utility functions to register clocks to common
+ * clock framework for Samsung platforms.drivers/clk/samsung/clk.c new file +2
-0+*/ +Quoted 8 lines
drivers/clk/samsung/clk.c line 19
Quoted 6 lines
drivers/clk/samsung/clk.c new file +6
-0+#include "clk.h" + +static DEFINE_SPINLOCK (lock); +static struct clk **clk_table; +static struct clk_onecell_data clk_data; +void __iomem *reg_base;Shouldn't it be static?
Yes, I missed that. Will fix.
Quoted 20 lines
Quoted 20 lines
drivers/clk/samsung/clk.c new file +2
-0+ +/* setup the essentials required to support clock lookup using ccf */
+void__initsamsung_clk_init(structdevice_node*np, void__iomem
*base, + unsigned longnr_clks)drivers/clk/samsung/clk.c new file +6
-0+{ + reg_base = base; +if (!np) +return ; + + clk_table = kzalloc(sizeof(struct clk *) * nr_clks,
GFP_KERNEL);drivers/clk/samsung/clk.c new file +8
-0+if (!clk_table) +panic ("could not allocate clock lookup table\n" ); + + clk_data.clks = clk_table; + clk_data.clk_num = nr_clks; +of_clk_add_provider (np, of_clk_src_onecell_get, &clk_data); +} +Quoted 8 lines
Quoted 4 lines
+/* add a clock instance to the clock lookup table used for dt based lookup */ +void
samsung_clk_add_lookup(struct clk *clk, unsigned int id)+{
+ if (clk_table&& id)I'm not sure if we really need this kind of checks, but if we do, then shouldn't we also check id against clk_data.clk_num to prevent out of bound index?
The entry into the lookup table is required only for device tree based platforms. And
clk_tableis a dynamically allocated table if booting with device tree support. Since the call tosamsung_clk_add_lookupis made for non-dt platforms as well, the check forclk_tableensures that the entry to lookup table is done only for device tree enabled platforms. The check for 'id' ensures that the lookup entry index 0 is not used. There is no clock which has id as 0.Quoted 192 lines
Quoted 23 lines
drivers/clk/samsung/clk.c new file +6
-0+ clk_table[id] = clk; +} + +/* register a list of fixed clocks */ +void __init samsung_clk_register_fixed_rate ( + struct samsung_fixed_rate_clock *list, unsigned int
nr_clk) +{drivers/clk/samsung/clk.c new file +6
-0+struct clk *clk; +unsigned int idx, ret; + +for (idx =0 ; idx < nr_clk; idx++, list++) { + clk = clk_register_fixed_rate(NULL, list->name, + list->parent_name, list->flags,
list->fixed_rate); + if (IS_ERR(clk)) {
+ pr_err("%s: failed to register clock %s\n",__func__, +list->name);drivers/clk/samsung/clk.c new file +7
-0+continue ; + } + +samsung_clk_add_lookup (clk, list->id); + +/* +* Unconditionally add a clock lookup for the fixed Quoted 1 line
rate
clocks.
Quoted 30 lines
+ * There are not many of these on any of Samsung
platforms. + */drivers/clk/samsung/clk.c new file +3
-0+ ret =clk_register_clkdev (clk, list->name,NULL ); +if (ret) + pr_err("%s: failed to register clock lookup for%s", +
__func__,list->name);drivers/clk/samsung/clk.c new file +12
-0+ } +} + +/* register a list of mux clocks */ +void __init samsung_clk_register_mux (struct samsung_mux_clock *list, +unsigned int nr_clk) +{ +struct clk *clk; +unsigned int idx, ret; + +for (idx =0 ; idx < nr_clk; idx++, list++) { + clk = clk_register_mux(NULL, list->name,
list->parent_names, +list->num_parents,list->flags,reg_base+list->offset, +list->shift,list->width,list->mux_flags, &lock); + if
(IS_ERR(clk)) {
+ pr_err("%s: failed to register clock %s\n",__func__, +list->name);drivers/clk/samsung/clk.c new file +6
-0+continue ; + } + +samsung_clk_add_lookup (clk, list->id); + +/* register a clock lookup only if a clock alias is Quoted 1 line
specified>
*/
Quoted 34 lines
drivers/clk/samsung/clk.c new file +5
-0+if (list->alias) { + ret =clk_register_clkdev (clk, list->alias, + list->dev_name); +if (ret) + pr_err("%s: failed to register lookup%s\n", +
__func__,list->alias); + }drivers/clk/samsung/clk.c new file +12
-0+ } +} + +/* register a list of div clocks */ +void __init samsung_clk_register_div (struct samsung_div_clock *list, +unsigned int nr_clk) +{ +struct clk *clk; +unsigned int idx, ret; + +for (idx =0 ; idx < nr_clk; idx++, list++) { + clk = clk_register_divider(NULL, list->name, list-
parent_name,+
list->flags,reg_base+list->offset,list->shift, +list->width,list->div_flags,
&lock);drivers/clk/samsung/clk.c new file +9
-0+if (IS_ERR (clk)) { +pr_err ("clock: failed to register clock %s\n" , + list->name); +continue ; + } + +samsung_clk_add_lookup (clk, list->id); + +/* register a clock lookup only if a clock alias is Quoted 1 line
specified>
*/
Quoted 30 lines
drivers/clk/samsung/clk.c new file +5
-0+if (list->alias) { + ret =clk_register_clkdev (clk, list->alias, + list->dev_name); +if (ret) + pr_err("%s: failed to register lookup%s\n", +
__func__,list->alias); + }drivers/clk/samsung/clk.c new file +5
-0+ } +} + +/* register a list of gate clocks */ +void __init samsung_clk_register_gate(struct samsung_gate_clock*list,
drivers/clk/samsung/clk.c new file +7
-0+ unsigned int nr_clk) +{ +struct clk *clk; +unsigned int idx, ret; + +for (idx =0 ; idx < nr_clk; idx++, list++) { + clk = clk_register_gate(NULL, list->name,
list->parent_name, +list->flags,reg_base+list->offset, +list->bit_idx,list->gate_flags, &lock); + if
(IS_ERR(clk)) {drivers/clk/samsung/clk.c new file +6
-0+pr_err ("clock: failed to register clock %s\n" , + list->name); +continue ; + } + +/* register a clock lookup only if a clock alias is Quoted 1 line
specified>
*/
Quoted 62 lines
drivers/clk/samsung/clk.c new file +3
-0+if (list->alias) { + ret = clk_register_clkdev(clk, list->alias, +
list->dev_name);drivers/clk/samsung/clk.c new file +2
-0+if (ret) + pr_err("%s: failed to register lookup%s\n", +
__func__,list->alias);drivers/clk/samsung/clk.c new file +19
-0+ } + +samsung_clk_add_lookup (clk, list->id); + } +} + +/* utility function to get the rate of a specified clock */ +unsigned long _get_rate (const char *clk_name) +{ +struct clk *clk; +unsigned long rate; + + clk =clk_get (NULL , clk_name); +if (IS_ERR (clk)) +return 0 ; + rate =clk_get_rate (clk); +clk_put (clk); +return rate; +}drivers/clk/samsung/clk.h new file +6
-0@@ -0,0 +1,218 @@ +/* +* Copyright (c) 2012 Samsung Electronics Co., Ltd. +* Copyright (c) 2012 Linaro Ltd. +* Author: Thomas Abraham <[email protected]> +* +* 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.
+ *
+ * Common Clock Framework support for all Samsung platformsdrivers/clk/samsung/clk.h new file +16
-0+*/ + +#ifndef __SAMSUNG_CLK_H +#define __SAMSUNG_CLK_H + +#include <linux/clk.h> +#include <linux/clkdev.h> +#include <linux/io.h> +#include <linux/clk-provider.h> +#include <linux/of.h> +#include <linux/of_address.h> + +#include <mach/map.h> + +/** +* struct samsung_fixed_rate_clock: information about fixed-rate clock
+ * @id: platform specific id of the clock.
+ * @name: name of this fixed-rate clock.
+ * @parent_name: optional parent clock name.Quoted 8 lines
drivers/clk/samsung/clk.h line 35
Quoted 6 lines
+ * @flags: optional fixed-rate clock flags.
+ * @fixed-rate: fixed clock rate of this clock.
+ */drivers/clk/samsung/clk.h new file +3
-0+struct samsung_fixed_rate_clock { +unsigned int id; +char *name;Shouldn't it be const char *name?
Yes, I will fix this.
Quoted 25 lines
Quoted 25 lines
drivers/clk/samsung/clk.h new file +24
-0+const char *parent_name; +unsigned long flags; +unsigned long fixed_rate; +}; + +#define FRATE (_id, cname, pname, f, frate) \ + { \ + .id = _id, \ + .name = cname, \ + .parent_name = pname, \ + .flags = f, \ + .fixed_rate = frate, \ + } + +/** +* struct samsung_mux_clock: information about mux clock +* @id: platform specific id of the clock. +* @dev_name: name of the device to which this clock belongs. +* @name: name of this mux clock. +* @parent_names: array of pointer to parent clock names. +* @num_parents: number of parents listed in @parent_names. +* @flags: optional flags for basic clock. +* @offset: offset of the register for configuring the mux. +* @shift: starting bit location of the mux control bit-field in @reg.
Quoted 8 lines
drivers/clk/samsung/clk.h
Quoted 6 lines
+ * @width: width of the mux control bit-field in @reg.
+ * @mux_flags: flags for mux-type clock.
+ * @alias: optional clock alias name to be assigned to this clock.
+ */drivers/clk/samsung/clk.h new file +2
-0+struct samsung_mux_clock { +const unsigned int id;Is const unsigned int really correct?
Quoted 1 line
Sorry, I did not get the problem here.
Basically this const does not give us anything, while it could make problems in future.
Let's say that one would want to register a clock in runtime, dynamically allocating a samsung_*_clock structure. It wouldn't be possible, because he wouldn't be able to set the id field.
Instead of making particular fields in the structures constant, I would prefer making the arrays of these structures constant, as they are statically initialized anyway.
Best regards,
Signature · 3 lines
Tomasz Figa Samsung Poland R&D Center SW Solution Development, Linux Platform
PATCH v3 2/11 clk: samsung: add pll clock registration helper functions
In reply to Thomas AbrahamThere are several types of pll clocks used in Samsung SoC's and these pll clocks can be represented as Samsung specific pll clock types and registered with the common clock framework. Add support for pll35xx, pll36xx, pll45xx and pll46xx clock types and helper functions to register them.
--- drivers/clk/samsung/Makefile | 2 +- drivers/clk/samsung/clk-pll.c | 400 +++++++++++++++++++++++++++++++++++++++++ drivers/clk/samsung/clk-pll.h | 38 ++++ 3 files changed, 439 insertions(+), 1 deletions(-) create mode 100644 drivers/clk/samsung/clk-pll.c create mode 100644 drivers/clk/samsung/clk-pll.h
drivers/clk/samsung/Makefile +1 -1
@@ -2,4 +2,4 @@ # Samsung Clock specific Makefile # -obj-$(CONFIG_PLAT_SAMSUNG) += clk.o +obj-$(CONFIG_PLAT_SAMSUNG) += clk.o clk-pll.o
drivers/clk/samsung/clk-pll.c new file +400 -0
400 lines not on this page · raw message
drivers/clk/samsung/clk-pll.h new file +38 -0
@@ -0,0 +1,38 @@ +/* +* Copyright (c) 2012 Samsung Electronics Co., Ltd. +* Copyright (c) 2012 Linaro Ltd. +* +* 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. +* +* Common Clock Framework support for all Samsung platforms +*/ + +#ifndef __SAMSUNG_CLK_PLL_H +#define __SAMSUNG_CLK_PLL_H + +enum pll45xx_type { + pll_4500, + pll_4502, + pll_4508 +}; + +enum pll46xx_type { + pll_4600, + pll_4650, + pll_4650c, +}; + +extern struct clk *__init samsung_clk_register_pll35xx (const char *name, +const char *pname,const void __iomem *con_reg); +extern struct clk *__init samsung_clk_register_pll36xx (const char *name, +const char *pname,const void __iomem *con_reg); +extern struct clk *__init samsung_clk_register_pll45xx (const char *name, +const char *pname,const void __iomem *con_reg, +enum pll45xx_type type); +extern struct clk *__init samsung_clk_register_pll46xx (const char *name, +const char *pname,const void __iomem *con_reg, +enum pll46xx_type type); + +#endif /* __SAMSUNG_CLK_PLL_H */
Signature · 1 line
1.7.4.4
PATCH v3 3/11 clk: exynos4: register clocks using common clock framework
In reply to Thomas AbrahamThe Exynos4 clocks are statically listed and registered using the Samsung specific common clock helper functions. Both device tree based clock lookup and clkdev based clock lookups are supported.
--- .../devicetree/bindings/clock/exynos4-clock.txt | 215 +++++++ drivers/clk/samsung/Makefile | 1 + drivers/clk/samsung/clk-exynos4.c | 641 ++++++++++++++++++++ 3 files changed, 857 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/exynos4-clock.txt create mode 100644 drivers/clk/samsung/clk-exynos4.c
Documentation/devicetree/bindings/clock/exynos4-clock.txt new file +215 -0
@@ -0,0 +1,215 @@ +* Samsung Exynos4 Clock Controller + +The Exynos4 clock controller generates and supplies clock to various controllers +within the Exynos4 SoC. The clock binding described here is applicable to all +SoC's in the Exynos4 family. + +Required Properties: + +- comptible: should be one of the following. + - "samsung,exynos4210-clock" - controller compatible with Exynos4210 SoC. + - "samsung,exynos4412-clock" - controller compatible with Exynos4412 SoC. + +- reg: physical base address of the controller and length of memory mapped + region. + +- #clock-cells: should be 1. + +The following is the list of clocks generated by the controller. Each clock is +assigned an identifier and client nodes use this identifier to specify the +clock which they consume. Some of the clocks are available only on a particular +Exynos4 SoC and this is specified where applicable. + + + [Core Clocks] + + Clock ID SoC (if specific) + ----------------------------------------------- + + xxti 1 + xusbxti 2 + fin_pll 3 + fout_apll 4 + fout_mpll 5 + fout_epll 6 + fout_vpll 7 + sclk_apll 8 + sclk_mpll 9 + sclk_epll 10 + sclk_vpll 11 + arm_clk 12 + aclk200 13 + aclk100 14 + aclk160 15 + aclk133 16 + + + [Clock Gate for Special Clocks] + + Clock ID SoC (if specific) + ----------------------------------------------- + + sclk_fimc0 128 + sclk_fimc1 129 + sclk_fimc2 130 + sclk_fimc3 131 + sclk_cam0 132 + sclk_cam1 133 + sclk_csis0 134 + sclk_csis1 135 + sclk_hdmi 136 + sclk_mixer 137 + sclk_dac 138 + sclk_pixel 139 + sclk_fimd0 140 + sclk_mdnie0 141 Exynos4412 + sclk_mdnie_pwm0 12 142 Exynos4412 + sclk_mipi0 143 + sclk_audio0 144 + sclk_mmc0 145 + sclk_mmc1 146 + sclk_mmc2 147 + sclk_mmc3 148 + sclk_mmc4 149 + sclk_sata 150 Exynos4210 + sclk_uart0 151 + sclk_uart1 152 + sclk_uart2 153 + sclk_uart3 154 + sclk_uart4 155 + sclk_audio1 156 + sclk_audio2 157 + sclk_spdif 158 + sclk_spi0 159 + sclk_spi1 160 + sclk_spi2 161 + sclk_slimbus 162 + sclk_fimd1 163 Exynos4210 + sclk_mipi1 164 Exynos4210 + sclk_pcm1 165 + sclk_pcm2 166 + sclk_i2s1 167 + sclk_i2s2 168 + sclk_mipihsi 169 Exynos4412 + + + [Peripheral Clock Gates] + + Clock ID SoC (if specific) + ----------------------------------------------- + + fimc0 256 + fimc1 257 + fimc2 258 + fimc3 259 + csis0 260 + csis1 261 + jpeg 262 + smmu_fimc0 263 + smmu_fimc1 264 + smmu_fimc2 265 + smmu_fimc3 266 + smmu_jpeg 267 + vp 268 + mixer 269 + tvenc 270 Exynos4210 + hdmi 271 + smmu_tv 272 + mfc 273 + smmu_mfcl 274 + smmu_mfcr 275 + g3d 276 + g2d 277 Exynos4210 + rotator 278 Exynos4210 + mdma 279 Exynos4210 + smmu_g2d 280 Exynos4210 + smmu_rotator 281 Exynos4210 + smmu_mdma 282 Exynos4210 + fimd0 283 + mie0 284 + mdnie0 285 Exynos4412 + dsim0 286 + smmu_fimd0 287 + fimd1 288 Exynos4210 + mie1 289 Exynos4210 + dsim1 290 Exynos4210 + smmu_fimd1 291 Exynos4210 + pdma0 292 + pdma1 293 + pcie_phy 294 + sata_phy 295 Exynos4210 + tsi 296 + sdmmc0 297 + sdmmc1 298 + sdmmc2 299 + sdmmc3 300 + sdmmc4 301 + sata 302 Exynos4210 + sromc 303 + usb_host 304 + usb_device 305 + pcie 306 + onenand 307 + nfcon 308 + smmu_pcie 309 + gps 310 + smmu_gps 311 + uart0 312 + uart1 313 + uart2 314 + uart3 315 + uart4 316 + i2c0 317 + i2c1 318 + i2c2 319 + i2c3 320 + i2c4 321 + i2c5 322 + i2c6 323 + i2c7 324 + i2c_hdmi 325 + tsadc 326 + spi0 327 + spi1 328 + spi2 329 + i2s1 330 + i2s2 331 + pcm0 332 + i2s0 333 + pcm1 334 + pcm2 335 + pwm 336 + slimbus 337 + spdif 338 + ac97 339 + modemif 340 + chipid 341 + sysreg 342 + hdmi_cec 343 + mct 344 + wdt 345 + rtc 346 + keyif 347 + audss 348 + mipi_hsi 349 Exynos4210 + mdma2 350 Exynos4210 + +Example 1: An example of a clock controller node is listed below. + + clock: clock-controller at 0x10030000 { + compatible = "samsung,exynos4210-clock"; + reg = <0x10030000 0x20000>; + #clock-cells = <1>; + }; + +Example 2: UART controller node that consumes the clock generated by the clock + controller. Refer to the standard clock bindings for information + about 'clocks' and 'clock-names' property. + + serial at 13820000 { + compatible = "samsung,exynos4210-uart"; + reg = <0x13820000 0x100>; + interrupts = <0 54 0>; + clocks = <&clock 314>, <&clock 153>; + clock-names = "uart", "clk_uart_baud0"; + };
drivers/clk/samsung/Makefile +1 -0
@@ -3,3 +3,4 @@ # obj-$(CONFIG_PLAT_SAMSUNG) += clk.o clk-pll.o +obj-$(CONFIG_ARCH_EXYNOS4) += clk-exynos4.o
drivers/clk/samsung/clk-exynos4.c new file +641 -0
641 lines not on this page · raw message
Signature · 1 line
1.7.4.4
PATCH v3 3/11 clk: exynos4: register clocks using common clock framework
Hi Thomas,
Looks mostly good, but I have some minor comments inline.
Quoted 209 lines · On Thursday 15 of November 2012 03:37:25 Thomas Abraham wrote:
The Exynos4 clocks are statically listed and registered using the Samsung specific common clock helper functions. Both device tree based clock lookup and clkdev based clock lookups are supported.
Cc Mike Turquette <[email protected]>Cc Kukjin Kim <[email protected]>Signed-off-by Thomas Abraham <[email protected]>--- .../devicetree/bindings/clock/exynos4-clock.txt | 215 +++++++ drivers/clk/samsung/Makefile | 1 + drivers/clk/samsung/clk-exynos4.c | 641 ++++++++++++++++++++ 3 files changed, 857 insertions(+), 0 deletions(-) create mode 100644
Documentation/devicetree/bindings/clock/exynos4-clock.txtcreate mode 100644drivers/clk/samsung/clk-exynos4.c(quoted diff) +0
-0
b/Documentation/devicetree/bindings/clock/exynos4-clock.txtnew file mode 100644
index 0000000..e874addDocumentation/devicetree/bindings/clock/exynos4-clock.txt new file +3
-0@@ -0,0 +1,215 @@ +* Samsung Exynos4 Clock Controller + +The Exynos4 clock controller generates and supplies clock to variouscontrollers +within the Exynos4 SoC. The clock binding described here is applicable to all +SoC's in the Exynos4 family.
Documentation/devicetree/bindings/clock/exynos4-clock.txt new file +5
-0+ +Required Properties: + +- comptible: should be one of the following. + - "samsung,exynos4210-clock" - controller compatible with Exynos4210SoC. + - "samsung,exynos4412-clock" - controller compatible with Exynos4412 SoC. +
+- reg: physical base address of the controller and length of memory mapped + region.Documentation/devicetree/bindings/clock/exynos4-clock.txt new file +4
-0+ +- #clock-cells: should be 1. + +The following is the list of clocks generated by the controller. Eachclock is +assigned an identifier and client nodes use this identifier to specify the +clock which they consume. Some of the clocks are available only on a particular +Exynos4 SoC and this is specified where applicable.
Documentation/devicetree/bindings/clock/exynos4-clock.txt new file +164
-0+ + + [Core Clocks] + + Clock ID SoC (if specific) + ----------------------------------------------- + + xxti 1 + xusbxti 2 + fin_pll 3 + fout_apll 4 + fout_mpll 5 + fout_epll 6 + fout_vpll 7 + sclk_apll 8 + sclk_mpll 9 + sclk_epll 10 + sclk_vpll 11 + arm_clk 12 + aclk200 13 + aclk100 14 + aclk160 15 + aclk133 16 + + + [Clock Gate for Special Clocks] + + Clock ID SoC (if specific) + ----------------------------------------------- + + sclk_fimc0 128 + sclk_fimc1 129 + sclk_fimc2 130 + sclk_fimc3 131 + sclk_cam0 132 + sclk_cam1 133 + sclk_csis0 134 + sclk_csis1 135 + sclk_hdmi 136 + sclk_mixer 137 + sclk_dac 138 + sclk_pixel 139 + sclk_fimd0 140 + sclk_mdnie0 141 Exynos4412 + sclk_mdnie_pwm0 12 142 Exynos4412 + sclk_mipi0 143 + sclk_audio0 144 + sclk_mmc0 145 + sclk_mmc1 146 + sclk_mmc2 147 + sclk_mmc3 148 + sclk_mmc4 149 + sclk_sata 150 Exynos4210 + sclk_uart0 151 + sclk_uart1 152 + sclk_uart2 153 + sclk_uart3 154 + sclk_uart4 155 + sclk_audio1 156 + sclk_audio2 157 + sclk_spdif 158 + sclk_spi0 159 + sclk_spi1 160 + sclk_spi2 161 + sclk_slimbus 162 + sclk_fimd1 163 Exynos4210 + sclk_mipi1 164 Exynos4210 + sclk_pcm1 165 + sclk_pcm2 166 + sclk_i2s1 167 + sclk_i2s2 168 + sclk_mipihsi 169 Exynos4412 + + + [Peripheral Clock Gates] + + Clock ID SoC (if specific) + ----------------------------------------------- + + fimc0 256 + fimc1 257 + fimc2 258 + fimc3 259 + csis0 260 + csis1 261 + jpeg 262 + smmu_fimc0 263 + smmu_fimc1 264 + smmu_fimc2 265 + smmu_fimc3 266 + smmu_jpeg 267 + vp 268 + mixer 269 + tvenc 270 Exynos4210 + hdmi 271 + smmu_tv 272 + mfc 273 + smmu_mfcl 274 + smmu_mfcr 275 + g3d 276 + g2d 277 Exynos4210 + rotator 278 Exynos4210 + mdma 279 Exynos4210 + smmu_g2d 280 Exynos4210 + smmu_rotator 281 Exynos4210 + smmu_mdma 282 Exynos4210 + fimd0 283 + mie0 284 + mdnie0 285 Exynos4412 + dsim0 286 + smmu_fimd0 287 + fimd1 288 Exynos4210 + mie1 289 Exynos4210 + dsim1 290 Exynos4210 + smmu_fimd1 291 Exynos4210 + pdma0 292 + pdma1 293 + pcie_phy 294 + sata_phy 295 Exynos4210 + tsi 296 + sdmmc0 297 + sdmmc1 298 + sdmmc2 299 + sdmmc3 300 + sdmmc4 301 + sata 302 Exynos4210 + sromc 303 + usb_host 304 + usb_device 305 + pcie 306 + onenand 307 + nfcon 308 + smmu_pcie 309 + gps 310 + smmu_gps 311 + uart0 312 + uart1 313 + uart2 314 + uart3 315 + uart4 316 + i2c0 317 + i2c1 318 + i2c2 319 + i2c3 320 + i2c4 321 + i2c5 322 + i2c6 323 + i2c7 324 + i2c_hdmi 325 + tsadc 326 + spi0 327 + spi1 328 + spi2 329 + i2s1 330 + i2s2 331 + pcm0 332 + i2s0 333 + pcm1 334 + pcm2 335 + pwm 336 + slimbus 337 + spdif 338 + ac97 339 + modemif 340
Documentation/devicetree/bindings/clock/exynos4-clock.txt line 195
Quoted 10 lines
Documentation/devicetree/bindings/clock/exynos4-clock.txt new file +10
-0+ chipid 341 + sysreg 342 + hdmi_cec 343 + mct 344 + wdt 345 + rtc 346 + keyif 347 + audss 348 + mipi_hsi 349 Exynos4210 + mdma2 350 Exynos4210
I wonder what is the state of including the possibility of defining constants in dts into dtc. Is it already merged?
If yes, maybe we could define all those constants instead of specifying these raw numbers?
Quoted 76 lines
Documentation/devicetree/bindings/clock/exynos4-clock.txt new file +9
-0+Example 1: An example of a clock controller node is listed below. + + clock: clock-controller at 0x10030000 { + compatible = "samsung,exynos4210-clock"; + reg = <0x10030000 0x20000>; + #clock-cells = <1>; + }; + +Example 2: UART controller node that consumes the clock generated bythe clock + controller. Refer to the standard clock bindings for
information + about 'clocks' and 'clock-names' property.Documentation/devicetree/bindings/clock/exynos4-clock.txt new file +8
-0+ + serial at 13820000 { + compatible = "samsung,exynos4210-uart"; + reg = <0x13820000 0x100>; + interrupts = <0 54 0>; + clocks = <&clock 314>, <&clock 153>; + clock-names = "uart", "clk_uart_baud0"; + };drivers/clk/samsung/Makefile +1
-0@@ -3,3 +3,4 @@ # obj-$(CONFIG_PLAT_SAMSUNG) += clk.o clk-pll.o +obj-$(CONFIG_ARCH_EXYNOS4) += clk-exynos4.o(quoted diff) +0
-0
b/drivers/clk/samsung/clk-exynos4.cnew file mode 100644 index 0000000..6f0b6a7drivers/clk/samsung/clk-exynos4.c new file +7
-0@@ -0,0 +1,641 @@ +/* +* Copyright (c) 2012 Samsung Electronics Co., Ltd. +* Copyright (c) 2012 Linaro Ltd. +* Author: Thomas Abraham <[email protected]> +* +* 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.
+ *
+ * Common Clock Framework support for all Exynos4 SoC's.drivers/clk/samsung/clk-exynos4.c new file +20
-0+*/ + +#include <linux/clk.h> +#include <linux/clkdev.h> +#include <linux/clk-provider.h> +#include <linux/of.h> +#include <linux/of_address.h> + +#include <plat/cpu.h> +#include "clk.h" +#include "clk-pll.h" + +/* the exynos4 soc type */ +enum exynos4_soc { +EXYNOS4210 , +EXYNOS4X12 , +}; + +/* +* Let each supported clock get a unique id. This id is used to lookup the clock + * for device tree based platforms. The clocks are categorized into three + * sections: core, sclk gate and bus interface gate clocks.
+ *
+ * When adding a new clock to this list, it is advised to choose a clock + * category and add it to the end of that category. That is because the the + * device tree source file is referring to these ids and any change in the + * sequence number of existing clocks will require corresponding change in the + * device tree files. This limitation would go away when pre-processor support + * for dtc would be available.
+ */
drivers/clk/samsung/clk-exynos4.c
Quoted 6 lines
drivers/clk/samsung/clk-exynos4.c new file +6
-0+enum exynos4_clks { + none, + +/* core clocks */ + xxti, xusbxti, fin_pll, fout_apll, fout_mpll, fout_epll, fout_vpll, + sclk_apll, sclk_mpll, sclk_epll, sclk_vpll, arm_clk, aclk200,
aclk100,
drivers/clk/samsung/clk-exynos4.c
Quoted 8 lines
drivers/clk/samsung/clk-exynos4.c new file +8
-0+ aclk160, aclk133, + +/* gate for special clocks (sclk) */ + sclk_fimc0 =128 , sclk_fimc1, sclk_fimc2, sclk_fimc3, sclk_cam0, + sclk_cam1, sclk_csis0, sclk_csis1, sclk_hdmi, sclk_mixer, sclk_dac, + sclk_pixel, sclk_fimd0, sclk_mdnie0, sclk_mdnie_pwm0, sclk_mipi0, + sclk_audio0, sclk_mmc0, sclk_mmc1, sclk_mmc2, sclk_mmc3, sclk_mmc4, + sclk_sata, sclk_uart0, sclk_uart1, sclk_uart2, sclk_uart3,
sclk_uart4,
drivers/clk/samsung/clk-exynos4.c
Quoted 7 lines
drivers/clk/samsung/clk-exynos4.c new file +1
-0+ sclk_audio1, sclk_audio2, sclk_spdif, sclk_spi0, sclk_spi1,
sclk_spi2, +sclk_slimbus,sclk_fimd1,sclk_mipi1,sclk_pcm1,sclk_pcm2,sclk_i2s1, +sclk_i2s2,sclk_mipihsi,drivers/clk/samsung/clk-exynos4.c new file +4
-0+ +/* gate clocks */ + fimc0 =256 , fimc1, fimc2, fimc3, csis0, csis1, jpeg, smmu_fimc0, + smmu_fimc1, smmu_fimc2, smmu_fimc3, smmu_jpeg, vp, mixer, tvenc,
hdmi,
Quoted 5 lines
drivers/clk/samsung/clk-exynos4.c new file +1
-0+ smmu_tv, mfc, smmu_mfcl, smmu_mfcr, g3d, g2d, rotator, mdma,
smmu_g2d, +smmu_rotator,smmu_mdma, fimd0, mie0, mdnie0, dsim0,smmu_fimd0, fimd1, + mie1, dsim1,smmu_fimd1, pdma0, pdma1,pcie_phy,sata_phy, tsi, sdmmc0, + sdmmc1, sdmmc2, sdmmc3, sdmmc4, sata, sromc,usb_host,usb_device, pcie, + onenand, nfcon,smmu_pcie, gps,
smmu_gps,
Quoted 3 lines
uart0, uart1, uart2, uart3, + uart4, i2c0, i2c1, i2c2, i2c3, i2c4,
i2c5, i2c6, i2c7,i2c_hdmi, tsadc, + spi0, spi1, spi2, i2s1, i2s2,
pcm0, i2s0, pcm1, pcm2, pwm, slimbus, + spdif, ac97, modemif,
chipid,
Quoted 14 lines
sysreg,
hdmi_cec, mct, wdt, rtc, keyif, + audss,mipi_hsi, mdma2,drivers/clk/samsung/clk-exynos4.c new file +13
-0+ + nr_clks, +}; +/* list of all parent clock list */ +PNAME (mout_apll_p) = {"fin_pll" ,"fout_apll" , }; +PNAME (mout_mpll_p) = {"fin_pll" ,"fout_mpll" , }; +PNAME (mout_epll_p) = {"fin_pll" ,"fout_epll" , }; +PNAME (mout_vpllsrc_p) = {"fin_pll" ,"sclk_hdmi24m" , }; +PNAME (sclk_vpll_p4210) = {"mout_vpllsrc" ,"fout_vpll" , }; +PNAME (mout_vpll_p) = {"fin_pll" ,"fout_vpll" , }; +PNAME (mout_core_p) = {"mout_apll" ,"sclk_mpll" , }; +PNAME (sclk_ampll_p) = {"sclk_mpll" ,"sclk_apll" , }; +PNAME (mout_mpll_user_p) = {"fin_pll" ,"sclk_mpll" , };
drivers/clk/samsung/clk-exynos4.c
Quoted 10 lines
drivers/clk/samsung/clk-exynos4.c new file +10
-0+PNAME (aclk_p4412) = {"mout_mpll_user" ,"sclk_apll" , }; +PNAME (sclk_evpll_p) = {"sclk_epll" ,"sclk_vpll" , }; +PNAME (mout_mfc_p) = {"mout_mfc0" ,"mout_mfc1" , }; +PNAME (mout_g3d_p) = {"mout_g3d0" ,"mout_g3d1" , }; +PNAME (mout_g2d_p) = {"mout_g2d0" ,"mout_g2d1" , }; +PNAME (mout_mixer_p4210) = {"sclk_dac" ,"sclk_hdmi" , }; +PNAME (mout_dac_p4210) = {"sclk_vpll" ,"sclk_hdmiphy" , }; +PNAME (mout_hdmi_p) = {"sclk_pixel" ,"sclk_hdmiphy" , }; +PNAME (mout_jpeg_p) = {"mout_jpeg0" ,"mout_jpeg1" , }; +PNAME (group1_p) = {"xxti" ,"xusbxti" ,"sclk_hdmi24m" ,
"sclk_usbphy0",
Quoted 4 lines
drivers/clk/samsung/clk-exynos4.c new file +3
-0+"none" ,"sclk_hdmiphy" ,"sclk_mpll" , + "mout_epll", "mout_vpll", }; +PNAME(mout_audio0_p) = { "cdclk0", "none", "sclk_hdmi24m","
sclk_usbphy0", + "xxti", "xusbxti", "sclk_mpll",
"sclk_epll",
Quoted 3 lines
drivers/clk/samsung/clk-exynos4.c new file +2
-0+ "sclk_vpll" }; +PNAME (mout_audio1_p) = {"cdclk1" ,"none" ,"sclk_hdmi24m" ,"
sclk_usbphy0", + "xxti", "xusbxti", "sclk_mpll",
"mout_epll",
Quoted 3 lines
drivers/clk/samsung/clk-exynos4.c new file +2
-0+ "mout_vpll", }; +PNAME (mout_audio2_p) = {"cdclk2" ,"none" ,"sclk_hdmi24m" ,"
sclk_usbphy0", + "xxti", "xusbxti", "sclk_mpll",
"mout_epll",
Quoted 16 lines
drivers/clk/samsung/clk-exynos4.c new file +16
-0+ "mout_vpll", }; +PNAME (mout_spdif_p) = {"sclk_audio0" ,"sclk_audio1" ,"sclk_audio2" , +"spdif_extclk" , }; + +/* fixed rate clocks generated outside the soc */ +struct samsung_fixed_rate_clock exynos4_fixed_rate_ext_clks[] = { +FRATE (xxti,"xxti" ,NULL ,CLK_IS_ROOT ,0 ), +FRATE (xusbxti,"xusbxti" ,NULL ,CLK_IS_ROOT ,0 ), +}; + +/* fixed rate clocks generated inside the soc */ +struct samsung_fixed_rate_clock exynos4_fixed_rate_clks[] = { +FRATE (none,"sclk_hdmi24m" ,NULL ,CLK_IS_ROOT ,24000000 ), +FRATE (none,"sclk_hdmiphy" ,NULL ,CLK_IS_ROOT ,27000000 ), +FRATE (none,"sclk_usbphy0" ,NULL ,CLK_IS_ROOT ,48000000 ), +};
drivers/clk/samsung/clk-exynos4.c
Quoted 10 lines
drivers/clk/samsung/clk-exynos4.c new file +10
-0+ +struct samsung_fixed_rate_clock exynos4210_fixed_rate_clks[] = { +FRATE (none,"sclk_usbphy1" ,NULL ,CLK_IS_ROOT ,48000000 ), +}; + +/* list of mux clocks supported in all exynos4 soc's */ +struct samsung_mux_clock exynos4_mux_clks[] = { +MUX (none,"mout_apll" , mout_apll_p,0x14200 ,0 ,1 ), +MUX (none,"mout_core" , mout_core_p,0x14200 ,16 ,1 ), + MUX_A(sclk_epll, "sclk_epll", mout_epll_p, 0xc210, 4, 1,
"sclk_epll"),
Quoted 44 lines
drivers/clk/samsung/clk-exynos4.c new file +44
-0+ MUX(none, "mout_fimc0", group1_p, 0xc220, 0, 4), + MUX(none, "mout_fimc1", group1_p, 0xc220, 4, 4), + MUX(none, "mout_fimc2", group1_p, 0xc220, 8, 4), + MUX(none, "mout_fimc3", group1_p, 0xc220, 12, 4), + MUX(none, "mout_cam0", group1_p, 0xc220, 16, 4), + MUX(none, "mout_cam1", group1_p, 0xc220, 20, 4), + MUX(none, "mout_csis0", group1_p, 0xc220, 24, 4), + MUX(none, "mout_csis1", group1_p, 0xc220, 28, 4), + MUX(none, "mout_hdmi", mout_hdmi_p, 0xc224, 0, 1), + MUX(none, "mout_mfc0", sclk_ampll_p, 0xc228, 0, 1), + MUX(none, "mout_mfc1", sclk_evpll_p, 0xc228, 4, 1), + MUX(none, "mout_mfc", mout_mfc_p, 0xc228, 8, 1), + MUX(none, "mout_g3d0", sclk_ampll_p, 0xc22c, 0, 1), + MUX(none, "mout_g3d1", sclk_evpll_p, 0xc22c, 4, 1), + MUX(none, "mout_g3d", mout_g3d_p, 0xc22c, 8, 1), + MUX(none, "mout_fimd0", group1_p, 0xc234, 0, 4), + MUX(none, "mout_mipi0", group1_p, 0xc234, 12, 4), + MUX(none, "mout_audio0", mout_audio0_p, 0xc23c, 0, 4), + MUX(none, "mout_mmc0", group1_p, 0xc240, 0, 4), + MUX(none, "mout_mmc1", group1_p, 0xc240, 4, 4), + MUX(none, "mout_mmc2", group1_p, 0xc240, 8, 4), + MUX(none, "mout_mmc3", group1_p, 0xc240, 12, 4), + MUX(none, "mout_mmc4", group1_p, 0xc240, 16, 4), + MUX(none, "mout_uart0", group1_p, 0xc250, 0, 4), + MUX(none, "mout_uart1", group1_p, 0xc250, 4, 4), + MUX(none, "mout_uart2", group1_p, 0xc250, 8, 4), + MUX(none, "mout_uart3", group1_p, 0xc250, 12, 4), + MUX(none, "mout_uart4", group1_p, 0xc250, 16, 4), + MUX(none, "mout_audio1", mout_audio1_p, 0xc254, 0, 4), + MUX(none, "mout_audio2", mout_audio2_p, 0xc254, 4, 4), + MUX(none, "mout_spdif", mout_spdif_p, 0xc254, 8, 2), + MUX(none, "mout_spi0", group1_p, 0xc254, 16, 4), + MUX(none, "mout_spi1", group1_p, 0xc254, 20, 4), + MUX(none, "mout_spi2", group1_p, 0xc254, 24, 4), +}; + +/* list of mux clocks supported in exynos4210 soc */ +struct samsung_mux_clock exynos4210_mux_clks[] = { +MUX (none,"mout_aclk200" , sclk_ampll_p,0xc210 ,12 ,1 ), +MUX (none,"mout_aclk100" , sclk_ampll_p,0xc210 ,16 ,1 ), +MUX (none,"mout_aclk160" , sclk_ampll_p,0xc210 ,20 ,1 ), +MUX (none,"mout_aclk133" , sclk_ampll_p,0xc210 ,24 ,1 ), +MUX (none,"mout_vpllsrc" , mout_vpllsrc_p,0xc214 ,0 ,1 ), + MUX_A(sclk_mpll, "sclk_mpll", mout_mpll_p, 0x14200, 8, 1,
Quoted 2 lines
"
sclk_mpll"), + MUX_A(sclk_vpll, "sclk_vpll",sclk_vpll_p4210,0xc210,
8, 1, "sclk_vpll"), + MUX(none, "mout_mixer",mout_mixer_p4210,
0xc224,
Quoted 94 lines
4, 1),
drivers/clk/samsung/clk-exynos4.c new file +11
-0+MUX (none,"mout_dac" , mout_dac_p4210,0xc224 ,8 ,1 ), +MUX (none,"mout_g2d0" , sclk_ampll_p,0xc230 ,0 ,1 ), +MUX (none,"mout_g2d1" , sclk_evpll_p,0xc230 ,4 ,1 ), +MUX (none,"mout_g2d" , mout_g2d_p,0xc230 ,8 ,1 ), +MUX (none,"mout_fimd1" , group1_p,0xc238 ,0 ,4 ), + MUX(none, "mout_mipi1", group1_p, 0xc238, 12, 4), +}; + +/* list of mux clocks supported in exynos4x12 soc */ +struct samsung_mux_clock exynos4x12_mux_clks[] = { + MUX_A(sclk_mpll, "sclk_mpll", mout_mpll_p, 0x10200, 12, 1,"
sclk_mpll"), + MUX(none, "mout_mpll_user",mout_mpll_user_p,0x4200,
4, 1), + MUX_A(sclk_vpll, "sclk_vpll",mout_vpll_p,0xc210, 8, 1,
"sclk_vpll"), +MUX(none, "mout_aclk200", aclk_p4412, 0xc210, 12, 1),drivers/clk/samsung/clk-exynos4.c new file +14
-0+MUX (none,"mout_aclk100" , aclk_p4412,0xc210 ,16 ,1 ), +MUX (none,"mout_aclk160" , aclk_p4412,0xc210 ,20 ,1 ), +MUX (none,"mout_aclk133" , aclk_p4412,0xc210 ,24 ,1 ), +MUX (none,"mout_mdnie0" , group1_p,0xc234 ,4 ,4 ), +MUX (none,"mout_mdnie_pwm0" , group1_p,0xc234 ,8 ,4 ), +MUX (none,"mout_sata" , sclk_ampll_p,0xc240 ,24 ,1 ), +MUX (none,"mout_jpeg0" , sclk_ampll_p,0xc258 ,0 ,1 ), +MUX (none,"mout_jpeg1" , sclk_evpll_p,0xc258 ,4 ,1 ), + MUX(none, "mout_jpeg", mout_jpeg_p, 0xc258, 8, 1), +}; + +/* list of divider clocks supported in all exynos4 soc's */ +struct samsung_div_clock exynos4_div_clks[] = { + DIV_A(sclk_apll, "sclk_apll", "mout_apll", 0x14500, 24, 3,"
sclk_apll"), +DIV(none, "div_core", "mout_core", 0x14500, 0, 3),drivers/clk/samsung/clk-exynos4.c new file +64
-0+DIV (none,"div_core2" ,"div_core" ,0x14500 ,28 ,3 ), +DIV_A (arm_clk,"arm_clk" ,"div_core2" ,0x14500 ,28 ,3 ,"arm_clk" ), +DIV (aclk200,"aclk200" ,"mout_aclk200" ,0xc510 ,0 ,3 ), +DIV (aclk100,"aclk100" ,"mout_aclk100" ,0xc510 ,4 ,4 ), +DIV (aclk160,"aclk160" ,"mout_aclk160" ,0xc510 ,8 ,3 ), +DIV (aclk133,"aclk133" ,"mout_aclk133" ,0xc510 ,12 ,3 ), +DIV (none,"div_fimc0" ,"mout_fimc0" ,0xc520 ,0 ,4 ), +DIV (none,"div_fimc1" ,"mout_fimc1" ,0xc520 ,4 ,4 ), +DIV (none,"div_fimc2" ,"mout_fimc2" ,0xc520 ,8 ,4 ), +DIV (none,"div_fimc3" ,"mout_fimc3" ,0xc520 ,12 ,4 ), +DIV (none,"div_cam0" ,"mout_cam0" ,0xc520 ,16 ,4 ), +DIV (none,"div_cam1" ,"mout_cam1" ,0xc520 ,20 ,4 ), +DIV (none,"div_csis0" ,"mout_csis0" ,0xc520 ,24 ,4 ), +DIV (none,"div_csis1" ,"mout_csis1" ,0xc520 ,28 ,4 ), +DIV (sclk_pixel,"sclk_pixel" ,"sclk_vpll" ,0xc524 ,0 ,4 ), +DIV (none,"div_mfc" ,"mout_mfc" ,0xc528 ,0 ,4 ), +DIV (none,"div_g3d" ,"mout_g3d" ,0xc52c ,0 ,4 ), +DIV (none,"div_fimd0" ,"mout_fimd0" ,0xc534 ,0 ,4 ), +DIV (none,"div_mipi0" ,"mout_mipi0" ,0xc534 ,16 ,4 ), +DIV (none,"div_mipi_pre0" ,"div_mipi0" ,0xc534 ,20 ,4 ), +DIV (none,"div_audio0" ,"mout_audio0" ,0xc53c ,0 ,4 ), +DIV (none,"div_pcm0" ,"sclk_audio0" ,0xc53c ,4 ,8 ), +DIV (none,"div_mmc0" ,"mout_mmc0" ,0xc544 ,0 ,4 ), +DIV (none,"div_mmc_pre0" ,"div_mmc0" ,0xc544 ,8 ,8 ), +DIV (none,"div_mmc1" ,"mout_mmc1" ,0xc544 ,16 ,4 ), +DIV (none,"div_mmc_pre1" ,"div_mmc1" ,0xc544 ,24 ,8 ), +DIV (none,"div_mmc2" ,"mout_mmc2" ,0xc548 ,0 ,4 ), +DIV (none,"div_mmc_pre2" ,"div_mmc2" ,0xc548 ,8 ,8 ), +DIV (none,"div_mmc3" ,"mout_mmc3" ,0xc548 ,16 ,4 ), +DIV (none,"div_mmc_pre3" ,"div_mmc3" ,0xc548 ,24 ,8 ), +DIV (none,"div_mmc4" ,"mout_mmc4" ,0xc54c ,0 ,4 ), +DIV (none,"div_mmc_pre4" ,"div_mmc4" ,0xc54c ,8 ,8 ), +DIV (none,"div_uart0" ,"mout_uart0" ,0xc550 ,0 ,4 ), +DIV (none,"div_uart1" ,"mout_uart1" ,0xc550 ,4 ,4 ), +DIV (none,"div_uart2" ,"mout_uart2" ,0xc550 ,8 ,4 ), +DIV (none,"div_uart3" ,"mout_uart3" ,0xc550 ,12 ,4 ), +DIV (none,"div_uart4" ,"mout_uart4" ,0xc550 ,16 ,4 ), +DIV (none,"div_spi0" ,"mout_spi0" ,0xc554 ,0 ,4 ), +DIV (none,"div_spi_pre0" ,"div_spi0" ,0xc554 ,8 ,8 ), +DIV (none,"div_spi1" ,"mout_spi1" ,0xc554 ,16 ,4 ), +DIV (none,"div_spi_pre1" ,"div_spi1" ,0xc554 ,24 ,8 ), +DIV (none,"div_spi2" ,"mout_spi2" ,0xc558 ,0 ,4 ), +DIV (none,"div_spi_pre2" ,"div_spi2" ,0xc558 ,8 ,8 ), +DIV (sclk_slimbus,"sclk_slimbus" ,"sclk_epll" ,0xc55c ,4 ,4 ), +DIV (none,"div_audio1" ,"mout_audio1" ,0xc560 ,0 ,4 ), +DIV (sclk_pcm1,"sclk_pcm1" ,"sclk_audio1" ,0xc560 ,4 ,8 ), +DIV (none,"div_audio2" ,"mout_audio2" ,0xc560 ,16 ,4 ), +DIV (sclk_pcm2,"sclk_pcm2" ,"sclk_audio2" ,0xc560 ,20 ,8 ), +DIV (sclk_i2s1,"sclk_i2s1" ,"sclk_audio1" ,0xc564 ,0 ,6 ), + DIV(sclk_i2s2, "sclk_i2s2", "sclk_audio2", 0xc564, 8, 6), +}; + +/* list of divider clocks supported in exynos4210 soc */ +struct samsung_div_clock exynos4210_div_clks[] = { +DIV (none,"div_g2d" ,"mout_g2d" ,0xc530 ,0 ,4 ), +DIV (none,"div_fimd1" ,"mout_fimd1" ,0xc538 ,0 ,4 ), +DIV (none,"div_mipi1" ,"mout_mipi1" ,0xc538 ,16 ,4 ), +DIV (none,"div_mipi_pre1" ,"div_mipi1" ,0xc538 ,20 ,4 ), +DIV (none,"div_sata" ,"mout_sata" ,0xc540 ,20 ,4 ), +}; + +/* list of divider clocks supported in exynos4x12 soc */ +struct samsung_div_clock exynos4x12_div_clks[] = { + DIV(none, "div_mdnie0", "mout_mdnie0", 0xc534, 4, 4),
drivers/clk/samsung/clk-exynos4.c
Quoted 10 lines
drivers/clk/samsung/clk-exynos4.c new file +10
-0+DIV (none,"div_mdnie_pwm0" ,"mout_mdnie_pwm0" ,0xc534 ,8 ,4 ), +DIV (none,"div_mdnie_pwm_pre0" ,"div_mdnie_pwm0" ,0xc534 ,12 ,4 ), +DIV (none,"div_mipihsi" ,"mout_mipihsi" ,0xc540 ,20 ,4 ), + DIV(none, "div_jpeg", "mout_jpeg", 0xc568, 0, 4), +}; + +/* list of gate clocks supported in all exynos4 soc's */ +struct samsung_gate_clock exynos4_gate_clks[] = { +/* +* After all Exynos4 based platforms are migrated to use device
tree,
Quoted 43 lines
drivers/clk/samsung/clk-exynos4.c new file +43
-0+* the device name and clock alias names specified below for some +* of the clocks can be removed. +*/ +GATE_DA (sclk_fimc0,"exynos4-fimc.0" ,"sclk_fimc0" ,"div_fimc0" , +0xc320 ,0 ,CLK_SET_RATE_PARENT ,0 ,"sclk_fimc" ), +GATE_DA (sclk_fimc1,"exynos4-fimc.1" ,"sclk_fimc1" ,"div_fimc1" , +0xc320 ,4 ,CLK_SET_RATE_PARENT ,0 ,"sclk_fimc" ), +GATE_DA (sclk_fimc2,"exynos4-fimc.2" ,"sclk_fimc2" ,"div_fimc2" , +0xc320 ,8 ,CLK_SET_RATE_PARENT ,0 ,"sclk_fimc" ), +GATE_DA (sclk_fimc3,"exynos4-fimc.3" ,"sclk_fimc3" ,"div_fimc3" , +0xc320 ,12 ,CLK_SET_RATE_PARENT ,0 ,"sclk_fimc" ), +GATE_DA (sclk_csis0,"s5p-mipi-csis.0" ,"sclk_csis0" ,"div_csis0" , +0xc320 ,24 ,CLK_SET_RATE_PARENT ,0 ,"sclk_csis" ), +GATE_DA (sclk_csis1,"s5p-mipi-csis.1" ,"sclk_csis1" ,"div_csis1" , +0xc320 ,28 ,CLK_SET_RATE_PARENT ,0 ,"sclk_csis" ), +GATE (sclk_hdmi,"sclk_hdmi" ,"mout_hdmi" ,0xc324 ,0 ,0 ,0 ), +GATE (sclk_mixer,"sclk_mixer" ,"mout_mixer" ,0xc324 ,4 ,0 ,0 ), +GATE (sclk_dac,"sclk_dac" ,"mout_dac" ,0xc324 ,8 ,0 ,0 ), +GATE_DA (sclk_fimd0,"exynos4-fb.0" ,"sclk_fimd0" ,"div_fimd0" , +0xc334 ,0 ,CLK_SET_RATE_PARENT ,0 ,"sclk_fimd" ), +GATE (sclk_mipi0,"sclk_mipi0" ,"div_mipi_pre0" , +0xc334 ,12 ,CLK_SET_RATE_PARENT ,0 ), +GATE_DA (sclk_mmc0,"exynos4-sdhci.0" ,"sclk_mmc0" ,"div_mmc-pre0" , +0xc340 ,0 ,CLK_SET_RATE_PARENT ,0 ,"mmc_busclk.2" ), +GATE_DA (sclk_mmc1,"exynos4-sdhci.1" ,"sclk_mmc1" ,"div_mmc-pre1" , +0xc340 ,4 ,CLK_SET_RATE_PARENT ,0 ,"mmc_busclk.2" ), +GATE_DA (sclk_mmc2,"exynos4-sdhci.2" ,"sclk_mmc2" ,"div_mmc-pre2" , +0xc340 ,8 ,CLK_SET_RATE_PARENT ,0 ,"mmc_busclk.2" ), +GATE_DA (sclk_mmc3,"exynos4-sdhci.3" ,"sclk_mmc3" ,"div_mmc-pre3" , +0xc340 ,12 ,CLK_SET_RATE_PARENT ,0 ,"mmc_busclk.2" ), +GATE_DA (sclk_mmc4,NULL ,"sclk_mmc4" ,"div_mmc-pre4" , +0xc340 ,16 ,CLK_SET_RATE_PARENT ,0 ,"ciu" ), +GATE_DA (sclk_uart0,"exynos4210-uart.0" ,"uclk0" ,"div_uart0" , +0xc350 ,0 ,CLK_SET_RATE_PARENT ,0 ,"clk_uart_baud0" ), +GATE_DA (sclk_uart1,"exynos4210-uart.1" ,"uclk1" ,"div_uart1" , +0xc350 ,4 ,CLK_SET_RATE_PARENT ,0 ,"clk_uart_baud0" ), +GATE_DA (sclk_uart2,"exynos4210-uart.2" ,"uclk2" ,"div_uart2" , +0xc350 ,8 ,CLK_SET_RATE_PARENT ,0 ,"clk_uart_baud0" ), +GATE_DA (sclk_uart3,"exynos4210-uart.3" ,"uclk3" ,"div_uart3" , +0xc350 ,12 ,CLK_SET_RATE_PARENT ,0 ,"clk_uart_baud0" ), +GATE_DA (sclk_uart4,"exynos4210-uart.4" ,"uclk4" ,"div_uart4" , +0xc350 ,16 ,CLK_SET_RATE_PARENT ,0 ,"clk_uart_baud0" ), + GATE(sclk_audio1, "sclk_audio1", "div_audio1", 0xc354, 0,
Quoted 4 lines
CLK_SET_RATE_PARENT, 0), + GATE(sclk_audio2, "sclk_audio2",
"div_audio2",0xc354, 4,CLK_SET_RATE_PARENT, 0), + GATE(sclk_spdif,
"sclk_spdif", "mout_spdif",0xc354, 8, 0, 0), + GATE_DA(sclk_spi0,
"exynos4210-spi.0", "sclk_spi0", "div_spi_pre0", +
0xc354, 16,
drivers/clk/samsung/clk-exynos4.c
Quoted 6 lines
CLK_SET_RATE_PARENT, 0, "spi_busclk0"),drivers/clk/samsung/clk-exynos4.c new file +5
-0+GATE_DA (sclk_spi1,"exynos4210-spi.1" ,"sclk_spi1" ,"div_spi_pre1" , +0xc354 ,20 ,CLK_SET_RATE_PARENT ,0 ,"spi_busclk0" ), +GATE_DA (sclk_spi2,"exynos4210-spi.2" ,"sclk_spi2" ,"div_spi_pre2" , +0xc354 ,24 ,CLK_SET_RATE_PARENT ,0 ,"spi_busclk0" ), + GATE_DA(fimc0, "exynos4-fimc.0", "fimc0", "aclk160", 0xc920, 0, 0,
0,
Quoted 1 line
"fimc"), + GATE_DA(fimc1, "exynos4-fimc.1", "fimc1", "aclk160",
0xc920,
Quoted 2 lines
1, 0, 0, "fimc"), + GATE_DA(fimc2, "exynos4-fimc.2", "fimc2",
"aclk160",0xc920, 2, 0, 0, "fimc"), + GATE_DA(fimc3, "exynos4-
fimc.3",
drivers/clk/samsung/clk-exynos4.c
Quoted 13 lines
"fimc3", "aclk160",
0xc920, 3, 0, 0, "fimc"), + GATE_DA(csis0,
"s5p-mipi-csis.0", "csis0", "aclk160",0xc920, 4, 0, 0, "fimc"),drivers/clk/samsung/clk-exynos4.c new file +1
-0+ GATE_DA(csis1, "s5p-mipi-csis.1", "csis1", "aclk160", 0xc920, 5, 0,0, "fimc"), +
GATE(jpeg, "jpeg", "aclk160", 0xc920, 6, 0, 0),drivers/clk/samsung/clk-exynos4.c new file +9
-0+GATE_DA (smmu_fimc0,"exynos-sysmmu.5" ,"smmu_fimc0" ,"aclk160" , +0xc920 ,7 ,0 ,0 ,"sysmmu" ), +GATE_DA (smmu_fimc1,"exynos-sysmmu.6" ,"smmu_fimc1" ,"aclk160" , +0xc920 ,8 ,0 ,0 ,"sysmmu" ), +GATE_DA (smmu_fimc2,"exynos-sysmmu.7" ,"smmu_fimc2" ,"aclk160" , +0xc920 ,9 ,0 ,0 ,"sysmmu" ), +GATE_DA (smmu_fimc3,"exynos-sysmmu.8" ,"smmu_fimc3" ,"aclk160" , +0xc920 ,10 ,0 ,0 ,"sysmmu" ), + GATE_DA(smmu_jpeg, "exynos-sysmmu.3", "smmu_jpeg", "aclk160",
0xc920,
Quoted 1 line
11, 0, 0, "sysmmu"), + GATE_D(vp, "s5p-mixer", "vp", "aclk160",
0xc924,
Quoted 5 lines
0, 0, 0),
drivers/clk/samsung/clk-exynos4.c new file +3
-0+GATE_D (mixer,"s5p-mixer" ,"mixer" ,"aclk160" ,0xc924 ,1 ,0 ,0 ), +GATE_D (hdmi,"exynos4-hdmi" ,"hdmi" ,"aclk160" ,0xc924 ,3 ,0 ,0 ), + GATE_DA(smmu_tv, "exynos-sysmmu.2", "smmu_tv", "aclk160", 0xc924, 4,0, 0, "sysmmu"), + GATE_DA(mfc, "s5p-mfc", "mfc", "aclk100",
0xc928,
0,
Quoted 16 lines
0, 0, "mfc"), + GATE_DA(smmu_mfcl, "exynos-sysmmu.0", "
smmu_mfcl",
"aclk100",0xc928, 1, 0, 0, "sysmmu"), + GATE_DA(smmu_mfcr,
"exynos-sysmmu.1", "smmu_mfcr", "aclk100",0xc928, 2, 0, 0, "sysmmu"),drivers/clk/samsung/clk-exynos4.c new file +2
-0+GATE (g3d,"g3d" ,"aclk200" ,0xc92c ,0 ,0 ,0 ), + GATE_DA(fimd0, "exynos4-fb.0", "fimd0", "aclk160", 0xc934, 0, 0, 0,"fimd"), +
GATE(mie0, "mie0", "aclk160", 0xc934, 1, 0, 0),drivers/clk/samsung/clk-exynos4.c new file +8
-0+GATE (dsim0,"dsim0" ,"aclk160" ,0xc934 ,3 ,0 ,0 ), +GATE_DA (smmu_fimd0,"exynos-sysmmu.10" ,"smmu_fimd0" ,"aclk160" , +0xc934 ,4 ,0 ,0 ,"sysmmu" ), +GATE (fimd1,"fimd1" ,"aclk160" ,0xc938 ,0 ,0 ,0 ), +GATE (mie1,"mie1" ,"aclk160" ,0xc938 ,1 ,0 ,0 ), +GATE (dsim1,"dsim1" ,"aclk160" ,0xc938 ,3 ,0 ,0 ), +GATE (smmu_fimd1,"smmu_fimd1" ,"aclk160" ,0xc938 ,4 ,0 ,0 ), + GATE_DA(pdma0, "dma-pl330.0", "pdma0", "aclk133", 0xc940, 0, 0, 0,"dma"), + GATE_DA(pdma1, "dma-pl330.1", "pdma1", "aclk133",
0xc940, 1,
0, 0, "dma"), +GATE(tsi, "tsi", "aclk133", 0xc940, 4, 0, 0),
drivers/clk/samsung/clk-exynos4.c
Quoted 1 line
drivers/clk/samsung/clk-exynos4.c new file +1
-0+ GATE_DA(sdmmc0, "exynos4-sdhci.0", "sdmmc0", "aclk133", 0xc940, 5,
0,
drivers/clk/samsung/clk-exynos4.c
Quoted 7 lines
0, "hsmmc"), + GATE_DA(sdmmc1, "exynos4-sdhci.1", "sdmmc1", "aclk133",
0xc940, 6, 0, 0, "hsmmc"), + GATE_DA(sdmmc2, "exynos4-sdhci.2",
"sdmmc2", "aclk133",0xc940, 7, 0, 0, "hsmmc"), + GATE_DA(sdmmc3,
"exynos4-sdhci.3", "sdmmc3", "aclk133",0xc940, 8, 0, 0, "hsmmc"),drivers/clk/samsung/clk-exynos4.c new file +3
-0+GATE_A (sdmmc4,"sdmmc4" ,"aclk133" ,0xc940 ,9 ,0 ,0 ,"biu" ), +GATE (sromc,"sromc" ,"aclk133" ,0xc940 ,11 ,0 ,0 ), + GATE_A(usb_host, "usb_host", "aclk133", 0xc940, 12, 0, 0,
"usbhost"),
drivers/clk/samsung/clk-exynos4.c
Quoted 6 lines
drivers/clk/samsung/clk-exynos4.c new file +6
-0+GATE (usb_device,"usb_device" ,"aclk133" ,0xc940 ,13 ,0 ,0 ), +GATE (onenand,"onenand" ,"aclk133" ,0xc940 ,15 ,0 ,0 ), +GATE (nfcon,"nfcon" ,"aclk133" ,0xc940 ,16 ,0 ,0 ), +GATE (gps,"gps" ,"aclk133" ,0xc94c ,0 ,0 ,0 ), +GATE (smmu_gps,"smmu_gps" ,"aclk133" ,0xc94c ,1 ,0 ,0 ), + GATE_DA(uart0, "exynos4210-uart.0", "uart0", "aclk100", 0xc950, 0,
0,
drivers/clk/samsung/clk-exynos4.c
Quoted 5 lines
0, "uart"), + GATE_DA(uart1, "exynos4210-uart.1", "uart1", "aclk100",
0xc950, 1, 0, 0, "uart"), + GATE_DA(uart2, "exynos4210-uart.2",
"uart2", "aclk100",0xc950, 2, 0, 0, "uart"), + GATE_DA(uart3,
"exynos4210-uart.3", "uart3", "aclk100",0xc950, 3, 0, 0, "uart"),drivers/clk/samsung/clk-exynos4.c new file +1
-0+ GATE_DA(uart4, "exynos4210-uart.4", "uart4", "aclk100", 0xc950, 4,
0,
Quoted 13 lines
0, "uart"), + GATE_DA(i2c0, "s3c2440-i2c.0", "i2c0", "aclk100",
0xc950,
6, 0, 0, "i2c"), + GATE_DA(i2c1, "s3c2440-i2c.1", "i2c1", "aclk100",0xc950, 7, 0, 0, "i2c"), + GATE_DA(i2c2, "s3c2440-i2c.2", "i2c2",
"aclk100",0xc950, 8, 0, 0, "i2c"), + GATE_DA(i2c3, "s3c2440-i2c.3",
"i2c3", "aclk100",0xc950, 9, 0, 0, "i2c"), + GATE_DA(i2c4,
"s3c2440-i2c.4", "i2c4", "aclk100",0xc950, 10, 0, 0, "i2c"),drivers/clk/samsung/clk-exynos4.c new file +1
-0+ GATE_DA(i2c5, "s3c2440-i2c.5", "i2c5", "aclk100", 0xc950, 11, 0, 0,"i2c"), + GATE_DA(i2c6, "s3c2440-i2c.6", "i2c6", "aclk100",
0xc950, 12,
0, 0, "i2c"), + GATE_DA(i2c7, "s3c2440-i2c.7", "i2c7", "aclk100",0xc950, 13, 0, 0, "i2c"), + GATE_DA(i2c_hdmi, "s3c2440-hdmiphy-i2c",
"i2c-hdmi", "aclk100",0xc950, 14, 0, 0, "i2c"), + GATE_DA(spi0,
"exynos4210-spi.0", "spi0", "aclk100",0xc950, 16, 0, 0, "spi"),drivers/clk/samsung/clk-exynos4.c new file +1
-0+ GATE_DA(spi1, "exynos4210-spi.1", "spi1", "aclk100", 0xc950, 17, 0,
Quoted 3 lines
0, "spi"), + GATE_DA(spi2, "exynos4210-spi.2", "spi2", "aclk100",
0xc950, 18, 0, 0, "spi"), + GATE_DA(i2s1, "samsung-i2s.1", "i2s1",
"aclk100",0xc950, 20, 0, 0, "iis"), + GATE_DA(i2s2, "samsung-
i2s.2",
drivers/clk/samsung/clk-exynos4.c
Quoted 6 lines
"i2s2", "aclk100",
0xc950, 21, 0, 0, "iis"), + GATE_DA(pcm1,
"samsung-pcm.1", "pcm1", "aclk100",0xc950, 22, 0, 0, "pcm"),drivers/clk/samsung/clk-exynos4.c new file +1
-0+ GATE_DA(pcm2, "samsung-pcm.2", "pcm2", "aclk100", 0xc950, 23, 0, 0,"pcm"), +
GATE_A(pwm, "pwm", "aclk100", 0xc950, 24, 0, 0, "timers"),drivers/clk/samsung/clk-exynos4.c new file +2
-0+GATE (slimbus,"slimbus" ,"aclk100" ,0xc950 ,25 ,0 ,0 ), + GATE_DA(spdif, "samsung-spdif", "spdif", "aclk100", 0xc950, 26, 0,
0,
Quoted 38 lines
"spdif"), + GATE_DA(ac97, "samsung-ac97", "ac97", "aclk100",
0xc950,
27, 0, 0, "ac97"), +};drivers/clk/samsung/clk-exynos4.c new file +6
-0+ +/* list of gate clocks supported in exynos4210 soc */ +struct samsung_gate_clock exynos4210_gate_clks[] = { +GATE_DA (sclk_fimd1,"exynos4-fb.1" ,"sclk_fimd1" ,"div_fimd1" , +0xc338 ,0 ,CLK_SET_RATE_PARENT ,0 ,"sclk_fimd" ), + GATE(sclk_mipi1, "sclk_mipi1", "div_mipi_pre1", 0xc338, 12,
CLK_SET_RATE_PARENT, 0), + GATE(sclk_sata, "sclk_sata", "div_sata",0xc340, 24,CLK_SET_RATE_PARENT, 0), + GATE(sclk_cam0, "sclk_cam0",
"div_cam0",0xc820, 4,CLK_SET_RATE_PARENT, 0), + GATE(sclk_cam1,
"sclk_cam1", "div_cam1",0xc820, 5,CLK_SET_RATE_PARENT, 0),drivers/clk/samsung/clk-exynos4.c new file +26
-0+GATE (tvenc,"tvenc" ,"aclk160" ,0xc924 ,2 ,0 ,0 ), +GATE (g2d,"g2d" ,"aclk200" ,0xc930 ,0 ,0 ,0 ), +GATE (rotator,"rotator" ,"aclk200" ,0xc930 ,1 ,0 ,0 ), +GATE (mdma,"mdma" ,"aclk200" ,0xc930 ,2 ,0 ,0 ), +GATE (smmu_g2d,"smmu_g2d" ,"aclk200" ,0xc930 ,3 ,0 ,0 ), +GATE (smmu_rotator,"smmu_rotator" ,"aclk200" ,0xc930 ,4 ,0 ,0 ), +GATE (smmu_mdma,"smmu_mdma" ,"aclk200" ,0xc930 ,5 ,0 ,0 ), +GATE (pcie_phy,"pcie_phy" ,"aclk133" ,0xc940 ,2 ,0 ,0 ), +GATE (sata_phy,"sata_phy" ,"aclk133" ,0xc940 ,3 ,0 ,0 ), +GATE (sata,"sata" ,"aclk133" ,0xc940 ,10 ,0 ,0 ), +GATE (pcie,"pcie" ,"aclk133" ,0xc940 ,14 ,0 ,0 ), +GATE (smmu_pcie,"smmu_pcie" ,"aclk133" ,0xc940 ,18 ,0 ,0 ), +GATE_A (tsadc,"tsadc" ,"aclk100" ,0xc950 ,15 ,0 ,0 ,"adc" ), +GATE (modemif,"modemif" ,"aclk100" ,0xc950 ,28 ,0 ,0 ), +GATE (chipid,"chipid" ,"aclk100" ,0xc960 ,0 ,0 ,0 ), +GATE (sysreg,"sysreg" ,"aclk100" ,0xc960 ,0 ,0 ,0 ), +GATE (hdmi_cec,"hdmi_cec" ,"aclk100" ,0xc960 ,11 ,0 ,0 ), +GATE_A (mct,"mct" ,"aclk100" ,0xc960 ,13 ,0 ,0 ,"mct" ), +GATE_A (wdt,"watchdog" ,"aclk100" ,0xc960 ,14 ,0 ,0 ,"watchdog" ), +GATE_A (rtc,"rtc" ,"aclk100" ,0xc960 ,15 ,0 ,0 ,"rtc" ), + GATE_A(keyif, "keyif", "aclk100", 0xc960, 16, 0, 0, "keypad"), +}; + +/* list of gate clocks supported in exynos4x12 soc */ +struct samsung_gate_clock exynos4x12_gate_clks[] = { + GATE(sclk_mdnie0, "sclk_mdnie0", "div_mdnie0", 0xc334, 4,
Quoted 2 lines
CLK_SET_RATE_PARENT, 0), + GATE(sclk_mdnie_pwm0, "sclk_mdnie_pwm0",
"div_mdnie_pwm_pre0", +0xc334, 8,CLK_SET_RATE_PARENT,
0),
Quoted 18 lines
drivers/clk/samsung/clk-exynos4.c new file +1
-0+ GATE(sclk_mipihsi, "sclk_mipihsi", "div_mipihsi", 0xc340, 24,
CLK_SET_RATE_PARENT, 0), + GATE(audss, "audss", "sclk_epll",0xc93c, 0,
0, 0),drivers/clk/samsung/clk-exynos4.c new file +2
-0+GATE (mdnie0,"mdnie0" ,"aclk160" ,0xc934 ,2 ,0 ,0 ), + GATE_DA(pcm0, "samsung-pcm.0", "pcm0", "aclk100", 0xc93c, 2, 0, 0,"pcm"), + GATE_DA(i2s0, "samsung-i2s.0", "i2s0", "aclk100",
0xc93c, 3,
0, 0, "iis"), + GATE(mipi_hsi, "mipi_hsi", "aclk133",0xc940, 10, 0,
0),drivers/clk/samsung/clk-exynos4.c new file +10
-0+GATE (chipid,"chipid" ,"aclk100" ,0x8960 ,0 ,0 ,0 ), +GATE (sysreg,"sysreg" ,"aclk100" ,0x8960 ,1 ,0 ,0 ), +GATE (hdmi_cec,"hdmi_cec" ,"aclk100" ,0x8960 ,11 ,0 ,0 ), +GATE_A (mct,"mct" ,"aclk100" ,0x8960 ,13 ,0 ,0 ,"mct" ), +GATE_A (wdt,"watchdog" ,"aclk100" ,0x8960 ,14 ,0 ,0 ,"watchdog" ), +GATE_A (rtc,"rtc" ,"aclk100" ,0x8960 ,15 ,0 ,0 ,"rtc" ), +GATE_A (keyif,"keyif" ,"aclk100" ,0x8960 ,16 ,0 ,0 ,"keypad" ), +GATE (rotator,"rotator" ,"aclk200" ,0x4930 ,1 ,0 ,0 ), +GATE (mdma2,"mdma2" ,"aclk200" ,0x4930 ,2 ,0 ,0 ), + GATE(smmu_rotator, "smmu_rotator", "aclk200", 0x4930, 4, 0, 0),
drivers/clk/samsung/clk-exynos4.c line 467
Quoted 10 lines
drivers/clk/samsung/clk-exynos4.c new file +10
-0+ GATE(smmu_mdma, "smmu_mdma", "aclk200", 0x4930, 5, 0, 0), +}; + +static struct of_device_id exynos4_clk_ids[] = { + { .compatible ="samsung,exynos4210-clock" , + .data = (void *)EXYNOS4210 , }, + { .compatible ="samsung,exynos4412-clock" , + .data = (void *)EXYNOS4X12 , }, + { }, +};
I wonder if most of these static arrays couldn't be marked as initdata to be dropped after initialization.
Correct me if I'm wrong, but from what I see these data are referenced by common clock framework core only when registering these clocks.
Best regards,
Tomasz Figa
PATCH v3 3/11 clk: exynos4: register clocks using common clock framework
Hi Tomasz,
Quoted 228 lines · Tomasz Figa
Hi Thomas,
Looks mostly good, but I have some minor comments inline.
Quoted 209 lines · On Thursday 15 of November 2012 03:37:25 Thomas Abraham wrote:
The Exynos4 clocks are statically listed and registered using the Samsung specific common clock helper functions. Both device tree based clock lookup and clkdev based clock lookups are supported.
Cc Mike Turquette <[email protected]>Cc Kukjin Kim <[email protected]>Signed-off-by Thomas Abraham <[email protected]>--- .../devicetree/bindings/clock/exynos4-clock.txt | 215 +++++++ drivers/clk/samsung/Makefile | 1 + drivers/clk/samsung/clk-exynos4.c | 641 ++++++++++++++++++++ 3 files changed, 857 insertions(+), 0 deletions(-) create mode 100644
Documentation/devicetree/bindings/clock/exynos4-clock.txtcreate mode 100644drivers/clk/samsung/clk-exynos4.c(quoted diff) +0
-0
b/Documentation/devicetree/bindings/clock/exynos4-clock.txtnew file mode 100644
index 0000000..e874addDocumentation/devicetree/bindings/clock/exynos4-clock.txt new file +3
-0@@ -0,0 +1,215 @@ +* Samsung Exynos4 Clock Controller + +The Exynos4 clock controller generates and supplies clock to variouscontrollers +within the Exynos4 SoC. The clock binding described here is applicable to all +SoC's in the Exynos4 family.
Documentation/devicetree/bindings/clock/exynos4-clock.txt new file +5
-0+ +Required Properties: + +- comptible: should be one of the following. + - "samsung,exynos4210-clock" - controller compatible with Exynos4210SoC. + - "samsung,exynos4412-clock" - controller compatible with Exynos4412 SoC. +
+- reg: physical base address of the controller and length of memory mapped + region.Documentation/devicetree/bindings/clock/exynos4-clock.txt new file +4
-0+ +- #clock-cells: should be 1. + +The following is the list of clocks generated by the controller. Eachclock is +assigned an identifier and client nodes use this identifier to specify the +clock which they consume. Some of the clocks are available only on a particular +Exynos4 SoC and this is specified where applicable.
Documentation/devicetree/bindings/clock/exynos4-clock.txt new file +164
-0+ + + [Core Clocks] + + Clock ID SoC (if specific) + ----------------------------------------------- + + xxti 1 + xusbxti 2 + fin_pll 3 + fout_apll 4 + fout_mpll 5 + fout_epll 6 + fout_vpll 7 + sclk_apll 8 + sclk_mpll 9 + sclk_epll 10 + sclk_vpll 11 + arm_clk 12 + aclk200 13 + aclk100 14 + aclk160 15 + aclk133 16 + + + [Clock Gate for Special Clocks] + + Clock ID SoC (if specific) + ----------------------------------------------- + + sclk_fimc0 128 + sclk_fimc1 129 + sclk_fimc2 130 + sclk_fimc3 131 + sclk_cam0 132 + sclk_cam1 133 + sclk_csis0 134 + sclk_csis1 135 + sclk_hdmi 136 + sclk_mixer 137 + sclk_dac 138 + sclk_pixel 139 + sclk_fimd0 140 + sclk_mdnie0 141 Exynos4412 + sclk_mdnie_pwm0 12 142 Exynos4412 + sclk_mipi0 143 + sclk_audio0 144 + sclk_mmc0 145 + sclk_mmc1 146 + sclk_mmc2 147 + sclk_mmc3 148 + sclk_mmc4 149 + sclk_sata 150 Exynos4210 + sclk_uart0 151 + sclk_uart1 152 + sclk_uart2 153 + sclk_uart3 154 + sclk_uart4 155 + sclk_audio1 156 + sclk_audio2 157 + sclk_spdif 158 + sclk_spi0 159 + sclk_spi1 160 + sclk_spi2 161 + sclk_slimbus 162 + sclk_fimd1 163 Exynos4210 + sclk_mipi1 164 Exynos4210 + sclk_pcm1 165 + sclk_pcm2 166 + sclk_i2s1 167 + sclk_i2s2 168 + sclk_mipihsi 169 Exynos4412 + + + [Peripheral Clock Gates] + + Clock ID SoC (if specific) + ----------------------------------------------- + + fimc0 256 + fimc1 257 + fimc2 258 + fimc3 259 + csis0 260 + csis1 261 + jpeg 262 + smmu_fimc0 263 + smmu_fimc1 264 + smmu_fimc2 265 + smmu_fimc3 266 + smmu_jpeg 267 + vp 268 + mixer 269 + tvenc 270 Exynos4210 + hdmi 271 + smmu_tv 272 + mfc 273 + smmu_mfcl 274 + smmu_mfcr 275 + g3d 276 + g2d 277 Exynos4210 + rotator 278 Exynos4210 + mdma 279 Exynos4210 + smmu_g2d 280 Exynos4210 + smmu_rotator 281 Exynos4210 + smmu_mdma 282 Exynos4210 + fimd0 283 + mie0 284 + mdnie0 285 Exynos4412 + dsim0 286 + smmu_fimd0 287 + fimd1 288 Exynos4210 + mie1 289 Exynos4210 + dsim1 290 Exynos4210 + smmu_fimd1 291 Exynos4210 + pdma0 292 + pdma1 293 + pcie_phy 294 + sata_phy 295 Exynos4210 + tsi 296 + sdmmc0 297 + sdmmc1 298 + sdmmc2 299 + sdmmc3 300 + sdmmc4 301 + sata 302 Exynos4210 + sromc 303 + usb_host 304 + usb_device 305 + pcie 306 + onenand 307 + nfcon 308 + smmu_pcie 309 + gps 310 + smmu_gps 311 + uart0 312 + uart1 313 + uart2 314 + uart3 315 + uart4 316 + i2c0 317 + i2c1 318 + i2c2 319 + i2c3 320 + i2c4 321 + i2c5 322 + i2c6 323 + i2c7 324 + i2c_hdmi 325 + tsadc 326 + spi0 327 + spi1 328 + spi2 329 + i2s1 330 + i2s2 331 + pcm0 332 + i2s0 333 + pcm1 334 + pcm2 335 + pwm 336 + slimbus 337 + spdif 338 + ac97 339 + modemif 340Documentation/devicetree/bindings/clock/exynos4-clock.txt line 195
Quoted 10 lines
Documentation/devicetree/bindings/clock/exynos4-clock.txt new file +10
-0+ chipid 341 + sysreg 342 + hdmi_cec 343 + mct 344 + wdt 345 + rtc 346 + keyif 347 + audss 348 + mipi_hsi 349 Exynos4210 + mdma2 350 Exynos4210I wonder what is the state of including the possibility of defining constants in dts into dtc. Is it already merged?
Quoted 2 lines
If yes, maybe we could define all those constants instead of specifying these raw numbers?
I checked while I was working on this patch series, but the pre-processor patch from Stephen Warren was not yet merged.
Quoted 537 lines
Quoted 77 lines
Documentation/devicetree/bindings/clock/exynos4-clock.txt new file +9
-0+Example 1: An example of a clock controller node is listed below. + + clock: clock-controller at 0x10030000 { + compatible = "samsung,exynos4210-clock"; + reg = <0x10030000 0x20000>; + #clock-cells = <1>; + }; + +Example 2: UART controller node that consumes the clock generated bythe clock + controller. Refer to the standard clock bindings for
information + about 'clocks' and 'clock-names' property.Documentation/devicetree/bindings/clock/exynos4-clock.txt new file +8
-0+ + serial at 13820000 { + compatible = "samsung,exynos4210-uart"; + reg = <0x13820000 0x100>; + interrupts = <0 54 0>; + clocks = <&clock 314>, <&clock 153>; + clock-names = "uart", "clk_uart_baud0"; + };drivers/clk/samsung/Makefile +1
-0@@ -3,3 +3,4 @@ # obj-$(CONFIG_PLAT_SAMSUNG) += clk.o clk-pll.o +obj-$(CONFIG_ARCH_EXYNOS4) += clk-exynos4.o(quoted diff) +0
-0
b/drivers/clk/samsung/clk-exynos4.cnew file mode 100644 index 0000000..6f0b6a7drivers/clk/samsung/clk-exynos4.c new file +7
-0@@ -0,0 +1,641 @@ +/* +* Copyright (c) 2012 Samsung Electronics Co., Ltd. +* Copyright (c) 2012 Linaro Ltd. +* Author: Thomas Abraham <[email protected]> +* +* 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.
+ *
+ * Common Clock Framework support for all Exynos4 SoC's.drivers/clk/samsung/clk-exynos4.c new file +20
-0+*/ + +#include <linux/clk.h> +#include <linux/clkdev.h> +#include <linux/clk-provider.h> +#include <linux/of.h> +#include <linux/of_address.h> + +#include <plat/cpu.h> +#include "clk.h" +#include "clk-pll.h" + +/* the exynos4 soc type */ +enum exynos4_soc { +EXYNOS4210 , +EXYNOS4X12 , +}; + +/* +* Let each supported clock get a unique id. This id is used to lookup the clock + * for device tree based platforms. The clocks are categorized into three + * sections: core, sclk gate and bus interface gate clocks.
+ *
+ * When adding a new clock to this list, it is advised to choose a clock + * category and add it to the end of that category. That is because the the + * device tree source file is referring to these ids and any change in the + * sequence number of existing clocks will require corresponding change in the + * device tree files. This limitation would go away when pre-processor support + * for dtc would be available.
+ */drivers/clk/samsung/clk-exynos4.c
Quoted 6 lines
drivers/clk/samsung/clk-exynos4.c new file +6
-0+enum exynos4_clks { + none, + +/* core clocks */ + xxti, xusbxti, fin_pll, fout_apll, fout_mpll, fout_epll, fout_vpll, + sclk_apll, sclk_mpll, sclk_epll, sclk_vpll, arm_clk, aclk200,aclk100,
drivers/clk/samsung/clk-exynos4.c
Quoted 8 lines
drivers/clk/samsung/clk-exynos4.c new file +8
-0+ aclk160, aclk133, + +/* gate for special clocks (sclk) */ + sclk_fimc0 =128 , sclk_fimc1, sclk_fimc2, sclk_fimc3, sclk_cam0, + sclk_cam1, sclk_csis0, sclk_csis1, sclk_hdmi, sclk_mixer, sclk_dac, + sclk_pixel, sclk_fimd0, sclk_mdnie0, sclk_mdnie_pwm0, sclk_mipi0, + sclk_audio0, sclk_mmc0, sclk_mmc1, sclk_mmc2, sclk_mmc3, sclk_mmc4, + sclk_sata, sclk_uart0, sclk_uart1, sclk_uart2, sclk_uart3,
sclk_uart4,drivers/clk/samsung/clk-exynos4.c
Quoted 7 lines
+
sclk_audio1,sclk_audio2,sclk_spdif,sclk_spi0,sclk_spi1,sclk_spi2, +sclk_slimbus,sclk_fimd1,sclk_mipi1,sclk_pcm1,sclk_pcm2,sclk_i2s1, +sclk_i2s2,sclk_mipihsi,drivers/clk/samsung/clk-exynos4.c new file +4
-0+ +/* gate clocks */ + fimc0 =256 , fimc1, fimc2, fimc3, csis0, csis1, jpeg, smmu_fimc0, + smmu_fimc1, smmu_fimc2, smmu_fimc3, smmu_jpeg, vp, mixer, tvenc,hdmi,
Quoted 5 lines
+
smmu_tv, mfc,smmu_mfcl,smmu_mfcr, g3d, g2d, rotator, mdma,smmu_g2d, +smmu_rotator,smmu_mdma, fimd0, mie0, mdnie0, dsim0,smmu_fimd0, fimd1, + mie1, dsim1,smmu_fimd1, pdma0, pdma1,pcie_phy,sata_phy, tsi, sdmmc0, + sdmmc1, sdmmc2, sdmmc3, sdmmc4, sata, sromc,usb_host,usb_device, pcie, + onenand, nfcon,smmu_pcie, gps,
smmu_gps,Quoted 3 lines
uart0, uart1, uart2, uart3, + uart4, i2c0, i2c1, i2c2, i2c3, i2c4, i2c5, i2c6, i2c7,
i2c_hdmi, tsadc, + spi0, spi1, spi2, i2s1, i2s2,
pcm0, i2s0, pcm1, pcm2, pwm, slimbus, + spdif, ac97, modemif,chipid,
Quoted 14 lines
sysreg,
hdmi_cec, mct, wdt, rtc, keyif, + audss,mipi_hsi, mdma2,drivers/clk/samsung/clk-exynos4.c new file +13
-0+ + nr_clks, +}; +/* list of all parent clock list */ +PNAME (mout_apll_p) = {"fin_pll" ,"fout_apll" , }; +PNAME (mout_mpll_p) = {"fin_pll" ,"fout_mpll" , }; +PNAME (mout_epll_p) = {"fin_pll" ,"fout_epll" , }; +PNAME (mout_vpllsrc_p) = {"fin_pll" ,"sclk_hdmi24m" , }; +PNAME (sclk_vpll_p4210) = {"mout_vpllsrc" ,"fout_vpll" , }; +PNAME (mout_vpll_p) = {"fin_pll" ,"fout_vpll" , }; +PNAME (mout_core_p) = {"mout_apll" ,"sclk_mpll" , }; +PNAME (sclk_ampll_p) = {"sclk_mpll" ,"sclk_apll" , }; +PNAME (mout_mpll_user_p) = {"fin_pll" ,"sclk_mpll" , };drivers/clk/samsung/clk-exynos4.c
Quoted 10 lines
drivers/clk/samsung/clk-exynos4.c new file +10
-0+PNAME (aclk_p4412) = {"mout_mpll_user" ,"sclk_apll" , }; +PNAME (sclk_evpll_p) = {"sclk_epll" ,"sclk_vpll" , }; +PNAME (mout_mfc_p) = {"mout_mfc0" ,"mout_mfc1" , }; +PNAME (mout_g3d_p) = {"mout_g3d0" ,"mout_g3d1" , }; +PNAME (mout_g2d_p) = {"mout_g2d0" ,"mout_g2d1" , }; +PNAME (mout_mixer_p4210) = {"sclk_dac" ,"sclk_hdmi" , }; +PNAME (mout_dac_p4210) = {"sclk_vpll" ,"sclk_hdmiphy" , }; +PNAME (mout_hdmi_p) = {"sclk_pixel" ,"sclk_hdmiphy" , }; +PNAME (mout_jpeg_p) = {"mout_jpeg0" ,"mout_jpeg1" , }; +PNAME (group1_p) = {"xxti" ,"xusbxti" ,"sclk_hdmi24m" ,"
sclk_usbphy0",Quoted 4 lines
drivers/clk/samsung/clk-exynos4.c new file +3
-0+"none" ,"sclk_hdmiphy" ,"sclk_mpll" , + "mout_epll", "mout_vpll", }; +PNAME(mout_audio0_p) = { "cdclk0", "none", "sclk_hdmi24m","
sclk_usbphy0", + "xxti", "xusbxti", "sclk_mpll","
sclk_epll",Quoted 3 lines
drivers/clk/samsung/clk-exynos4.c new file +2
-0+ "sclk_vpll" }; +PNAME (mout_audio1_p) = {"cdclk1" ,"none" ,"sclk_hdmi24m" ,"
sclk_usbphy0", + "xxti", "xusbxti", "sclk_mpll","
mout_epll",Quoted 3 lines
drivers/clk/samsung/clk-exynos4.c new file +2
-0+ "mout_vpll", }; +PNAME (mout_audio2_p) = {"cdclk2" ,"none" ,"sclk_hdmi24m" ,"
sclk_usbphy0", + "xxti", "xusbxti", "sclk_mpll","
mout_epll",Quoted 16 lines
drivers/clk/samsung/clk-exynos4.c new file +16
-0+ "mout_vpll", }; +PNAME (mout_spdif_p) = {"sclk_audio0" ,"sclk_audio1" ,"sclk_audio2" , +"spdif_extclk" , }; + +/* fixed rate clocks generated outside the soc */ +struct samsung_fixed_rate_clock exynos4_fixed_rate_ext_clks[] = { +FRATE (xxti,"xxti" ,NULL ,CLK_IS_ROOT ,0 ), +FRATE (xusbxti,"xusbxti" ,NULL ,CLK_IS_ROOT ,0 ), +}; + +/* fixed rate clocks generated inside the soc */ +struct samsung_fixed_rate_clock exynos4_fixed_rate_clks[] = { +FRATE (none,"sclk_hdmi24m" ,NULL ,CLK_IS_ROOT ,24000000 ), +FRATE (none,"sclk_hdmiphy" ,NULL ,CLK_IS_ROOT ,27000000 ), +FRATE (none,"sclk_usbphy0" ,NULL ,CLK_IS_ROOT ,48000000 ), +};drivers/clk/samsung/clk-exynos4.c
Quoted 10 lines
drivers/clk/samsung/clk-exynos4.c new file +10
-0+ +struct samsung_fixed_rate_clock exynos4210_fixed_rate_clks[] = { +FRATE (none,"sclk_usbphy1" ,NULL ,CLK_IS_ROOT ,48000000 ), +}; + +/* list of mux clocks supported in all exynos4 soc's */ +struct samsung_mux_clock exynos4_mux_clks[] = { +MUX (none,"mout_apll" , mout_apll_p,0x14200 ,0 ,1 ), +MUX (none,"mout_core" , mout_core_p,0x14200 ,16 ,1 ), + MUX_A(sclk_epll, "sclk_epll", mout_epll_p, 0xc210, 4, 1,"
sclk_epll"),Quoted 44 lines
drivers/clk/samsung/clk-exynos4.c new file +44
-0+ MUX(none, "mout_fimc0", group1_p, 0xc220, 0, 4), + MUX(none, "mout_fimc1", group1_p, 0xc220, 4, 4), + MUX(none, "mout_fimc2", group1_p, 0xc220, 8, 4), + MUX(none, "mout_fimc3", group1_p, 0xc220, 12, 4), + MUX(none, "mout_cam0", group1_p, 0xc220, 16, 4), + MUX(none, "mout_cam1", group1_p, 0xc220, 20, 4), + MUX(none, "mout_csis0", group1_p, 0xc220, 24, 4), + MUX(none, "mout_csis1", group1_p, 0xc220, 28, 4), + MUX(none, "mout_hdmi", mout_hdmi_p, 0xc224, 0, 1), + MUX(none, "mout_mfc0", sclk_ampll_p, 0xc228, 0, 1), + MUX(none, "mout_mfc1", sclk_evpll_p, 0xc228, 4, 1), + MUX(none, "mout_mfc", mout_mfc_p, 0xc228, 8, 1), + MUX(none, "mout_g3d0", sclk_ampll_p, 0xc22c, 0, 1), + MUX(none, "mout_g3d1", sclk_evpll_p, 0xc22c, 4, 1), + MUX(none, "mout_g3d", mout_g3d_p, 0xc22c, 8, 1), + MUX(none, "mout_fimd0", group1_p, 0xc234, 0, 4), + MUX(none, "mout_mipi0", group1_p, 0xc234, 12, 4), + MUX(none, "mout_audio0", mout_audio0_p, 0xc23c, 0, 4), + MUX(none, "mout_mmc0", group1_p, 0xc240, 0, 4), + MUX(none, "mout_mmc1", group1_p, 0xc240, 4, 4), + MUX(none, "mout_mmc2", group1_p, 0xc240, 8, 4), + MUX(none, "mout_mmc3", group1_p, 0xc240, 12, 4), + MUX(none, "mout_mmc4", group1_p, 0xc240, 16, 4), + MUX(none, "mout_uart0", group1_p, 0xc250, 0, 4), + MUX(none, "mout_uart1", group1_p, 0xc250, 4, 4), + MUX(none, "mout_uart2", group1_p, 0xc250, 8, 4), + MUX(none, "mout_uart3", group1_p, 0xc250, 12, 4), + MUX(none, "mout_uart4", group1_p, 0xc250, 16, 4), + MUX(none, "mout_audio1", mout_audio1_p, 0xc254, 0, 4), + MUX(none, "mout_audio2", mout_audio2_p, 0xc254, 4, 4), + MUX(none, "mout_spdif", mout_spdif_p, 0xc254, 8, 2), + MUX(none, "mout_spi0", group1_p, 0xc254, 16, 4), + MUX(none, "mout_spi1", group1_p, 0xc254, 20, 4), + MUX(none, "mout_spi2", group1_p, 0xc254, 24, 4), +}; + +/* list of mux clocks supported in exynos4210 soc */ +struct samsung_mux_clock exynos4210_mux_clks[] = { +MUX (none,"mout_aclk200" , sclk_ampll_p,0xc210 ,12 ,1 ), +MUX (none,"mout_aclk100" , sclk_ampll_p,0xc210 ,16 ,1 ), +MUX (none,"mout_aclk160" , sclk_ampll_p,0xc210 ,20 ,1 ), +MUX (none,"mout_aclk133" , sclk_ampll_p,0xc210 ,24 ,1 ), +MUX (none,"mout_vpllsrc" , mout_vpllsrc_p,0xc214 ,0 ,1 ), + MUX_A(sclk_mpll, "sclk_mpll", mout_mpll_p, 0x14200, 8, 1,Quoted 2 lines
"
sclk_mpll"), + MUX_A(sclk_vpll, "sclk_vpll",sclk_vpll_p4210,0xc210,
8, 1, "sclk_vpll"), + MUX(none, "mout_mixer",mout_mixer_p4210,
0xc224,Quoted 94 lines
4, 1),
drivers/clk/samsung/clk-exynos4.c new file +11
-0+MUX (none,"mout_dac" , mout_dac_p4210,0xc224 ,8 ,1 ), +MUX (none,"mout_g2d0" , sclk_ampll_p,0xc230 ,0 ,1 ), +MUX (none,"mout_g2d1" , sclk_evpll_p,0xc230 ,4 ,1 ), +MUX (none,"mout_g2d" , mout_g2d_p,0xc230 ,8 ,1 ), +MUX (none,"mout_fimd1" , group1_p,0xc238 ,0 ,4 ), + MUX(none, "mout_mipi1", group1_p, 0xc238, 12, 4), +}; + +/* list of mux clocks supported in exynos4x12 soc */ +struct samsung_mux_clock exynos4x12_mux_clks[] = { + MUX_A(sclk_mpll, "sclk_mpll", mout_mpll_p, 0x10200, 12, 1,"
sclk_mpll"), + MUX(none, "mout_mpll_user",mout_mpll_user_p,0x4200,
4, 1), + MUX_A(sclk_vpll, "sclk_vpll",mout_vpll_p,0xc210, 8, 1,
"sclk_vpll"), +MUX(none, "mout_aclk200", aclk_p4412, 0xc210, 12, 1),drivers/clk/samsung/clk-exynos4.c new file +14
-0+MUX (none,"mout_aclk100" , aclk_p4412,0xc210 ,16 ,1 ), +MUX (none,"mout_aclk160" , aclk_p4412,0xc210 ,20 ,1 ), +MUX (none,"mout_aclk133" , aclk_p4412,0xc210 ,24 ,1 ), +MUX (none,"mout_mdnie0" , group1_p,0xc234 ,4 ,4 ), +MUX (none,"mout_mdnie_pwm0" , group1_p,0xc234 ,8 ,4 ), +MUX (none,"mout_sata" , sclk_ampll_p,0xc240 ,24 ,1 ), +MUX (none,"mout_jpeg0" , sclk_ampll_p,0xc258 ,0 ,1 ), +MUX (none,"mout_jpeg1" , sclk_evpll_p,0xc258 ,4 ,1 ), + MUX(none, "mout_jpeg", mout_jpeg_p, 0xc258, 8, 1), +}; + +/* list of divider clocks supported in all exynos4 soc's */ +struct samsung_div_clock exynos4_div_clks[] = { + DIV_A(sclk_apll, "sclk_apll", "mout_apll", 0x14500, 24, 3,"
sclk_apll"), +DIV(none, "div_core", "mout_core", 0x14500, 0, 3),drivers/clk/samsung/clk-exynos4.c new file +64
-0+DIV (none,"div_core2" ,"div_core" ,0x14500 ,28 ,3 ), +DIV_A (arm_clk,"arm_clk" ,"div_core2" ,0x14500 ,28 ,3 ,"arm_clk" ), +DIV (aclk200,"aclk200" ,"mout_aclk200" ,0xc510 ,0 ,3 ), +DIV (aclk100,"aclk100" ,"mout_aclk100" ,0xc510 ,4 ,4 ), +DIV (aclk160,"aclk160" ,"mout_aclk160" ,0xc510 ,8 ,3 ), +DIV (aclk133,"aclk133" ,"mout_aclk133" ,0xc510 ,12 ,3 ), +DIV (none,"div_fimc0" ,"mout_fimc0" ,0xc520 ,0 ,4 ), +DIV (none,"div_fimc1" ,"mout_fimc1" ,0xc520 ,4 ,4 ), +DIV (none,"div_fimc2" ,"mout_fimc2" ,0xc520 ,8 ,4 ), +DIV (none,"div_fimc3" ,"mout_fimc3" ,0xc520 ,12 ,4 ), +DIV (none,"div_cam0" ,"mout_cam0" ,0xc520 ,16 ,4 ), +DIV (none,"div_cam1" ,"mout_cam1" ,0xc520 ,20 ,4 ), +DIV (none,"div_csis0" ,"mout_csis0" ,0xc520 ,24 ,4 ), +DIV (none,"div_csis1" ,"mout_csis1" ,0xc520 ,28 ,4 ), +DIV (sclk_pixel,"sclk_pixel" ,"sclk_vpll" ,0xc524 ,0 ,4 ), +DIV (none,"div_mfc" ,"mout_mfc" ,0xc528 ,0 ,4 ), +DIV (none,"div_g3d" ,"mout_g3d" ,0xc52c ,0 ,4 ), +DIV (none,"div_fimd0" ,"mout_fimd0" ,0xc534 ,0 ,4 ), +DIV (none,"div_mipi0" ,"mout_mipi0" ,0xc534 ,16 ,4 ), +DIV (none,"div_mipi_pre0" ,"div_mipi0" ,0xc534 ,20 ,4 ), +DIV (none,"div_audio0" ,"mout_audio0" ,0xc53c ,0 ,4 ), +DIV (none,"div_pcm0" ,"sclk_audio0" ,0xc53c ,4 ,8 ), +DIV (none,"div_mmc0" ,"mout_mmc0" ,0xc544 ,0 ,4 ), +DIV (none,"div_mmc_pre0" ,"div_mmc0" ,0xc544 ,8 ,8 ), +DIV (none,"div_mmc1" ,"mout_mmc1" ,0xc544 ,16 ,4 ), +DIV (none,"div_mmc_pre1" ,"div_mmc1" ,0xc544 ,24 ,8 ), +DIV (none,"div_mmc2" ,"mout_mmc2" ,0xc548 ,0 ,4 ), +DIV (none,"div_mmc_pre2" ,"div_mmc2" ,0xc548 ,8 ,8 ), +DIV (none,"div_mmc3" ,"mout_mmc3" ,0xc548 ,16 ,4 ), +DIV (none,"div_mmc_pre3" ,"div_mmc3" ,0xc548 ,24 ,8 ), +DIV (none,"div_mmc4" ,"mout_mmc4" ,0xc54c ,0 ,4 ), +DIV (none,"div_mmc_pre4" ,"div_mmc4" ,0xc54c ,8 ,8 ), +DIV (none,"div_uart0" ,"mout_uart0" ,0xc550 ,0 ,4 ), +DIV (none,"div_uart1" ,"mout_uart1" ,0xc550 ,4 ,4 ), +DIV (none,"div_uart2" ,"mout_uart2" ,0xc550 ,8 ,4 ), +DIV (none,"div_uart3" ,"mout_uart3" ,0xc550 ,12 ,4 ), +DIV (none,"div_uart4" ,"mout_uart4" ,0xc550 ,16 ,4 ), +DIV (none,"div_spi0" ,"mout_spi0" ,0xc554 ,0 ,4 ), +DIV (none,"div_spi_pre0" ,"div_spi0" ,0xc554 ,8 ,8 ), +DIV (none,"div_spi1" ,"mout_spi1" ,0xc554 ,16 ,4 ), +DIV (none,"div_spi_pre1" ,"div_spi1" ,0xc554 ,24 ,8 ), +DIV (none,"div_spi2" ,"mout_spi2" ,0xc558 ,0 ,4 ), +DIV (none,"div_spi_pre2" ,"div_spi2" ,0xc558 ,8 ,8 ), +DIV (sclk_slimbus,"sclk_slimbus" ,"sclk_epll" ,0xc55c ,4 ,4 ), +DIV (none,"div_audio1" ,"mout_audio1" ,0xc560 ,0 ,4 ), +DIV (sclk_pcm1,"sclk_pcm1" ,"sclk_audio1" ,0xc560 ,4 ,8 ), +DIV (none,"div_audio2" ,"mout_audio2" ,0xc560 ,16 ,4 ), +DIV (sclk_pcm2,"sclk_pcm2" ,"sclk_audio2" ,0xc560 ,20 ,8 ), +DIV (sclk_i2s1,"sclk_i2s1" ,"sclk_audio1" ,0xc564 ,0 ,6 ), + DIV(sclk_i2s2, "sclk_i2s2", "sclk_audio2", 0xc564, 8, 6), +}; + +/* list of divider clocks supported in exynos4210 soc */ +struct samsung_div_clock exynos4210_div_clks[] = { +DIV (none,"div_g2d" ,"mout_g2d" ,0xc530 ,0 ,4 ), +DIV (none,"div_fimd1" ,"mout_fimd1" ,0xc538 ,0 ,4 ), +DIV (none,"div_mipi1" ,"mout_mipi1" ,0xc538 ,16 ,4 ), +DIV (none,"div_mipi_pre1" ,"div_mipi1" ,0xc538 ,20 ,4 ), +DIV (none,"div_sata" ,"mout_sata" ,0xc540 ,20 ,4 ), +}; + +/* list of divider clocks supported in exynos4x12 soc */ +struct samsung_div_clock exynos4x12_div_clks[] = { + DIV(none, "div_mdnie0", "mout_mdnie0", 0xc534, 4, 4),drivers/clk/samsung/clk-exynos4.c
Quoted 10 lines
drivers/clk/samsung/clk-exynos4.c new file +10
-0+DIV (none,"div_mdnie_pwm0" ,"mout_mdnie_pwm0" ,0xc534 ,8 ,4 ), +DIV (none,"div_mdnie_pwm_pre0" ,"div_mdnie_pwm0" ,0xc534 ,12 ,4 ), +DIV (none,"div_mipihsi" ,"mout_mipihsi" ,0xc540 ,20 ,4 ), + DIV(none, "div_jpeg", "mout_jpeg", 0xc568, 0, 4), +}; + +/* list of gate clocks supported in all exynos4 soc's */ +struct samsung_gate_clock exynos4_gate_clks[] = { +/* +* After all Exynos4 based platforms are migrated to use device tree,
Quoted 43 lines
drivers/clk/samsung/clk-exynos4.c new file +43
-0+* the device name and clock alias names specified below for some +* of the clocks can be removed. +*/ +GATE_DA (sclk_fimc0,"exynos4-fimc.0" ,"sclk_fimc0" ,"div_fimc0" , +0xc320 ,0 ,CLK_SET_RATE_PARENT ,0 ,"sclk_fimc" ), +GATE_DA (sclk_fimc1,"exynos4-fimc.1" ,"sclk_fimc1" ,"div_fimc1" , +0xc320 ,4 ,CLK_SET_RATE_PARENT ,0 ,"sclk_fimc" ), +GATE_DA (sclk_fimc2,"exynos4-fimc.2" ,"sclk_fimc2" ,"div_fimc2" , +0xc320 ,8 ,CLK_SET_RATE_PARENT ,0 ,"sclk_fimc" ), +GATE_DA (sclk_fimc3,"exynos4-fimc.3" ,"sclk_fimc3" ,"div_fimc3" , +0xc320 ,12 ,CLK_SET_RATE_PARENT ,0 ,"sclk_fimc" ), +GATE_DA (sclk_csis0,"s5p-mipi-csis.0" ,"sclk_csis0" ,"div_csis0" , +0xc320 ,24 ,CLK_SET_RATE_PARENT ,0 ,"sclk_csis" ), +GATE_DA (sclk_csis1,"s5p-mipi-csis.1" ,"sclk_csis1" ,"div_csis1" , +0xc320 ,28 ,CLK_SET_RATE_PARENT ,0 ,"sclk_csis" ), +GATE (sclk_hdmi,"sclk_hdmi" ,"mout_hdmi" ,0xc324 ,0 ,0 ,0 ), +GATE (sclk_mixer,"sclk_mixer" ,"mout_mixer" ,0xc324 ,4 ,0 ,0 ), +GATE (sclk_dac,"sclk_dac" ,"mout_dac" ,0xc324 ,8 ,0 ,0 ), +GATE_DA (sclk_fimd0,"exynos4-fb.0" ,"sclk_fimd0" ,"div_fimd0" , +0xc334 ,0 ,CLK_SET_RATE_PARENT ,0 ,"sclk_fimd" ), +GATE (sclk_mipi0,"sclk_mipi0" ,"div_mipi_pre0" , +0xc334 ,12 ,CLK_SET_RATE_PARENT ,0 ), +GATE_DA (sclk_mmc0,"exynos4-sdhci.0" ,"sclk_mmc0" ,"div_mmc-pre0" , +0xc340 ,0 ,CLK_SET_RATE_PARENT ,0 ,"mmc_busclk.2" ), +GATE_DA (sclk_mmc1,"exynos4-sdhci.1" ,"sclk_mmc1" ,"div_mmc-pre1" , +0xc340 ,4 ,CLK_SET_RATE_PARENT ,0 ,"mmc_busclk.2" ), +GATE_DA (sclk_mmc2,"exynos4-sdhci.2" ,"sclk_mmc2" ,"div_mmc-pre2" , +0xc340 ,8 ,CLK_SET_RATE_PARENT ,0 ,"mmc_busclk.2" ), +GATE_DA (sclk_mmc3,"exynos4-sdhci.3" ,"sclk_mmc3" ,"div_mmc-pre3" , +0xc340 ,12 ,CLK_SET_RATE_PARENT ,0 ,"mmc_busclk.2" ), +GATE_DA (sclk_mmc4,NULL ,"sclk_mmc4" ,"div_mmc-pre4" , +0xc340 ,16 ,CLK_SET_RATE_PARENT ,0 ,"ciu" ), +GATE_DA (sclk_uart0,"exynos4210-uart.0" ,"uclk0" ,"div_uart0" , +0xc350 ,0 ,CLK_SET_RATE_PARENT ,0 ,"clk_uart_baud0" ), +GATE_DA (sclk_uart1,"exynos4210-uart.1" ,"uclk1" ,"div_uart1" , +0xc350 ,4 ,CLK_SET_RATE_PARENT ,0 ,"clk_uart_baud0" ), +GATE_DA (sclk_uart2,"exynos4210-uart.2" ,"uclk2" ,"div_uart2" , +0xc350 ,8 ,CLK_SET_RATE_PARENT ,0 ,"clk_uart_baud0" ), +GATE_DA (sclk_uart3,"exynos4210-uart.3" ,"uclk3" ,"div_uart3" , +0xc350 ,12 ,CLK_SET_RATE_PARENT ,0 ,"clk_uart_baud0" ), +GATE_DA (sclk_uart4,"exynos4210-uart.4" ,"uclk4" ,"div_uart4" , +0xc350 ,16 ,CLK_SET_RATE_PARENT ,0 ,"clk_uart_baud0" ), + GATE(sclk_audio1, "sclk_audio1", "div_audio1", 0xc354, 0,Quoted 4 lines
CLK_SET_RATE_PARENT, 0), + GATE(sclk_audio2, "sclk_audio2",
"div_audio2",0xc354, 4,CLK_SET_RATE_PARENT, 0), + GATE(sclk_spdif,
"sclk_spdif", "mout_spdif",0xc354, 8, 0, 0), + GATE_DA(sclk_spi0,
"exynos4210-spi.0", "sclk_spi0", "div_spi_pre0", +
0xc354, 16,drivers/clk/samsung/clk-exynos4.c
Quoted 6 lines
CLK_SET_RATE_PARENT, 0, "spi_busclk0"),drivers/clk/samsung/clk-exynos4.c new file +5
-0+GATE_DA (sclk_spi1,"exynos4210-spi.1" ,"sclk_spi1" ,"div_spi_pre1" , +0xc354 ,20 ,CLK_SET_RATE_PARENT ,0 ,"spi_busclk0" ), +GATE_DA (sclk_spi2,"exynos4210-spi.2" ,"sclk_spi2" ,"div_spi_pre2" , +0xc354 ,24 ,CLK_SET_RATE_PARENT ,0 ,"spi_busclk0" ), + GATE_DA(fimc0, "exynos4-fimc.0", "fimc0", "aclk160", 0xc920, 0, 0,0,
Quoted 1 line
"fimc"), + GATE_DA(fimc1, "exynos4-fimc.1", "fimc1", "aclk160",
0xc920,Quoted 2 lines
1, 0, 0, "fimc"), + GATE_DA(fimc2, "exynos4-fimc.2", "fimc2",
"aclk160",0xc920, 2, 0, 0, "fimc"), + GATE_DA(fimc3, "exynos4-fimc.3",
drivers/clk/samsung/clk-exynos4.c
Quoted 13 lines
"fimc3", "aclk160",
0xc920, 3, 0, 0, "fimc"), + GATE_DA(csis0,
"s5p-mipi-csis.0", "csis0", "aclk160",0xc920, 4, 0, 0, "fimc"),
+ GATE_DA(csis1, "s5p-mipi-csis.1", "csis1", "aclk160",0xc920, 5, 0,
0, "fimc"), +GATE(jpeg, "jpeg", "aclk160", 0xc920, 6, 0, 0),drivers/clk/samsung/clk-exynos4.c new file +9
-0+GATE_DA (smmu_fimc0,"exynos-sysmmu.5" ,"smmu_fimc0" ,"aclk160" , +0xc920 ,7 ,0 ,0 ,"sysmmu" ), +GATE_DA (smmu_fimc1,"exynos-sysmmu.6" ,"smmu_fimc1" ,"aclk160" , +0xc920 ,8 ,0 ,0 ,"sysmmu" ), +GATE_DA (smmu_fimc2,"exynos-sysmmu.7" ,"smmu_fimc2" ,"aclk160" , +0xc920 ,9 ,0 ,0 ,"sysmmu" ), +GATE_DA (smmu_fimc3,"exynos-sysmmu.8" ,"smmu_fimc3" ,"aclk160" , +0xc920 ,10 ,0 ,0 ,"sysmmu" ), + GATE_DA(smmu_jpeg, "exynos-sysmmu.3", "smmu_jpeg", "aclk160",
0xc920,Quoted 1 line
11, 0, 0, "sysmmu"), + GATE_D(vp, "s5p-mixer", "vp", "aclk160",
0xc924,Quoted 5 lines
0, 0, 0),
drivers/clk/samsung/clk-exynos4.c new file +3
-0+GATE_D (mixer,"s5p-mixer" ,"mixer" ,"aclk160" ,0xc924 ,1 ,0 ,0 ), +GATE_D (hdmi,"exynos4-hdmi" ,"hdmi" ,"aclk160" ,0xc924 ,3 ,0 ,0 ), + GATE_DA(smmu_tv, "exynos-sysmmu.2", "smmu_tv", "aclk160", 0xc924, 4,0, 0, "sysmmu"), + GATE_DA(mfc, "s5p-mfc", "mfc", "aclk100",
0xc928,0,
Quoted 14 lines
0, 0, "mfc"), + GATE_DA(smmu_mfcl, "exynos-sysmmu.0", "
smmu_mfcl",
"aclk100",0xc928, 1, 0, 0, "sysmmu"), + GATE_DA(smmu_mfcr,
"exynos-sysmmu.1", "smmu_mfcr", "aclk100",0xc928, 2, 0, 0, "sysmmu"),drivers/clk/samsung/clk-exynos4.c new file +2
-0+GATE (g3d,"g3d" ,"aclk200" ,0xc92c ,0 ,0 ,0 ), + GATE_DA(fimd0, "exynos4-fb.0", "fimd0", "aclk160", 0xc934, 0, 0, 0,"fimd"), +
GATE(mie0, "mie0", "aclk160", 0xc934, 1, 0, 0),drivers/clk/samsung/clk-exynos4.c new file +8
-0+GATE (dsim0,"dsim0" ,"aclk160" ,0xc934 ,3 ,0 ,0 ), +GATE_DA (smmu_fimd0,"exynos-sysmmu.10" ,"smmu_fimd0" ,"aclk160" , +0xc934 ,4 ,0 ,0 ,"sysmmu" ), +GATE (fimd1,"fimd1" ,"aclk160" ,0xc938 ,0 ,0 ,0 ), +GATE (mie1,"mie1" ,"aclk160" ,0xc938 ,1 ,0 ,0 ), +GATE (dsim1,"dsim1" ,"aclk160" ,0xc938 ,3 ,0 ,0 ), +GATE (smmu_fimd1,"smmu_fimd1" ,"aclk160" ,0xc938 ,4 ,0 ,0 ), + GATE_DA(pdma0, "dma-pl330.0", "pdma0", "aclk133", 0xc940, 0, 0, 0,Quoted 3 lines
"dma"), + GATE_DA(pdma1, "dma-pl330.1", "pdma1", "aclk133",
0xc940, 1,
0, 0, "dma"), +GATE(tsi, "tsi", "aclk133", 0xc940, 4, 0, 0),
+ GATE_DA(sdmmc0, "exynos4-sdhci.0", "sdmmc0", "aclk133",0xc940, 5,0,
drivers/clk/samsung/clk-exynos4.c
Quoted 7 lines
0, "hsmmc"), + GATE_DA(sdmmc1, "exynos4-sdhci.1", "sdmmc1", "aclk133",
0xc940, 6, 0, 0, "hsmmc"), + GATE_DA(sdmmc2, "exynos4-sdhci.2",
"sdmmc2", "aclk133",0xc940, 7, 0, 0, "hsmmc"), + GATE_DA(sdmmc3,
"exynos4-sdhci.3", "sdmmc3", "aclk133",0xc940, 8, 0, 0, "hsmmc"),drivers/clk/samsung/clk-exynos4.c new file +3
-0+GATE_A (sdmmc4,"sdmmc4" ,"aclk133" ,0xc940 ,9 ,0 ,0 ,"biu" ), +GATE (sromc,"sromc" ,"aclk133" ,0xc940 ,11 ,0 ,0 ), + GATE_A(usb_host, "usb_host", "aclk133", 0xc940, 12, 0, 0,"usbhost"),
drivers/clk/samsung/clk-exynos4.c
Quoted 6 lines
drivers/clk/samsung/clk-exynos4.c new file +6
-0+GATE (usb_device,"usb_device" ,"aclk133" ,0xc940 ,13 ,0 ,0 ), +GATE (onenand,"onenand" ,"aclk133" ,0xc940 ,15 ,0 ,0 ), +GATE (nfcon,"nfcon" ,"aclk133" ,0xc940 ,16 ,0 ,0 ), +GATE (gps,"gps" ,"aclk133" ,0xc94c ,0 ,0 ,0 ), +GATE (smmu_gps,"smmu_gps" ,"aclk133" ,0xc94c ,1 ,0 ,0 ), + GATE_DA(uart0, "exynos4210-uart.0", "uart0", "aclk100", 0xc950, 0,0,
Quoted 5 lines
0, "uart"), + GATE_DA(uart1, "exynos4210-uart.1", "uart1", "aclk100",
0xc950, 1, 0, 0, "uart"), + GATE_DA(uart2, "exynos4210-uart.2",
"uart2", "aclk100",0xc950, 2, 0, 0, "uart"), + GATE_DA(uart3,
"exynos4210-uart.3", "uart3", "aclk100",0xc950, 3, 0, 0, "uart"),
+ GATE_DA(uart4, "exynos4210-uart.4", "uart4", "aclk100",0xc950, 4,0,
Quoted 8 lines
0, "uart"), + GATE_DA(i2c0, "s3c2440-i2c.0", "i2c0", "aclk100",
0xc950,
6, 0, 0, "i2c"), + GATE_DA(i2c1, "s3c2440-i2c.1", "i2c1", "aclk100",0xc950, 7, 0, 0, "i2c"), + GATE_DA(i2c2, "s3c2440-i2c.2", "i2c2",
"aclk100",0xc950, 8, 0, 0, "i2c"), +GATE_DA(i2c3, "s3c2440-i2c.3", "i2c3", "aclk100", 0xc950, 9, 0, 0, "i2c"), +GATE_DA(i2c4, "s3c2440-i2c.4", "i2c4", "aclk100", 0xc950, 10, 0, 0, "i2c"),
+ GATE_DA(i2c5, "s3c2440-i2c.5", "i2c5", "aclk100",0xc950, 11, 0, 0,
"i2c"), + GATE_DA(i2c6, "s3c2440-i2c.6", "i2c6", "aclk100",0xc950, 12,Quoted 8 lines
0, 0, "i2c"), + GATE_DA(i2c7, "s3c2440-i2c.7", "i2c7", "aclk100",
0xc950, 13, 0, 0, "i2c"), + GATE_DA(i2c_hdmi, "s3c2440-hdmiphy-i2c",
"i2c-hdmi", "aclk100",0xc950, 14, 0, 0, "i2c"), + GATE_DA(spi0,
"exynos4210-spi.0", "spi0", "aclk100",0xc950, 16, 0, 0, "spi"),
+ GATE_DA(spi1, "exynos4210-spi.1", "spi1", "aclk100",0xc950, 17, 0,
0, "spi"), + GATE_DA(spi2, "exynos4210-spi.2", "spi2", "aclk100",0xc950, 18, 0, 0, "spi"), + GATE_DA(i2s1, "samsung-i2s.1", "i2s1",
"aclk100",0xc950, 20, 0, 0, "iis"), + GATE_DA(i2s2, "samsung-i2s.2",
drivers/clk/samsung/clk-exynos4.c
Quoted 6 lines
"i2s2", "aclk100",
0xc950, 21, 0, 0, "iis"), + GATE_DA(pcm1,
"samsung-pcm.1", "pcm1", "aclk100",0xc950, 22, 0, 0, "pcm"),
+ GATE_DA(pcm2, "samsung-pcm.2", "pcm2", "aclk100",0xc950, 23, 0, 0,
"pcm"), +GATE_A(pwm, "pwm", "aclk100", 0xc950, 24, 0, 0, "timers"),drivers/clk/samsung/clk-exynos4.c new file +2
-0+GATE (slimbus,"slimbus" ,"aclk100" ,0xc950 ,25 ,0 ,0 ), + GATE_DA(spdif, "samsung-spdif", "spdif", "aclk100", 0xc950, 26, 0,0,
Quoted 38 lines
"spdif"), + GATE_DA(ac97, "samsung-ac97", "ac97", "aclk100",
0xc950,
27, 0, 0, "ac97"), +};drivers/clk/samsung/clk-exynos4.c new file +6
-0+ +/* list of gate clocks supported in exynos4210 soc */ +struct samsung_gate_clock exynos4210_gate_clks[] = { +GATE_DA (sclk_fimd1,"exynos4-fb.1" ,"sclk_fimd1" ,"div_fimd1" , +0xc338 ,0 ,CLK_SET_RATE_PARENT ,0 ,"sclk_fimd" ), + GATE(sclk_mipi1, "sclk_mipi1", "div_mipi_pre1", 0xc338, 12,
CLK_SET_RATE_PARENT, 0), + GATE(sclk_sata, "sclk_sata", "div_sata",0xc340, 24,CLK_SET_RATE_PARENT, 0), + GATE(sclk_cam0, "sclk_cam0",
"div_cam0",0xc820, 4,CLK_SET_RATE_PARENT, 0), + GATE(sclk_cam1,
"sclk_cam1", "div_cam1",0xc820, 5,CLK_SET_RATE_PARENT, 0),drivers/clk/samsung/clk-exynos4.c new file +26
-0+GATE (tvenc,"tvenc" ,"aclk160" ,0xc924 ,2 ,0 ,0 ), +GATE (g2d,"g2d" ,"aclk200" ,0xc930 ,0 ,0 ,0 ), +GATE (rotator,"rotator" ,"aclk200" ,0xc930 ,1 ,0 ,0 ), +GATE (mdma,"mdma" ,"aclk200" ,0xc930 ,2 ,0 ,0 ), +GATE (smmu_g2d,"smmu_g2d" ,"aclk200" ,0xc930 ,3 ,0 ,0 ), +GATE (smmu_rotator,"smmu_rotator" ,"aclk200" ,0xc930 ,4 ,0 ,0 ), +GATE (smmu_mdma,"smmu_mdma" ,"aclk200" ,0xc930 ,5 ,0 ,0 ), +GATE (pcie_phy,"pcie_phy" ,"aclk133" ,0xc940 ,2 ,0 ,0 ), +GATE (sata_phy,"sata_phy" ,"aclk133" ,0xc940 ,3 ,0 ,0 ), +GATE (sata,"sata" ,"aclk133" ,0xc940 ,10 ,0 ,0 ), +GATE (pcie,"pcie" ,"aclk133" ,0xc940 ,14 ,0 ,0 ), +GATE (smmu_pcie,"smmu_pcie" ,"aclk133" ,0xc940 ,18 ,0 ,0 ), +GATE_A (tsadc,"tsadc" ,"aclk100" ,0xc950 ,15 ,0 ,0 ,"adc" ), +GATE (modemif,"modemif" ,"aclk100" ,0xc950 ,28 ,0 ,0 ), +GATE (chipid,"chipid" ,"aclk100" ,0xc960 ,0 ,0 ,0 ), +GATE (sysreg,"sysreg" ,"aclk100" ,0xc960 ,0 ,0 ,0 ), +GATE (hdmi_cec,"hdmi_cec" ,"aclk100" ,0xc960 ,11 ,0 ,0 ), +GATE_A (mct,"mct" ,"aclk100" ,0xc960 ,13 ,0 ,0 ,"mct" ), +GATE_A (wdt,"watchdog" ,"aclk100" ,0xc960 ,14 ,0 ,0 ,"watchdog" ), +GATE_A (rtc,"rtc" ,"aclk100" ,0xc960 ,15 ,0 ,0 ,"rtc" ), + GATE_A(keyif, "keyif", "aclk100", 0xc960, 16, 0, 0, "keypad"), +}; + +/* list of gate clocks supported in exynos4x12 soc */ +struct samsung_gate_clock exynos4x12_gate_clks[] = { + GATE(sclk_mdnie0, "sclk_mdnie0", "div_mdnie0", 0xc334, 4,Quoted 2 lines
CLK_SET_RATE_PARENT, 0), + GATE(sclk_mdnie_pwm0, "sclk_mdnie_pwm0",
"div_mdnie_pwm_pre0", +0xc334, 8,CLK_SET_RATE_PARENT,0),
Quoted 23 lines
+ GATE(sclk_mipihsi, "
sclk_mipihsi", "div_mipihsi",0xc340, 24,CLK_SET_RATE_PARENT, 0), + GATE(audss, "audss", "sclk_epll",0xc93c, 0,
0, 0),drivers/clk/samsung/clk-exynos4.c new file +2
-0+GATE (mdnie0,"mdnie0" ,"aclk160" ,0xc934 ,2 ,0 ,0 ), + GATE_DA(pcm0, "samsung-pcm.0", "pcm0", "aclk100", 0xc93c, 2, 0, 0,"pcm"), + GATE_DA(i2s0, "samsung-i2s.0", "i2s0", "aclk100",
0xc93c, 3,
0, 0, "iis"), + GATE(mipi_hsi, "mipi_hsi", "aclk133",0xc940, 10, 0,
0),drivers/clk/samsung/clk-exynos4.c new file +15
-0+GATE (chipid,"chipid" ,"aclk100" ,0x8960 ,0 ,0 ,0 ), +GATE (sysreg,"sysreg" ,"aclk100" ,0x8960 ,1 ,0 ,0 ), +GATE (hdmi_cec,"hdmi_cec" ,"aclk100" ,0x8960 ,11 ,0 ,0 ), +GATE_A (mct,"mct" ,"aclk100" ,0x8960 ,13 ,0 ,0 ,"mct" ), +GATE_A (wdt,"watchdog" ,"aclk100" ,0x8960 ,14 ,0 ,0 ,"watchdog" ), +GATE_A (rtc,"rtc" ,"aclk100" ,0x8960 ,15 ,0 ,0 ,"rtc" ), +GATE_A (keyif,"keyif" ,"aclk100" ,0x8960 ,16 ,0 ,0 ,"keypad" ), +GATE (rotator,"rotator" ,"aclk200" ,0x4930 ,1 ,0 ,0 ), +GATE (mdma2,"mdma2" ,"aclk200" ,0x4930 ,2 ,0 ,0 ), +GATE (smmu_rotator,"smmu_rotator" ,"aclk200" ,0x4930 ,4 ,0 ,0 ), + GATE(smmu_mdma, "smmu_mdma", "aclk200", 0x4930, 5, 0, 0), +}; + +static struct of_device_id exynos4_clk_ids[] = { + { .compatible ="samsung,exynos4210-clock" ,
Quoted 8 lines
drivers/clk/samsung/clk-exynos4.c line 467
Quoted 5 lines
drivers/clk/samsung/clk-exynos4.c new file +5
-0+ .data = (void *)EXYNOS4210, }, + { .compatible = "samsung,exynos4412-clock", + .data = (void *)EXYNOS4X12, }, + { }, +};I wonder if most of these static arrays couldn't be marked as initdata to be dropped after initialization.
Yes, that's right. These can be marked as initdata.
Quoted 3 lines
Correct me if I'm wrong, but from what I see these data are referenced by common clock framework core only when registering these clocks.
Yes, that's correct.
Thanks,
Thomas.
PATCH v3 4/11 ARM: Exynos4: Migrate clock support to common clock framework
In reply to Thomas AbrahamRemove Samsung specific clock support in Exynos4 and migrate to use common clock framework.
--- arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-exynos/Makefile | 3 - arch/arm/mach-exynos/clock-exynos4.c | 1602 ---------------------------- arch/arm/mach-exynos/clock-exynos4.h | 35 - arch/arm/mach-exynos/clock-exynos4210.c | 188 ---- arch/arm/mach-exynos/clock-exynos4212.c | 192 ---- arch/arm/mach-exynos/common.c | 22 +- arch/arm/mach-exynos/common.h | 3 + arch/arm/mach-exynos/mach-armlex4210.c | 1 - arch/arm/mach-exynos/mach-exynos4-dt.c | 1 - arch/arm/mach-exynos/mach-nuri.c | 1 - arch/arm/mach-exynos/mach-origen.c | 1 - arch/arm/mach-exynos/mach-smdk4x12.c | 1 - arch/arm/mach-exynos/mach-smdkv310.c | 1 - arch/arm/mach-exynos/mach-universal_c210.c | 1 - arch/arm/mach-exynos/mct.c | 19 + arch/arm/plat-samsung/Kconfig | 4 +- 17 files changed, 27 insertions(+), 2049 deletions(-) delete mode 100644 arch/arm/mach-exynos/clock-exynos4.c delete mode 100644 arch/arm/mach-exynos/clock-exynos4.h delete mode 100644 arch/arm/mach-exynos/clock-exynos4210.c delete mode 100644 arch/arm/mach-exynos/clock-exynos4212.c
arch/arm/mach-exynos/Kconfig +1 -0
@@ -15,6 +15,7 @@ config ARCH_EXYNOS4 bool "SAMSUNG EXYNOS4" default y select HAVE_SMP + select COMMON_CLK select MIGHT_HAVE_CACHE_L2X0 help Samsung EXYNOS4 SoCs based systems
arch/arm/mach-exynos/Makefile +0 -3
@@ -13,10 +13,7 @@ obj- := # Core obj-$(CONFIG_ARCH_EXYNOS) += common.o -obj-$(CONFIG_ARCH_EXYNOS4) += clock-exynos4.o obj-$(CONFIG_ARCH_EXYNOS5) += clock-exynos5.o -obj-$(CONFIG_CPU_EXYNOS4210) += clock-exynos4210.o -obj-$(CONFIG_SOC_EXYNOS4212) += clock-exynos4212.o obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o
arch/arm/mach-exynos/clock-exynos4.c deleted +0 -1602
1,602 lines not on this page · raw message
arch/arm/mach-exynos/clock-exynos4.h deleted +0 -35
@@ -1,35 +0,0 @@ -/* -* Copyright (c) 2011-2012 Samsung Electronics Co., Ltd. -* http://www.samsung.com -* -* Header file for exynos4 clock support -* -* 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. -*/ - -#ifndef __ASM_ARCH_CLOCK_H -#define __ASM_ARCH_CLOCK_H __FILE__ - -#include <linux/clk.h> - -extern struct clksrc_clk exynos4_clk_aclk_133; -extern struct clksrc_clk exynos4_clk_mout_mpll; - -extern struct clksrc_sources exynos4_clkset_mout_corebus; -extern struct clksrc_sources exynos4_clkset_group; - -extern struct clk *exynos4_clkset_aclk_top_list[]; -extern struct clk *exynos4_clkset_group_list[]; - -extern struct clksrc_sources exynos4_clkset_mout_g2d0; -extern struct clksrc_sources exynos4_clkset_mout_g2d1; - -extern int exynos4_clksrc_mask_fsys_ctrl (struct clk *clk,int enable); -extern int exynos4_clk_ip_fsys_ctrl (struct clk *clk,int enable); -extern int exynos4_clk_ip_lcd1_ctrl (struct clk *clk,int enable); -extern int exynos4_clk_ip_image_ctrl (struct clk *clk,int enable); -extern int exynos4_clk_ip_dmc_ctrl (struct clk *clk,int enable); - -#endif /* __ASM_ARCH_CLOCK_H */
arch/arm/mach-exynos/clock-exynos4210.c deleted +0 -188
188 lines not on this page · raw message
arch/arm/mach-exynos/clock-exynos4212.c deleted +0 -192
192 lines not on this page · raw message
arch/arm/mach-exynos/common.c +2 -20
@@ -61,7 +61,6 @@ static const char name_exynos5250[] = "EXYNOS5250";static void exynos4_map_io (void );static void exynos5_map_io (void ); -static void exynos4_init_clocks (int xtal);static void exynos5_init_clocks (int xtal);static void exynos4_init_uarts (struct s3c2410_uartcfg *cfg,int no);static int exynos_init (void );
@@ -71,7 +70,6 @@ static struct cpu_table cpu_ids[] __initdata = { .idcode = EXYNOS4210_CPU_ID, .idmask = EXYNOS4_CPU_MASK, .map_io = exynos4_map_io, - .init_clocks = exynos4_init_clocks, .init_uarts = exynos4_init_uarts, .init = exynos_init, .name = name_exynos4210,
@@ -79,14 +77,12 @@ static struct cpu_table cpu_ids[] __initdata = { .idcode = EXYNOS4212_CPU_ID, .idmask = EXYNOS4_CPU_MASK, .map_io = exynos4_map_io, - .init_clocks = exynos4_init_clocks, .init = exynos_init, .name = name_exynos4212, }, { .idcode = EXYNOS4412_CPU_ID, .idmask = EXYNOS4_CPU_MASK, .map_io = exynos4_map_io, - .init_clocks = exynos4_init_clocks, .init = exynos_init, .name = name_exynos4412, }, {
@@ -350,31 +346,17 @@ static void __init exynos5_map_io(void)s3c64xx_spi_setname ("exynos4210-spi" ); } -static void __init exynos4_init_clocks (int xtal) -{ -printk (KERN_DEBUG "%s: initializing clocks\n" , __func__); - -s3c24xx_register_baseclocks (xtal); -s5p_register_clocks (xtal); - -if (soc_is_exynos4210 ()) -exynos4210_register_clocks (); -else if (soc_is_exynos4212 () ||soc_is_exynos4412 ()) -exynos4212_register_clocks (); - -exynos4_register_clocks (); -exynos4_setup_clocks (); -} -static void __init exynos5_init_clocks (int xtal) {printk (KERN_DEBUG "%s: initializing clocks\n" , __func__); +#ifndef CONFIG_COMMON_CLK s3c24xx_register_baseclocks (xtal);s5p_register_clocks (xtal);exynos5_register_clocks ();exynos5_setup_clocks (); +#endif }#define COMBINER_ENABLE_SET 0x0
arch/arm/mach-exynos/common.h +3 -0
@@ -22,6 +22,9 @@ void exynos4_restart(char mode, const char *cmd);void exynos5_restart (char mode,const char *cmd);void exynos_init_late (void ); +void exynos4_clk_init (void ); +void exynos4_clk_register_fixed_ext (unsigned long ,unsigned long ); +#ifdef CONFIG_PM_GENERIC_DOMAINS int exynos_pm_late_initcall (void );#else
arch/arm/mach-exynos/mach-armlex4210.c +0 -1
@@ -179,7 +179,6 @@ static void __init armlex4210_smsc911x_init(void)static void __init armlex4210_map_io (void ) {exynos_init_io (NULL ,0 ); -s3c24xx_init_clocks (24000000 );s3c24xx_init_uarts (armlex4210_uartcfgs,ARRAY_SIZE (armlex4210_uartcfgs)); }
arch/arm/mach-exynos/mach-exynos4-dt.c +0 -1
@@ -85,7 +85,6 @@ static const struct of_dev_auxdata exynos4_auxdata_lookup[] __initconst = {static void __init exynos4_dt_map_io (void ) {exynos_init_io (NULL ,0 ); -s3c24xx_init_clocks (24000000 ); }static void __init exynos4_dt_machine_init (void )
arch/arm/mach-exynos/mach-nuri.c +0 -1
@@ -1331,7 +1331,6 @@ static struct platform_device *nuri_devices[] __initdata = {static void __init nuri_map_io (void ) {exynos_init_io (NULL ,0 ); -s3c24xx_init_clocks (clk_xusbxti.rate);s3c24xx_init_uarts (nuri_uartcfgs,ARRAY_SIZE (nuri_uartcfgs)); }
arch/arm/mach-exynos/mach-origen.c +0 -1
@@ -753,7 +753,6 @@ static void s5p_tv_setup(void)static void __init origen_map_io (void ) {exynos_init_io (NULL ,0 ); -s3c24xx_init_clocks (clk_xusbxti.rate);s3c24xx_init_uarts (origen_uartcfgs,ARRAY_SIZE (origen_uartcfgs)); }
arch/arm/mach-exynos/mach-smdk4x12.c +0 -1
@@ -323,7 +323,6 @@ static struct platform_device *smdk4x12_devices[] __initdata = {static void __init smdk4x12_map_io (void ) {exynos_init_io (NULL ,0 ); -s3c24xx_init_clocks (clk_xusbxti.rate);s3c24xx_init_uarts (smdk4x12_uartcfgs,ARRAY_SIZE (smdk4x12_uartcfgs)); }
arch/arm/mach-exynos/mach-smdkv310.c +0 -1
@@ -373,7 +373,6 @@ static void s5p_tv_setup(void)static void __init smdkv310_map_io (void ) {exynos_init_io (NULL ,0 ); -s3c24xx_init_clocks (clk_xusbxti.rate);s3c24xx_init_uarts (smdkv310_uartcfgs,ARRAY_SIZE (smdkv310_uartcfgs)); }
arch/arm/mach-exynos/mach-universal_c210.c +0 -1
@@ -1093,7 +1093,6 @@ static struct platform_device *universal_devices[] __initdata = {static void __init universal_map_io (void ) {exynos_init_io (NULL ,0 ); -s3c24xx_init_clocks (clk_xusbxti.rate);s3c24xx_init_uarts (universal_uartcfgs,ARRAY_SIZE (universal_uartcfgs));s5p_set_timer_source (S5P_PWM2 ,S5P_PWM4 ); }
arch/arm/mach-exynos/mct.c +19 -0
@@ -31,6 +31,7 @@#include <mach/map.h> #include <mach/irqs.h> #include <asm/mach/time.h> +#include "common.h" #define EXYNOS4_MCTREG (x) (x)#define EXYNOS4_MCT_G_CNT_L EXYNOS4_MCTREG(0x100)
@@ -517,6 +518,24 @@ static void __init exynos4_timer_init(void)struct device_node *np;u32 nr_irqs, i; +#ifdef CONFIG_COMMON_CLK +/* +* Clock lookup should be functional now since the MCT controller driver +* looks up clocks. So the clock initialization is initiated here. +*/ +if (of_have_populated_dt ()) { +if (of_machine_is_compatible ("samsung,exynos4210" ) || +of_machine_is_compatible ("samsung,exynos4212" ) || +of_machine_is_compatible ("samsung,exynos4412" )) +exynos4_clk_init (); + }else { +if (soc_is_exynos4210 () ||soc_is_exynos4212 () || +soc_is_exynos4412 ()) { +exynos4_clk_init (); + } + } +#endif + np =of_find_compatible_node (NULL ,NULL ,"samsung,exynos4210-mct" );if (np) { if (of_machine_is_compatible("samsung,exynos4210") ||
arch/arm/plat-samsung/Kconfig +2 -2
@@ -25,7 +25,7 @@ config PLAT_S5P select PLAT_SAMSUNG select S3C_GPIO_TRACK select S5P_GPIO_DRVSTR - select SAMSUNG_CLKSRC + select SAMSUNG_CLKSRC if !COMMON_CLK select SAMSUNG_GPIOLIB_4BIT select SAMSUNG_IRQ_VIC_TIMER help
@@ -89,7 +89,7 @@ config SAMSUNG_CLKSRC used by newer systems such as the S3C64XX. config S5P_CLOCK - def_bool (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS) + def_bool ((ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS) && !COMMON_CLK) help Support common clock part for ARCH_S5P and ARCH_EXYNOS SoCs
Signature · 1 line
1.7.4.4
PATCH v3 4/11 ARM: Exynos4: Migrate clock support to common clock framework
Quoted 30 lines · On Thursday 15 of November 2012 03:37:26 Thomas Abraham wrote:
Remove Samsung specific clock support in Exynos4 and migrate to use common clock framework.
Cc Kukjin Kim <[email protected]>Signed-off-by Thomas Abraham <[email protected]>--- arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-exynos/Makefile | 3 - arch/arm/mach-exynos/clock-exynos4.c | 1602 ---------------------------- arch/arm/mach-exynos/clock-exynos4.h | 35 - arch/arm/mach-exynos/clock-exynos4210.c | 188 ---- arch/arm/mach-exynos/clock-exynos4212.c | 192 ---- arch/arm/mach-exynos/common.c | 22 +- arch/arm/mach-exynos/common.h | 3 + arch/arm/mach-exynos/mach-armlex4210.c | 1 - arch/arm/mach-exynos/mach-exynos4-dt.c | 1 - arch/arm/mach-exynos/mach-nuri.c | 1 - arch/arm/mach-exynos/mach-origen.c | 1 - arch/arm/mach-exynos/mach-smdk4x12.c | 1 - arch/arm/mach-exynos/mach-smdkv310.c | 1 - arch/arm/mach-exynos/mach-universal_c210.c | 1 - arch/arm/mach-exynos/mct.c | 19 + arch/arm/plat-samsung/Kconfig | 4 +- 17 files changed, 27 insertions(+), 2049 deletions(-) delete mode 100644 arch/arm/mach-exynos/clock-exynos4.c delete mode 100644 arch/arm/mach-exynos/clock-exynos4.h delete mode 100644 arch/arm/mach-exynos/clock-exynos4210.c delete mode 100644 arch/arm/mach-exynos/clock-exynos4212.c
[snip]
Quoted 24 lines
arch/arm/mach-exynos/mct.c +4
-0@@ -31,6 +31,7 @@#include <mach/map.h> #include <mach/irqs.h> #include <asm/mach/time.h> +#include "common.h" #define EXYNOS4_MCTREG (x) (x)#define EXYNOS4_MCT_G_CNT_L EXYNOS4_MCTREG(0x100)@@ -517,6 +518,24 @@ static void __init exynos4_timer_init(void)struct device_node *np;u32 nr_irqs, i; +#ifdef CONFIG_COMMON_CLK +/* +* Clock lookup should be functional now since the MCT controller driver + * looks up clocks. So the clock initialization is initiated
here. + */arch/arm/mach-exynos/mct.c +3
-0+if (of_have_populated_dt ()) { + if (of_machine_is_compatible("samsung,exynos4210") || + of_machine_is_compatible("samsung,exynos4212") ||
arch/arm/mach-exynos/mct.c static void __init exynos4_timer_init(void) · line 538
Quoted 10 lines
arch/arm/mach-exynos/mct.c +10
-0+ of_machine_is_compatible("samsung,exynos4412")) + exynos4_clk_init(); + }else { +if (soc_is_exynos4210 () ||soc_is_exynos4212 () || +soc_is_exynos4412 ()) { +exynos4_clk_init (); + } + } +#endif +
I don't like the idea of initializing the clocks from timer initialization. What about some platforms where MCT isn't used? It is also far from being elegant.
Best regards,
Tomasz Figa
PATCH v3 4/11 ARM: Exynos4: Migrate clock support to common clock framework
Quoted 62 lines · Tomasz Figa
Quoted 30 lines · On Thursday 15 of November 2012 03:37:26 Thomas Abraham wrote:
Remove Samsung specific clock support in Exynos4 and migrate to use common clock framework.
Cc Kukjin Kim <[email protected]>Signed-off-by Thomas Abraham <[email protected]>--- arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-exynos/Makefile | 3 - arch/arm/mach-exynos/clock-exynos4.c | 1602 ---------------------------- arch/arm/mach-exynos/clock-exynos4.h | 35 - arch/arm/mach-exynos/clock-exynos4210.c | 188 ---- arch/arm/mach-exynos/clock-exynos4212.c | 192 ---- arch/arm/mach-exynos/common.c | 22 +- arch/arm/mach-exynos/common.h | 3 + arch/arm/mach-exynos/mach-armlex4210.c | 1 - arch/arm/mach-exynos/mach-exynos4-dt.c | 1 - arch/arm/mach-exynos/mach-nuri.c | 1 - arch/arm/mach-exynos/mach-origen.c | 1 - arch/arm/mach-exynos/mach-smdk4x12.c | 1 - arch/arm/mach-exynos/mach-smdkv310.c | 1 - arch/arm/mach-exynos/mach-universal_c210.c | 1 - arch/arm/mach-exynos/mct.c | 19 + arch/arm/plat-samsung/Kconfig | 4 +- 17 files changed, 27 insertions(+), 2049 deletions(-) delete mode 100644 arch/arm/mach-exynos/clock-exynos4.c delete mode 100644 arch/arm/mach-exynos/clock-exynos4.h delete mode 100644 arch/arm/mach-exynos/clock-exynos4210.c delete mode 100644 arch/arm/mach-exynos/clock-exynos4212.c[snip]
Quoted 30 lines
arch/arm/mach-exynos/mct.c +4
-0@@ -31,6 +31,7 @@#include <mach/map.h> #include <mach/irqs.h> #include <asm/mach/time.h> +#include "common.h" #define EXYNOS4_MCTREG (x) (x)#define EXYNOS4_MCT_G_CNT_L EXYNOS4_MCTREG(0x100)@@ -517,6 +518,24 @@ static void __init exynos4_timer_init(void)struct device_node *np;u32 nr_irqs, i; +#ifdef CONFIG_COMMON_CLK +/* +* Clock lookup should be functional now since the MCT controller driver + * looks up clocks. So the clock initialization is initiated
here. + */arch/arm/mach-exynos/mct.c +9
-0+if (of_have_populated_dt ()) { +if (of_machine_is_compatible ("samsung,exynos4210" ) || +of_machine_is_compatible ("samsung,exynos4212" ) || +of_machine_is_compatible ("samsung,exynos4412" )) +exynos4_clk_init (); + }else { +if (soc_is_exynos4210 () ||soc_is_exynos4212 () || +soc_is_exynos4412 ()) { +exynos4_clk_init ();
Quoted 8 lines
arch/arm/mach-exynos/mct.c static void __init exynos4_timer_init(void) · line 538
Quoted 4 lines
arch/arm/mach-exynos/mct.c +4
-0+ } + } +#endif +I don't like the idea of initializing the clocks from timer initialization. What about some platforms where MCT isn't used? It is also far from being elegant.
Very true, I did also prefer not do this. But, clock lookup should be functional atleast by the time mct initialization begins. So I tried few options such as adding .early_init_call callback in MACHINE_DESC which then can call exynos4_clk_init, but that did not help since mem_init isn't complete by then and memory allocation failed during clock registration. Other methods also did not help much. If you know of a solution to get around this, could you please let me know.
Thanks,
Thomas.
PATCH v3 4/11 ARM: Exynos4: Migrate clock support to common clock framework
Quoted 83 lines · On Thursday 15 of November 2012 14:43:21 Thomas Abraham wrote:
Quoted 73 lines · Tomasz Figa
Quoted 33 lines · On Thursday 15 of November 2012 03:37:26 Thomas Abraham wrote:
Remove Samsung specific clock support in Exynos4 and migrate to use common clock framework.
Cc Kukjin Kim <[email protected]>Signed-off-by Thomas Abraham <[email protected]>---
arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-exynos/Makefile | 3 - arch/arm/mach-exynos/clock-exynos4.c | 1602----------------------------
arch/arm/mach-exynos/clock-exynos4.h| 35 -
arch/arm/mach-exynos/clock-exynos4210.c | 188 ---- arch/arm/mach-exynos/clock-exynos4212.c | 192 ---- arch/arm/mach-exynos/common.c | 22 +- arch/arm/mach-exynos/common.h | 3 + arch/arm/mach-exynos/mach-armlex4210.c | 1 - arch/arm/mach-exynos/mach-exynos4-dt.c | 1 - arch/arm/mach-exynos/mach-nuri.c | 1 - arch/arm/mach-exynos/mach-origen.c | 1 - arch/arm/mach-exynos/mach-smdk4x12.c | 1 - arch/arm/mach-exynos/mach-smdkv310.c | 1 - arch/arm/mach-exynos/mach-universal_c210.c | 1 - arch/arm/mach-exynos/mct.c | 19 + arch/arm/plat-samsung/Kconfig | 4 +- 17 files changed, 27 insertions(+), 2049 deletions(-) delete mode 100644 arch/arm/mach-exynos/clock-exynos4.c delete mode 100644 arch/arm/mach-exynos/clock-exynos4.h delete mode 100644 arch/arm/mach-exynos/clock-exynos4210.c delete mode 100644 arch/arm/mach-exynos/clock-exynos4212.c[snip]
Quoted 36 lines
arch/arm/mach-exynos/mct.c +1
-0@@ -31,6 +31,7 @@#include <mach/map.h> #include <mach/irqs.h> #include <asm/mach/time.h> +#include "common.h" #define
EXYNOS4_MCTREG(x)(x)
#defineEXYNOS4_MCT_G_CNT_LEXYNOS4_MCTREG(0x100)arch/arm/mach-exynos/mct.c +3
-0@@ -517,6 +518,24 @@ static void __init exynos4_timer_init(void)struct device_node *np;u32 nr_irqs, i; +#ifdef CONFIG_COMMON_CLK +/* +* Clock lookup should be functional now since the MCT controller
driver + * looks up clocks. So the clock initialization is
initiated here. + */arch/arm/mach-exynos/mct.c +3
-0+if (of_have_populated_dt ()) { +if (of_machine_is_compatible ("samsung,exynos4210" ) || + of_machine_is_compatible("samsung,exynos4212")|| + of_machine_is_compatible("samsung,exynos4412")) +
exynos4_clk_init();arch/arm/mach-exynos/mct.c +4
-0+ }else { +if (soc_is_exynos4210 () ||soc_is_exynos4212 () || +soc_is_exynos4412 ()) { +exynos4_clk_init ();Quoted 8 lines
arch/arm/mach-exynos/mct.c static void __init exynos4_timer_init(void) · line 538
Quoted 4 lines
arch/arm/mach-exynos/mct.c +4
-0+ } + } +#endif +I don't like the idea of initializing the clocks from timer initialization. What about some platforms where MCT isn't used? It is also far from being elegant.
Quoted 7 lines
Very true, I did also prefer not do this. But, clock lookup should be functional atleast by the time mct initialization begins. So I tried few options such as adding .early_init_call callback in
MACHINE_DESCwhich then can callexynos4_clk_init, but that did not help sincemem_initisn't complete by then and memory allocation failed during clock registration. Other methods also did not help much. If you know of a solution to get around this, could you please let me know.
This is somehow similar to the problem with mapping SYSRAM_NS for Exynos secure firmware. Currently it must be mapped statically using io_table, because ioremap does not work early enough. I guess this kind of approach might be also enough for clocks, until io mem mapping becomes accessible early enough, but someone else should also comment this.
Best regards,
Signature · 3 lines
Tomasz Figa Samsung Poland R&D Center SW Solution Development, Linux Platform
PATCH v3 5/11 ARM: dts: add exynos4 clock controller nodes
In reply to Thomas AbrahamAdd clock controller nodes for Exynos4210 and Exynos4x12 SoC's.
--- arch/arm/boot/dts/exynos4210.dtsi | 6 ++++++ arch/arm/boot/dts/exynos4x12.dtsi | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-)
arch/arm/boot/dts/exynos4210.dtsi +6 -0
@@ -50,6 +50,12 @@ samsung,mct-nr-local-irqs = <4>; }; + clock: clock-controller at 0x10030000 { + compatible = "samsung,exynos4210-clock"; + reg = <0x10030000 0x20000>; + #clock-cells = <1>; + }; + pinctrl_0: pinctrl at 11400000 { compatible = "samsung,pinctrl-exynos4210"; reg = <0x11400000 0x1000>;
arch/arm/boot/dts/exynos4x12.dtsi +6 -0
@@ -35,6 +35,12 @@ <0 16 0>, <0 17 0>, <0 18 0>, <0 19 0>; }; + clock: clock-controller at 0x10030000 { + compatible = "samsung,exynos4412-clock"; + reg = <0x10030000 0x20000>; + #clock-cells = <1>; + }; + pinctrl_0: pinctrl at 11400000 { compatible = "samsung,pinctrl-exynos4x12"; reg = <0x11400000 0x1000>;
Signature · 1 line
1.7.4.4
PATCH v3 5/11 ARM: dts: add exynos4 clock controller nodes
Quoted 31 lines · On Thursday 15 of November 2012 03:37:27 Thomas Abraham wrote:
Add clock controller nodes for Exynos4210 and Exynos4x12 SoC's.
Cc Kukjin Kim <[email protected]>Signed-off-by Thomas Abraham <[email protected]>--- arch/arm/boot/dts/exynos4210.dtsi | 6 ++++++ arch/arm/boot/dts/exynos4x12.dtsi | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-)(quoted diff) +0
-0
b/arch/arm/boot/dts/exynos4210.dtsiindex d6fc306..f7daa09 100644arch/arm/boot/dts/exynos4210.dtsi +6
-0@@ -50,6 +50,12 @@ samsung,mct-nr-local-irqs = <4>; }; + clock: clock-controller at 0x10030000 { + compatible = "samsung,exynos4210-clock"; + reg = <0x10030000 0x20000>; + #clock-cells = <1>; + }; + pinctrl_0: pinctrl at 11400000 { compatible = "samsung,pinctrl-exynos4210"; reg = <0x11400000 0x1000>;(quoted diff) +0
-0
b/arch/arm/boot/dts/exynos4x12.dtsiindex 7cbbd19..bcfdaac 100644
arch/arm/boot/dts/exynos4x12.dtsi line 39
Quoted 5 lines
arch/arm/boot/dts/exynos4x12.dtsi +2
-0@@ -35,6 +35,12 @@ <0 16 0>, <0 17 0>, <0 18 0>, <0 19 0>; }; + clock: clock-controller at 0x10030000 { + compatible = "samsung,exynos4412-clock";
nitpick: I forgot to mention about it in my comments for patch 3, but wouldn't it be better to call it "samsung,exynos4x12-clock"?
arch/arm/boot/dts/exynos4x12.dtsi line 46
Quoted 7 lines
arch/arm/boot/dts/exynos4x12.dtsi +4
-0+ reg = <0x10030000 0x20000>; + #clock-cells = <1>; + }; + pinctrl_0: pinctrl at 11400000 { compatible = "samsung,pinctrl-exynos4x12"; reg = <0x11400000 0x1000>;
Otherwise looks fine.
Best regards,
Tomasz Figa
PATCH v3 5/11 ARM: dts: add exynos4 clock controller nodes
Quoted 35 lines · Tomasz Figa
Quoted 34 lines · On Thursday 15 of November 2012 03:37:27 Thomas Abraham wrote:
Add clock controller nodes for Exynos4210 and Exynos4x12 SoC's.
Cc Kukjin Kim <[email protected]>Signed-off-by Thomas Abraham <[email protected]>--- arch/arm/boot/dts/exynos4210.dtsi | 6 ++++++ arch/arm/boot/dts/exynos4x12.dtsi | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-)(quoted diff) +0
-0
b/arch/arm/boot/dts/exynos4210.dtsiindex d6fc306..f7daa09 100644arch/arm/boot/dts/exynos4210.dtsi +6
-0@@ -50,6 +50,12 @@ samsung,mct-nr-local-irqs = <4>; }; + clock: clock-controller at 0x10030000 { + compatible = "samsung,exynos4210-clock"; + reg = <0x10030000 0x20000>; + #clock-cells = <1>; + }; + pinctrl_0: pinctrl at 11400000 { compatible = "samsung,pinctrl-exynos4210"; reg = <0x11400000 0x1000>;(quoted diff) +0
-0
b/arch/arm/boot/dts/exynos4x12.dtsiindex 7cbbd19..bcfdaac 100644arch/arm/boot/dts/exynos4x12.dtsi +0
-0@@ -35,6 +35,12 @@ <0 16 0>, <0 17 0>, <0 18 0>, <0 19 0>; };
Quoted 5 lines
arch/arm/boot/dts/exynos4x12.dtsi line 39
Quoted 2 lines
arch/arm/boot/dts/exynos4x12.dtsi +2
-0+ clock: clock-controller at 0x10030000 { + compatible = "samsung,exynos4412-clock";nitpick: I forgot to mention about it in my comments for patch 3, but wouldn't it be better to call it "samsung,exynos4x12-clock"?
I prefer to use a specific version for compatible strings. I remember that there have been discussion in the past on this, but I belong to the camp which favors using fixed compatible values over wildcards in compatible values. It is easier to track and less problematic in case a new Exynos4x12 SoC comes up with altogether a different clock architecture. We have used this method for wdt, rtc, i2c and many other drivers and it has proven to be suit well. For instance, for i2c, we have two variants - s3c2410 and s3c2440 and we can use this most of all the Samsung SoCs.
Quoted 10 lines
arch/arm/boot/dts/exynos4x12.dtsi line 46
Quoted 8 lines
arch/arm/boot/dts/exynos4x12.dtsi +4
-0+ reg = <0x10030000 0x20000>; + #clock-cells = <1>; + }; + pinctrl_0: pinctrl at 11400000 { compatible = "samsung,pinctrl-exynos4x12"; reg = <0x11400000 0x1000>;Otherwise looks fine.
Thanks,
Thomas.
PATCH v3 6/11 ARM: dts: add xxti and xusbxti fixed rate clock nodes for exynos4 based platforms
In reply to Thomas AbrahamThe clock frequency of xxti and xusbxti clocks is dependent on the frequency of the on-board oscillator that is used to generate these clocks. So allow the frequency of these clocks to be specfied from device tree.
--- arch/arm/boot/dts/exynos4210-origen.dts | 12 ++++++++++++ arch/arm/boot/dts/exynos4210-smdkv310.dts | 12 ++++++++++++ arch/arm/boot/dts/exynos4412-smdk4412.dts | 12 ++++++++++++ 3 files changed, 36 insertions(+), 0 deletions(-)
arch/arm/boot/dts/exynos4210-origen.dts +12 -0
@@ -121,4 +121,16 @@ linux,default-trigger = "heartbeat"; }; }; + + fixed-rate-clocks { + xxti { + compatible = "samsung,clock-xxti", "fixed-clock"; + clock-frequency = <0>; + }; + + xusbxti { + compatible = "samsung,clock-xusbxti", "fixed-clock"; + clock-frequency = <24000000>; + }; + }; };
arch/arm/boot/dts/exynos4210-smdkv310.dts +12 -0
@@ -189,4 +189,16 @@ }; }; }; + + fixed-rate-clocks { + xxti { + compatible = "samsung,clock-xxti", "fixed-clock"; + clock-frequency = <12000000>; + }; + + xusbxti { + compatible = "samsung,clock-xusbxti", "fixed-clock"; + clock-frequency = <24000000>; + }; + }; };
arch/arm/boot/dts/exynos4412-smdk4412.dts +12 -0
@@ -42,4 +42,16 @@ serial at 13830000 { status = "okay"; }; + + fixed-rate-clocks { + xxti { + compatible = "samsung,clock-xxti", "fixed-clock"; + clock-frequency = <0>; + }; + + xusbxti { + compatible = "samsung,clock-xusbxti", "fixed-clock"; + clock-frequency = <24000000>; + }; + }; };
Signature · 1 line
1.7.4.4
PATCH v3 7/11 ARM: Exynos4: allow legacy board support to specify xxti and xusbxti clock speed
In reply to Thomas AbrahamThe clock speed of xxti and xusbxti clocks depends on the oscillator used on the board to generate these clocks. For non-dt platforms, allow the board support for those platforms to set the clock frequency of xxti and xusbxti clocks.
--- arch/arm/mach-exynos/common.c | 2 ++ arch/arm/mach-exynos/common.h | 1 + arch/arm/mach-exynos/mach-nuri.c | 2 ++ arch/arm/mach-exynos/mach-origen.c | 2 ++ arch/arm/mach-exynos/mach-smdkv310.c | 2 ++ arch/arm/mach-exynos/mach-universal_c210.c | 2 ++ arch/arm/mach-exynos/mct.c | 1 + 7 files changed, 12 insertions(+), 0 deletions(-)
arch/arm/mach-exynos/common.c +2 -0
@@ -65,6 +65,8 @@ static void exynos5_init_clocks(int xtal);static void exynos4_init_uarts (struct s3c2410_uartcfg *cfg,int no);static int exynos_init (void ); +unsigned long xxti_f =0 , xusbxti_f =0 ; +static struct cpu_table cpu_ids[]__initdata = { { .idcode =EXYNOS4210_CPU_ID ,
arch/arm/mach-exynos/common.h +1 -0
@@ -22,6 +22,7 @@ void exynos4_restart(char mode, const char *cmd);void exynos5_restart (char mode,const char *cmd);void exynos_init_late (void ); +extern unsigned long xxti_f, xusbxti_f;void exynos4_clk_init (void );void exynos4_clk_register_fixed_ext (unsigned long ,unsigned long );
arch/arm/mach-exynos/mach-nuri.c +2 -0
@@ -1332,6 +1332,8 @@ static void __init nuri_map_io(void) {exynos_init_io (NULL ,0 );s3c24xx_init_uarts (nuri_uartcfgs,ARRAY_SIZE (nuri_uartcfgs)); + xxti_f =0 ; + xusbxti_f =24000000 ; }static void __init nuri_reserve (void )
arch/arm/mach-exynos/mach-origen.c +2 -0
@@ -754,6 +754,8 @@ static void __init origen_map_io(void) {exynos_init_io (NULL ,0 );s3c24xx_init_uarts (origen_uartcfgs,ARRAY_SIZE (origen_uartcfgs)); + xxti_f =0 ; + xusbxti_f =24000000 ; }static void __init origen_power_init (void )
arch/arm/mach-exynos/mach-smdkv310.c +2 -0
@@ -374,6 +374,8 @@ static void __init smdkv310_map_io(void) {exynos_init_io (NULL ,0 );s3c24xx_init_uarts (smdkv310_uartcfgs,ARRAY_SIZE (smdkv310_uartcfgs)); + xxti_f =12000000 ; + xusbxti_f =24000000 ; }static void __init smdkv310_reserve (void )
arch/arm/mach-exynos/mach-universal_c210.c +2 -0
@@ -1095,6 +1095,8 @@ static void __init universal_map_io(void)exynos_init_io (NULL ,0 );s3c24xx_init_uarts (universal_uartcfgs,ARRAY_SIZE (universal_uartcfgs));s5p_set_timer_source (S5P_PWM2 ,S5P_PWM4 ); + xxti_f =0 ; + xusbxti_f =24000000 ; }static void s5p_tv_setup (void )
arch/arm/mach-exynos/mct.c +1 -0
@@ -532,6 +532,7 @@ static void __init exynos4_timer_init(void)if (soc_is_exynos4210 () ||soc_is_exynos4212 () ||soc_is_exynos4412 ()) {exynos4_clk_init (); +exynos4_clk_register_fixed_ext (xxti_f, xusbxti_f); } }#endif
Signature · 1 line
1.7.4.4
PATCH v3 7/11 ARM: Exynos4: allow legacy board support to specify xxti and xusbxti clock speed
Quoted 47 lines · On Thursday 15 of November 2012 03:37:29 Thomas Abraham wrote:
The clock speed of xxti and xusbxti clocks depends on the oscillator used on the board to generate these clocks. For non-dt platforms, allow the board support for those platforms to set the clock frequency of xxti and xusbxti clocks.
Cc Kukjin Kim <[email protected]>Signed-off-by Thomas Abraham <[email protected]>--- arch/arm/mach-exynos/common.c | 2 ++ arch/arm/mach-exynos/common.h | 1 + arch/arm/mach-exynos/mach-nuri.c | 2 ++ arch/arm/mach-exynos/mach-origen.c | 2 ++ arch/arm/mach-exynos/mach-smdkv310.c | 2 ++ arch/arm/mach-exynos/mach-universal_c210.c | 2 ++ arch/arm/mach-exynos/mct.c | 1 + 7 files changed, 12 insertions(+), 0 deletions(-)(quoted diff) +0
-0
b/arch/arm/mach-exynos/common.cindex 138a41d..64c0012 100644arch/arm/mach-exynos/common.c +2
-0@@ -65,6 +65,8 @@ static void exynos5_init_clocks(int xtal);static void exynos4_init_uarts (struct s3c2410_uartcfg *cfg,int no);static int exynos_init (void ); +unsigned long xxti_f =0 , xusbxti_f =0 ; +static struct cpu_table cpu_ids[]__initdata = { { .idcode =EXYNOS4210_CPU_ID ,(quoted diff) +0
-0
b/arch/arm/mach-exynos/common.hindex 2cacd48..f947789 100644arch/arm/mach-exynos/common.h +1
-0@@ -22,6 +22,7 @@ void exynos4_restart(char mode, const char *cmd);void exynos5_restart (char mode,const char *cmd);void exynos_init_late (void ); +extern unsigned long xxti_f, xusbxti_f;void exynos4_clk_init (void );void exynos4_clk_register_fixed_ext (unsigned long ,unsigned long );(quoted diff) +0
-0
b/arch/arm/mach-exynos/mach-nuri.cindex 5b5c941..e14332c 100644
arch/arm/mach-exynos/mach-nuri.c static void __init nuri_map_io(void) · line 1336
Quoted 5 lines
arch/arm/mach-exynos/mach-nuri.c +2
-0@@ -1332,6 +1332,8 @@ static void __init nuri_map_io(void) {exynos_init_io (NULL ,0 );s3c24xx_init_uarts (nuri_uartcfgs,ARRAY_SIZE (nuri_uartcfgs)); + xxti_f =0 ; + xusbxti_f =24000000 ;
I don't like setting these variables directly from board code.
If you didn't remove clock initialization call from board code, you could extend that function to take these two frequencies as arguments?
Quoted 3 lines
arch/arm/mach-exynos/mach-nuri.c +0
-0}static void __init nuri_reserve (void )
[snip]
arch/arm/mach-exynos/mct.c static void __init exynos4_timer_init(void) · line 535
Quoted 9 lines
arch/arm/mach-exynos/mct.c +1
-0@@ -532,6 +532,7 @@ static void __init exynos4_timer_init(void)if (soc_is_exynos4210 () ||soc_is_exynos4212 () ||soc_is_exynos4412 ()) {exynos4_clk_init (); +exynos4_clk_register_fixed_ext (xxti_f, xusbxti_f);
I don't like registering clocks from unrelated code. IMHO any clock registration should be done from code in drivers/clk/samsung.
Best regards,
Tomasz Figa
PATCH v3 7/11 ARM: Exynos4: allow legacy board support to specify xxti and xusbxti clock speed
Quoted 56 lines · Tomasz Figa
Quoted 47 lines · On Thursday 15 of November 2012 03:37:29 Thomas Abraham wrote:
The clock speed of xxti and xusbxti clocks depends on the oscillator used on the board to generate these clocks. For non-dt platforms, allow the board support for those platforms to set the clock frequency of xxti and xusbxti clocks.
Cc Kukjin Kim <[email protected]>Signed-off-by Thomas Abraham <[email protected]>--- arch/arm/mach-exynos/common.c | 2 ++ arch/arm/mach-exynos/common.h | 1 + arch/arm/mach-exynos/mach-nuri.c | 2 ++ arch/arm/mach-exynos/mach-origen.c | 2 ++ arch/arm/mach-exynos/mach-smdkv310.c | 2 ++ arch/arm/mach-exynos/mach-universal_c210.c | 2 ++ arch/arm/mach-exynos/mct.c | 1 + 7 files changed, 12 insertions(+), 0 deletions(-)(quoted diff) +0
-0
b/arch/arm/mach-exynos/common.cindex 138a41d..64c0012 100644arch/arm/mach-exynos/common.c +2
-0@@ -65,6 +65,8 @@ static void exynos5_init_clocks(int xtal);static void exynos4_init_uarts (struct s3c2410_uartcfg *cfg,int no);static int exynos_init (void ); +unsigned long xxti_f =0 , xusbxti_f =0 ; +static struct cpu_table cpu_ids[]__initdata = { { .idcode =EXYNOS4210_CPU_ID ,(quoted diff) +0
-0
b/arch/arm/mach-exynos/common.hindex 2cacd48..f947789 100644arch/arm/mach-exynos/common.h +1
-0@@ -22,6 +22,7 @@ void exynos4_restart(char mode, const char *cmd);void exynos5_restart (char mode,const char *cmd);void exynos_init_late (void ); +extern unsigned long xxti_f, xusbxti_f;void exynos4_clk_init (void );void exynos4_clk_register_fixed_ext (unsigned long ,unsigned long );(quoted diff) +0
-0
b/arch/arm/mach-exynos/mach-nuri.cindex 5b5c941..e14332c 100644arch/arm/mach-exynos/mach-nuri.c static void __init nuri_map_io(void) · line 1336
Quoted 5 lines
arch/arm/mach-exynos/mach-nuri.c +2
-0@@ -1332,6 +1332,8 @@ static void __init nuri_map_io(void) {exynos_init_io (NULL ,0 );s3c24xx_init_uarts (nuri_uartcfgs,ARRAY_SIZE (nuri_uartcfgs)); + xxti_f =0 ; + xusbxti_f =24000000 ;I don't like setting these variables directly from board code.
Quoted 2 lines
If you didn't remove clock initialization call from board code, you could extend that function to take these two frequencies as arguments?
Right, but I was not in favour of changing the s3c24xx_init_clocks() api since that would mean all board code calling this will require updates. So I was contemplating of adding a new exynos4 specific api. But then did not opt for it, knowing very well that it is just a matter of time before we add dt support to existing non-dt exynos4 board files. So just to keep things functional for now, and not add to much of non-dt stuff, I did this.
Quoted 5 lines
Quoted 4 lines
arch/arm/mach-exynos/mach-nuri.c +0
-0}static void __init nuri_reserve (void )[snip]
Quoted 12 lines
arch/arm/mach-exynos/mct.c static void __init exynos4_timer_init(void) · line 535
Quoted 9 lines
arch/arm/mach-exynos/mct.c +1
-0@@ -532,6 +532,7 @@ static void __init exynos4_timer_init(void)if (soc_is_exynos4210 () ||soc_is_exynos4212 () ||soc_is_exynos4412 ()) {exynos4_clk_init (); +exynos4_clk_register_fixed_ext (xxti_f, xusbxti_f);I don't like registering clocks from unrelated code. IMHO any clock registration should be done from code in
drivers/clk/samsung.
Ok. I will check for other alternatives.
Thanks,
Thomas.
PATCH v3 8/11 ARM: dts: add clock provider information for all controllers in Exynos4 SoC
In reply to Thomas AbrahamFor all supported peripheral controllers on Exynos4, add clock lookup information.
--- arch/arm/boot/dts/exynos4.dtsi | 48 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-)
arch/arm/boot/dts/exynos4.dtsi +48 -0
@@ -53,6 +53,8 @@ compatible = "samsung,s3c2410-wdt"; reg = <0x10060000 0x100>; interrupts = <0 43 0>; + clocks = <&clock 345>; + clock-names = "watchdog"; status = "disabled"; };
@@ -60,6 +62,8 @@ compatible = "samsung,s3c6410-rtc"; reg = <0x10070000 0x100>; interrupts = <0 44 0>, <0 45 0>; + clocks = <&clock 346>; + clock-names = "rtc"; status = "disabled"; };
@@ -67,6 +71,8 @@ compatible = "samsung,s5pv210-keypad"; reg = <0x100A0000 0x100>; interrupts = <0 109 0>; + clocks = <&clock 347>; + clock-names = "keypad"; status = "disabled"; };
@@ -74,6 +80,8 @@ compatible = "samsung,exynos4210-sdhci"; reg = <0x12510000 0x100>; interrupts = <0 73 0>; + clocks = <&clock 297>, <&clock 145>; + clock-names = "hsmmc", "mmc_busclk.2"; status = "disabled"; };
@@ -81,6 +89,8 @@ compatible = "samsung,exynos4210-sdhci"; reg = <0x12520000 0x100>; interrupts = <0 74 0>; + clocks = <&clock 298>, <&clock 146>; + clock-names = "hsmmc", "mmc_busclk.2"; status = "disabled"; };
@@ -88,6 +98,8 @@ compatible = "samsung,exynos4210-sdhci"; reg = <0x12530000 0x100>; interrupts = <0 75 0>; + clocks = <&clock 299>, <&clock 147>; + clock-names = "hsmmc", "mmc_busclk.2"; status = "disabled"; };
@@ -95,6 +107,8 @@ compatible = "samsung,exynos4210-sdhci"; reg = <0x12540000 0x100>; interrupts = <0 76 0>; + clocks = <&clock 300>, <&clock 148>; + clock-names = "hsmmc", "mmc_busclk.2"; status = "disabled"; };
@@ -102,6 +116,8 @@ compatible = "samsung,exynos4210-uart"; reg = <0x13800000 0x100>; interrupts = <0 52 0>; + clocks = <&clock 312>, <&clock 151>; + clock-names = "uart", "clk_uart_baud0"; status = "disabled"; };
@@ -109,6 +125,8 @@ compatible = "samsung,exynos4210-uart"; reg = <0x13810000 0x100>; interrupts = <0 53 0>; + clocks = <&clock 313>, <&clock 152>; + clock-names = "uart", "clk_uart_baud0"; status = "disabled"; };
@@ -116,6 +134,8 @@ compatible = "samsung,exynos4210-uart"; reg = <0x13820000 0x100>; interrupts = <0 54 0>; + clocks = <&clock 314>, <&clock 153>; + clock-names = "uart", "clk_uart_baud0"; status = "disabled"; };
@@ -123,6 +143,8 @@ compatible = "samsung,exynos4210-uart"; reg = <0x13830000 0x100>; interrupts = <0 55 0>; + clocks = <&clock 315>, <&clock 154>; + clock-names = "uart", "clk_uart_baud0"; status = "disabled"; };
@@ -132,6 +154,8 @@ compatible = "samsung,s3c2440-i2c"; reg = <0x13860000 0x100>; interrupts = <0 58 0>; + clocks = <&clock 317>; + clock-names = "i2c"; status = "disabled"; };
@@ -141,6 +165,8 @@ compatible = "samsung,s3c2440-i2c"; reg = <0x13870000 0x100>; interrupts = <0 59 0>; + clocks = <&clock 318>; + clock-names = "i2c"; status = "disabled"; };
@@ -150,6 +176,8 @@ compatible = "samsung,s3c2440-i2c"; reg = <0x13880000 0x100>; interrupts = <0 60 0>; + clocks = <&clock 319>; + clock-names = "i2c"; status = "disabled"; };
@@ -159,6 +187,8 @@ compatible = "samsung,s3c2440-i2c"; reg = <0x13890000 0x100>; interrupts = <0 61 0>; + clocks = <&clock 320>; + clock-names = "i2c"; status = "disabled"; };
@@ -168,6 +198,8 @@ compatible = "samsung,s3c2440-i2c"; reg = <0x138A0000 0x100>; interrupts = <0 62 0>; + clocks = <&clock 321>; + clock-names = "i2c"; status = "disabled"; };
@@ -177,6 +209,8 @@ compatible = "samsung,s3c2440-i2c"; reg = <0x138B0000 0x100>; interrupts = <0 63 0>; + clocks = <&clock 322>; + clock-names = "i2c"; status = "disabled"; };
@@ -186,6 +220,8 @@ compatible = "samsung,s3c2440-i2c"; reg = <0x138C0000 0x100>; interrupts = <0 64 0>; + clocks = <&clock 323>; + clock-names = "i2c"; status = "disabled"; };
@@ -195,6 +231,8 @@ compatible = "samsung,s3c2440-i2c"; reg = <0x138D0000 0x100>; interrupts = <0 65 0>; + clocks = <&clock 324>; + clock-names = "i2c"; status = "disabled"; };
@@ -206,6 +244,8 @@ rx-dma-channel = <&pdma0 6>; /* preliminary */ #address-cells = <1>; #size-cells = <0>; + clocks = <&clock 327>, <&clock 159>; + clock-names = "spi", "spi_busclk0"; status = "disabled"; };
@@ -217,6 +257,8 @@ rx-dma-channel = <&pdma1 6>; /* preliminary */ #address-cells = <1>; #size-cells = <0>; + clocks = <&clock 328>, <&clock 160>; + clock-names = "spi", "spi_busclk0"; status = "disabled"; };
@@ -228,6 +270,8 @@ rx-dma-channel = <&pdma0 8>; /* preliminary */ #address-cells = <1>; #size-cells = <0>; + clocks = <&clock 329>, <&clock 161>; + clock-names = "spi", "spi_busclk0"; status = "disabled"; };
@@ -242,12 +286,16 @@ compatible = "arm,pl330", "arm,primecell"; reg = <0x12680000 0x1000>; interrupts = <0 35 0>; + clocks = <&clock 292>; + clock-names = "apb_pclk"; }; pdma1: pdma at 12690000 { compatible = "arm,pl330", "arm,primecell"; reg = <0x12690000 0x1000>; interrupts = <0 36 0>; + clocks = <&clock 293>; + clock-names = "apb_pclk"; }; }; };
Signature · 1 line
1.7.4.4
PATCH v3 9/11 ARM: Exynos4: remove auxdata table from machine file
In reply to Thomas AbrahamWith support for device tree based clock lookup now available, remove the auxdata table from exynos4 dt-enabled machine file.
--- arch/arm/mach-exynos/mach-exynos4-dt.c | 68 +------------------------------- 1 files changed, 2 insertions(+), 66 deletions(-)
arch/arm/mach-exynos/mach-exynos4-dt.c +2 -66
@@ -11,77 +11,14 @@* published by the Free Software Foundation. */ +#include <linux/kernel.h> #include <linux/of_platform.h> -#include <linux/serial_core.h> #include <asm/mach/arch.h> #include <asm/hardware/gic.h> -#include <mach/map.h> - -#include <plat/cpu.h> -#include <plat/regs-serial.h> #include "common.h" -/* -* The following lookup table is used to override device names when devices -* are registered from device tree. This is temporarily added to enable -* device tree support addition for the Exynos4 architecture. -* -* For drivers that require platform data to be provided from the machine -* file, a platform data pointer can also be supplied along with the -* devices names. Usually, the platform data elements that cannot be parsed -* from the device tree by the drivers (example: function pointers) are -* supplied. But it should be noted that this is a temporary mechanism and -* at some point, the drivers should be capable of parsing all the platform -* data from the device tree. -*/ -static const struct of_dev_auxdata exynos4_auxdata_lookup[]__initconst = { -OF_DEV_AUXDATA ("samsung,exynos4210-uart" ,EXYNOS4_PA_UART0 , -"exynos4210-uart.0" ,NULL ), -OF_DEV_AUXDATA ("samsung,exynos4210-uart" ,EXYNOS4_PA_UART1 , -"exynos4210-uart.1" ,NULL ), -OF_DEV_AUXDATA ("samsung,exynos4210-uart" ,EXYNOS4_PA_UART2 , -"exynos4210-uart.2" ,NULL ), -OF_DEV_AUXDATA ("samsung,exynos4210-uart" ,EXYNOS4_PA_UART3 , -"exynos4210-uart.3" ,NULL ), -OF_DEV_AUXDATA ("samsung,exynos4210-sdhci" ,EXYNOS4_PA_HSMMC (0 ), -"exynos4-sdhci.0" ,NULL ), -OF_DEV_AUXDATA ("samsung,exynos4210-sdhci" ,EXYNOS4_PA_HSMMC (1 ), -"exynos4-sdhci.1" ,NULL ), -OF_DEV_AUXDATA ("samsung,exynos4210-sdhci" ,EXYNOS4_PA_HSMMC (2 ), -"exynos4-sdhci.2" ,NULL ), -OF_DEV_AUXDATA ("samsung,exynos4210-sdhci" ,EXYNOS4_PA_HSMMC (3 ), -"exynos4-sdhci.3" ,NULL ), -OF_DEV_AUXDATA ("samsung,s3c2440-i2c" ,EXYNOS4_PA_IIC (0 ), -"s3c2440-i2c.0" ,NULL ), -OF_DEV_AUXDATA ("samsung,s3c2440-i2c" ,EXYNOS4_PA_IIC (1 ), -"s3c2440-i2c.1" ,NULL ), -OF_DEV_AUXDATA ("samsung,s3c2440-i2c" ,EXYNOS4_PA_IIC (2 ), -"s3c2440-i2c.2" ,NULL ), -OF_DEV_AUXDATA ("samsung,s3c2440-i2c" ,EXYNOS4_PA_IIC (3 ), -"s3c2440-i2c.3" ,NULL ), -OF_DEV_AUXDATA ("samsung,s3c2440-i2c" ,EXYNOS4_PA_IIC (4 ), -"s3c2440-i2c.4" ,NULL ), -OF_DEV_AUXDATA ("samsung,s3c2440-i2c" ,EXYNOS4_PA_IIC (5 ), -"s3c2440-i2c.5" ,NULL ), -OF_DEV_AUXDATA ("samsung,s3c2440-i2c" ,EXYNOS4_PA_IIC (6 ), -"s3c2440-i2c.6" ,NULL ), -OF_DEV_AUXDATA ("samsung,s3c2440-i2c" ,EXYNOS4_PA_IIC (7 ), -"s3c2440-i2c.7" ,NULL ), -OF_DEV_AUXDATA ("samsung,exynos4210-spi" ,EXYNOS4_PA_SPI0 , -"exynos4210-spi.0" ,NULL ), -OF_DEV_AUXDATA ("samsung,exynos4210-spi" ,EXYNOS4_PA_SPI1 , -"exynos4210-spi.1" ,NULL ), -OF_DEV_AUXDATA ("samsung,exynos4210-spi" ,EXYNOS4_PA_SPI2 , -"exynos4210-spi.2" ,NULL ), -OF_DEV_AUXDATA ("arm,pl330" ,EXYNOS4_PA_PDMA0 ,"dma-pl330.0" ,NULL ), -OF_DEV_AUXDATA ("arm,pl330" ,EXYNOS4_PA_PDMA1 ,"dma-pl330.1" ,NULL ), -OF_DEV_AUXDATA ("samsung,exynos4210-tmu" ,EXYNOS4_PA_TMU , -"exynos-tmu" ,NULL ), - {}, -}; -static void __init exynos4_dt_map_io (void ) {exynos_init_io (NULL ,0 );
@@ -89,8 +26,7 @@ static void __init exynos4_dt_map_io(void)static void __init exynos4_dt_machine_init (void ) { -of_platform_populate (NULL , of_default_bus_match_table, - exynos4_auxdata_lookup,NULL ); +of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); }static char const *exynos4_dt_compat[]__initdata = {
Signature · 1 line
1.7.4.4
PATCH v3 10/11 ARM: Exynos: use fin_pll clock as the tick clock source for mct
In reply to Thomas AbrahamWith the migration of Exynos4 clocks to use common clock framework, the old styled 'xtal' clock is not used anymore. Instead, the clock 'fin_pll' is used as the tick clock for mct controller.
--- arch/arm/mach-exynos/mct.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/mct.c +5 -3
@@ -489,10 +489,12 @@ static struct local_timer_ops exynos4_mct_tick_ops __cpuinitdata = {static void __init exynos4_timer_resources (struct device_node *np) { -struct clk *mct_clk; - mct_clk =clk_get (NULL ,"xtal" ); +struct clk *tick_clk; - clk_rate =clk_get_rate (mct_clk); + tick_clk =clk_get (NULL ,"fin_pll" ); +if (IS_ERR (tick_clk)) +panic ("%s: unable to determine tick clock rate\n" , __func__); + clk_rate =clk_get_rate (tick_clk); reg_base = (np) ?of_iomap (np,0 ) :S5P_VA_SYSTIMER ;if (!reg_base)
Signature · 1 line
1.7.4.4
PATCH v3 11/11 ARM: Exynos: add support for mct clock setup
In reply to Thomas AbrahamAdd support for mct clock lookup and setup to ensure that the mct clock is has been turned on.
--- arch/arm/mach-exynos/mct.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
arch/arm/mach-exynos/mct.c +6 -1
@@ -489,7 +489,12 @@ static struct local_timer_ops exynos4_mct_tick_ops __cpuinitdata = {static void __init exynos4_timer_resources (struct device_node *np) { -struct clk *tick_clk; +struct clk *mct_clk, *tick_clk; + + mct_clk =clk_get (NULL ,"mct" ); +if (IS_ERR (mct_clk)) +panic ("%s: unable to retrieve mct clock instance\n" , __func__); +clk_prepare_enable (mct_clk); tick_clk =clk_get (NULL ,"fin_pll" );if (IS_ERR (tick_clk))
Signature · 1 line
1.7.4.4