Commit 93a17c05 authored by Tang Yuantian's avatar Tang Yuantian Committed by Michael Turquette

clk: ppc-corenet: rename driver to clk-qoriq

Freescale introduced new ARM-based socs which using the compatible
clock IP block with PowerPC-based socs'. So this driver can be used
on both platforms.
Updated relevant descriptions and renamed this driver to better
represent its meaning and keep the function of driver untouched.
Signed-off-by: default avatarTang Yuantian <Yuantian.Tang@freescale.com>
Signed-off-by: default avatarMichael Turquette <mturquette@linaro.org>
parent 57bfd7ee
* Clock Block on Freescale CoreNet Platforms * Clock Block on Freescale QorIQ Platforms
Freescale CoreNet chips take primary clocking input from the external Freescale qoriq chips take primary clocking input from the external
SYSCLK signal. The SYSCLK input (frequency) is multiplied using SYSCLK signal. The SYSCLK input (frequency) is multiplied using
multiple phase locked loops (PLL) to create a variety of frequencies multiple phase locked loops (PLL) to create a variety of frequencies
which can then be passed to a variety of internal logic, including which can then be passed to a variety of internal logic, including
...@@ -29,6 +29,7 @@ Required properties: ...@@ -29,6 +29,7 @@ Required properties:
* "fsl,t4240-clockgen" * "fsl,t4240-clockgen"
* "fsl,b4420-clockgen" * "fsl,b4420-clockgen"
* "fsl,b4860-clockgen" * "fsl,b4860-clockgen"
* "fsl,ls1021a-clockgen"
Chassis clock strings include: Chassis clock strings include:
* "fsl,qoriq-clockgen-1.0": for chassis 1.0 clocks * "fsl,qoriq-clockgen-1.0": for chassis 1.0 clocks
* "fsl,qoriq-clockgen-2.0": for chassis 2.0 clocks * "fsl,qoriq-clockgen-2.0": for chassis 2.0 clocks
......
...@@ -101,12 +101,12 @@ config COMMON_CLK_AXI_CLKGEN ...@@ -101,12 +101,12 @@ config COMMON_CLK_AXI_CLKGEN
Support for the Analog Devices axi-clkgen pcore clock generator for Xilinx Support for the Analog Devices axi-clkgen pcore clock generator for Xilinx
FPGAs. It is commonly used in Analog Devices' reference designs. FPGAs. It is commonly used in Analog Devices' reference designs.
config CLK_PPC_CORENET config CLK_QORIQ
bool "Clock driver for PowerPC corenet platforms" bool "Clock driver for Freescale QorIQ platforms"
depends on PPC_E500MC && OF depends on (PPC_E500MC || ARM) && OF
---help--- ---help---
This adds the clock driver support for Freescale PowerPC corenet This adds the clock driver support for Freescale QorIQ platforms
platforms using common clock framework. using common clock framework.
config COMMON_CLK_XGENE config COMMON_CLK_XGENE
bool "Clock driver for APM XGene SoC" bool "Clock driver for APM XGene SoC"
......
...@@ -31,7 +31,7 @@ obj-$(CONFIG_ARCH_MOXART) += clk-moxart.o ...@@ -31,7 +31,7 @@ obj-$(CONFIG_ARCH_MOXART) += clk-moxart.o
obj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o obj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o
obj-$(CONFIG_ARCH_NSPIRE) += clk-nspire.o obj-$(CONFIG_ARCH_NSPIRE) += clk-nspire.o
obj-$(CONFIG_COMMON_CLK_PALMAS) += clk-palmas.o obj-$(CONFIG_COMMON_CLK_PALMAS) += clk-palmas.o
obj-$(CONFIG_CLK_PPC_CORENET) += clk-ppc-corenet.o obj-$(CONFIG_CLK_QORIQ) += clk-qoriq.o
obj-$(CONFIG_COMMON_CLK_RK808) += clk-rk808.o obj-$(CONFIG_COMMON_CLK_RK808) += clk-rk808.o
obj-$(CONFIG_COMMON_CLK_S2MPS11) += clk-s2mps11.o obj-$(CONFIG_COMMON_CLK_S2MPS11) += clk-s2mps11.o
obj-$(CONFIG_COMMON_CLK_SI5351) += clk-si5351.o obj-$(CONFIG_COMMON_CLK_SI5351) += clk-si5351.o
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
* *
* clock driver for Freescale PowerPC corenet SoCs. * clock driver for Freescale QorIQ SoCs.
*/ */
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
#include <linux/io.h> #include <linux/io.h>
...@@ -166,7 +166,7 @@ static void __init core_pll_init(struct device_node *np) ...@@ -166,7 +166,7 @@ static void __init core_pll_init(struct device_node *np)
base = of_iomap(np, 0); base = of_iomap(np, 0);
if (!base) { if (!base) {
pr_err("clk-ppc: iomap error\n"); pr_err("clk-qoriq: iomap error\n");
return; return;
} }
...@@ -260,7 +260,7 @@ static void __init sysclk_init(struct device_node *node) ...@@ -260,7 +260,7 @@ static void __init sysclk_init(struct device_node *node)
u32 rate; u32 rate;
if (!np) { if (!np) {
pr_err("ppc-clk: could not get parent node\n"); pr_err("qoriq-clk: could not get parent node\n");
return; return;
} }
......
...@@ -26,7 +26,7 @@ config CPU_FREQ_MAPLE ...@@ -26,7 +26,7 @@ config CPU_FREQ_MAPLE
config PPC_CORENET_CPUFREQ config PPC_CORENET_CPUFREQ
tristate "CPU frequency scaling driver for Freescale E500MC SoCs" tristate "CPU frequency scaling driver for Freescale E500MC SoCs"
depends on PPC_E500MC && OF && COMMON_CLK depends on PPC_E500MC && OF && COMMON_CLK
select CLK_PPC_CORENET select CLK_QORIQ
help help
This adds the CPUFreq driver support for Freescale e500mc, This adds the CPUFreq driver support for Freescale e500mc,
e5500 and e6500 series SoCs which are capable of changing e5500 and e6500 series SoCs which are capable of changing
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment