Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 342238
b: refs/heads/master
c: d90df97
h: refs/heads/master
v: v3
  • Loading branch information
Shawn Guo committed Nov 16, 2012
1 parent 509ba3e commit 20949dc
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c92503886c9e566708a05f92a99c9c3fe71f4348
refs/heads/master: d90df97863c7838847abd0f144c71db60aa00643
10 changes: 9 additions & 1 deletion trunk/arch/arm/boot/dts/imx6q.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@
compatible = "arm,cortex-a9";
reg = <0>;
next-level-cache = <&L2>;
operating-points = <
/* kHz uV */
792000 1100000
396000 950000
198000 850000
>;
clock-latency = <61036>; /* two CLK32 periods */
cpu0-supply = <&reg_cpu>;
};

cpu@1 {
Expand Down Expand Up @@ -447,7 +455,7 @@
anatop-max-voltage = <2750000>;
};

regulator-vddcore@140 {
reg_cpu: regulator-vddcore@140 {
compatible = "fsl,anatop-regulator";
regulator-name = "cpu";
regulator-min-microvolt = <725000>;
Expand Down
3 changes: 3 additions & 0 deletions trunk/arch/arm/mach-imx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,8 @@ config SOC_IMX53

config SOC_IMX6Q
bool "i.MX6 Quad support"
select ARCH_HAS_CPUFREQ
select ARCH_HAS_OPP
select ARM_CPU_SUSPEND if PM
select ARM_GIC
select COMMON_CLK
Expand All @@ -841,6 +843,7 @@ config SOC_IMX6Q
select MFD_SYSCON
select PINCTRL
select PINCTRL_IMX6Q
select PM_OPP if PM

help
This enables support for Freescale i.MX6 Quad processor.
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-imx/clk-imx6q.c
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,7 @@ int __init mx6q_clocks_init(void)
clk_register_clkdev(clk[cko1_sel], "cko1_sel", NULL);
clk_register_clkdev(clk[ahb], "ahb", NULL);
clk_register_clkdev(clk[cko1], "cko1", NULL);
clk_register_clkdev(clk[arm], NULL, "cpu0");

/*
* The gpmi needs 100MHz frequency in the EDO/Sync mode,
Expand Down

0 comments on commit 20949dc

Please sign in to comment.