* [PATCHv5] clk: ppc-corenet: rename to qoriq and add CLK_OF_DECLARE support
@ 2014-10-10 9:14 Jingchang Lu
2014-10-14 10:32 ` Jingchang Lu
0 siblings, 1 reply; 3+ messages in thread
From: Jingchang Lu @ 2014-10-10 9:14 UTC (permalink / raw)
To: mturquette
Cc: scottwood, linuxppc-dev, linux-kernel, linux-arm-kernel,
Jingchang Lu
The IP is shared by PPC and ARM, this renames it to qoriq for better
represention, and this also adds the CLK_OF_DECLARE support for being
initialized by of_clk_init() on ARM.
Signed-off-by: Jingchang Lu <jingchang.lu@freescale.com>
---
changes in v5:
update drivers/cpufreq/Kconfig.powerpc to slect the renamed config option.
changes in v4:
remove "corenet" literals omitted in v3 remove.
changes in v3:
generate the patch with -M -C option
changes in v2:
rename the driver name to ppc-qoriq.c for shared on PPC and ARM.
drivers/clk/Kconfig | 10 ++++-----
drivers/clk/Makefile | 2 +-
drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} | 29 +++++++++++++++-----------
drivers/cpufreq/Kconfig.powerpc | 2 +-
4 files changed, 24 insertions(+), 19 deletions(-)
rename drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} (89%)
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 455fd17..4706a9f 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -101,12 +101,12 @@ config COMMON_CLK_AXI_CLKGEN
Support for the Analog Devices axi-clkgen pcore clock generator for Xilinx
FPGAs. It is commonly used in Analog Devices' reference designs.
-config CLK_PPC_CORENET
- bool "Clock driver for PowerPC corenet platforms"
- depends on PPC_E500MC && OF
+config CLK_QORIQ
+ bool "Clock driver for Freescale QorIQ platforms"
+ depends on (PPC_E500MC || ARM) && OF
---help---
- This adds the clock driver support for Freescale PowerPC corenet
- platforms using common clock framework.
+ This adds the clock driver support for Freescale QorIQ platforms
+ using common clock framework.
config COMMON_CLK_XGENE
bool "Clock driver for APM XGene SoC"
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index d5fba5b..4ff94cd 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -30,7 +30,7 @@ obj-$(CONFIG_ARCH_MOXART) += clk-moxart.o
obj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o
obj-$(CONFIG_ARCH_NSPIRE) += clk-nspire.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_S2MPS11) += clk-s2mps11.o
obj-$(CONFIG_COMMON_CLK_SI5351) += clk-si5351.o
diff --git a/drivers/clk/clk-ppc-corenet.c b/drivers/clk/clk-qoriq.c
similarity index 89%
rename from drivers/clk/clk-ppc-corenet.c
rename to drivers/clk/clk-qoriq.c
index 8e58edf..48cb923 100644
--- a/drivers/clk/clk-ppc-corenet.c
+++ b/drivers/clk/clk-qoriq.c
@@ -5,7 +5,7 @@
* it under the terms of the GNU General Public License version 2 as
* 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/io.h>
@@ -155,7 +155,7 @@ static void __init core_pll_init(struct device_node *np)
base = of_iomap(np, 0);
if (!base) {
- pr_err("clk-ppc: iomap error\n");
+ pr_err("clk-qoriq: iomap error\n");
return;
}
@@ -252,7 +252,7 @@ static void __init sysclk_init(struct device_node *node)
u32 rate;
if (!np) {
- pr_err("ppc-clk: could not get parent node\n");
+ pr_err("qoriq-clk: could not get parent node\n");
return;
}
@@ -278,30 +278,35 @@ static const struct of_device_id clk_match[] __initconst = {
{}
};
-static int __init ppc_corenet_clk_probe(struct platform_device *pdev)
+static int __init qoriq_clk_probe(struct platform_device *pdev)
{
of_clk_init(clk_match);
return 0;
}
-static const struct of_device_id ppc_clk_ids[] __initconst = {
+static const struct of_device_id qoriq_clk_ids[] __initconst = {
{ .compatible = "fsl,qoriq-clockgen-1.0", },
{ .compatible = "fsl,qoriq-clockgen-2.0", },
{}
};
-static struct platform_driver ppc_corenet_clk_driver __initdata = {
+static struct platform_driver qoriq_clk_driver __initdata = {
.driver = {
- .name = "ppc_corenet_clock",
+ .name = "qoriq_clock",
.owner = THIS_MODULE,
- .of_match_table = ppc_clk_ids,
+ .of_match_table = qoriq_clk_ids,
},
- .probe = ppc_corenet_clk_probe,
+ .probe = qoriq_clk_probe,
};
-static int __init ppc_corenet_clk_init(void)
+static int __init qoriq_clk_init(void)
{
- return platform_driver_register(&ppc_corenet_clk_driver);
+ return platform_driver_register(&qoriq_clk_driver);
}
-subsys_initcall(ppc_corenet_clk_init);
+subsys_initcall(qoriq_clk_init);
+
+CLK_OF_DECLARE(qoriq_core_pll_v1, "fsl,qoriq-core-pll-1.0", core_pll_init);
+CLK_OF_DECLARE(qoriq_core_pll_v2, "fsl,qoriq-core-pll-2.0", core_pll_init);
+CLK_OF_DECLARE(qoriq_core_mux_v1, "fsl,qoriq-core-mux-1.0", core_mux_init);
+CLK_OF_DECLARE(qoriq_core_mux_v2, "fsl,qoriq-core-mux-2.0", core_mux_init);
diff --git a/drivers/cpufreq/Kconfig.powerpc b/drivers/cpufreq/Kconfig.powerpc
index 72564b7..7ea2441 100644
--- a/drivers/cpufreq/Kconfig.powerpc
+++ b/drivers/cpufreq/Kconfig.powerpc
@@ -26,7 +26,7 @@ config CPU_FREQ_MAPLE
config PPC_CORENET_CPUFREQ
tristate "CPU frequency scaling driver for Freescale E500MC SoCs"
depends on PPC_E500MC && OF && COMMON_CLK
- select CLK_PPC_CORENET
+ select CLK_QORIQ
help
This adds the CPUFreq driver support for Freescale e500mc,
e5500 and e6500 series SoCs which are capable of changing
--
1.8.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCHv5] clk: ppc-corenet: rename to qoriq and add CLK_OF_DECLARE support
2014-10-10 9:14 [PATCHv5] clk: ppc-corenet: rename to qoriq and add CLK_OF_DECLARE support Jingchang Lu
@ 2014-10-14 10:32 ` Jingchang Lu
2014-10-30 23:12 ` Scott Wood
0 siblings, 1 reply; 3+ messages in thread
From: Jingchang Lu @ 2014-10-14 10:32 UTC (permalink / raw)
To: Jingchang Lu, mturquette@linaro.org
Cc: Scott Wood, linuxppc-dev@lists.ozlabs.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
SGksIFNjb3R0IGFuZCBNaWtlLA0KICANCiAgQ291bGQgeW91IHBsZWFzZSBoZWxwIHJldmlldyB0
aGlzIHBhdGNoLiBUaGFua3MuDQoNCkJlc3QgUmVnYXJkcywNCkppbmdjaGFuZw0KDQo+LS0tLS1P
cmlnaW5hbCBNZXNzYWdlLS0tLS0NCj5Gcm9tOiBKaW5nY2hhbmcgTHUgW21haWx0bzpqaW5nY2hh
bmcubHVAZnJlZXNjYWxlLmNvbV0NCj5TZW50OiBGcmlkYXksIE9jdG9iZXIgMTAsIDIwMTQgNTox
NSBQTQ0KPlRvOiBtdHVycXVldHRlQGxpbmFyby5vcmcNCj5DYzogV29vZCBTY290dC1CMDc0MjE7
IGxpbnV4cHBjLWRldkBsaXN0cy5vemxhYnMub3JnOyBsaW51eC0NCj5rZXJuZWxAdmdlci5rZXJu
ZWwub3JnOyBsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmc7IEx1DQo+SmluZ2No
YW5nLUIzNTA4Mw0KPlN1YmplY3Q6IFtQQVRDSHY1XSBjbGs6IHBwYy1jb3JlbmV0OiByZW5hbWUg
dG8gcW9yaXEgYW5kIGFkZA0KPkNMS19PRl9ERUNMQVJFIHN1cHBvcnQNCj4NCj5UaGUgSVAgaXMg
c2hhcmVkIGJ5IFBQQyBhbmQgQVJNLCB0aGlzIHJlbmFtZXMgaXQgdG8gcW9yaXEgZm9yIGJldHRl
cg0KPnJlcHJlc2VudGlvbiwgYW5kIHRoaXMgYWxzbyBhZGRzIHRoZSBDTEtfT0ZfREVDTEFSRSBz
dXBwb3J0IGZvciBiZWluZw0KPmluaXRpYWxpemVkIGJ5IG9mX2Nsa19pbml0KCkgb24gQVJNLg0K
Pg0KPlNpZ25lZC1vZmYtYnk6IEppbmdjaGFuZyBMdSA8amluZ2NoYW5nLmx1QGZyZWVzY2FsZS5j
b20+DQo+LS0tDQo+Y2hhbmdlcyBpbiB2NToNCj4gdXBkYXRlIGRyaXZlcnMvY3B1ZnJlcS9LY29u
ZmlnLnBvd2VycGMgdG8gc2xlY3QgdGhlIHJlbmFtZWQgY29uZmlnIG9wdGlvbi4NCj4NCj5jaGFu
Z2VzIGluIHY0Og0KPiByZW1vdmUgImNvcmVuZXQiIGxpdGVyYWxzIG9taXR0ZWQgaW4gdjMgcmVt
b3ZlLg0KPg0KPmNoYW5nZXMgaW4gdjM6DQo+IGdlbmVyYXRlIHRoZSBwYXRjaCB3aXRoIC1NIC1D
IG9wdGlvbg0KPg0KPmNoYW5nZXMgaW4gdjI6DQo+IHJlbmFtZSB0aGUgZHJpdmVyIG5hbWUgdG8g
cHBjLXFvcmlxLmMgZm9yIHNoYXJlZCBvbiBQUEMgYW5kIEFSTS4NCj4NCj4gZHJpdmVycy9jbGsv
S2NvbmZpZyAgICAgICAgICAgICAgICAgICAgICAgICAgICB8IDEwICsrKystLS0tLQ0KPiBkcml2
ZXJzL2Nsay9NYWtlZmlsZSAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgIDIgKy0NCj4gZHJp
dmVycy9jbGsve2Nsay1wcGMtY29yZW5ldC5jID0+IGNsay1xb3JpcS5jfSB8IDI5ICsrKysrKysr
KysrKysrKy0tLS0tLQ0KPi0tLS0tDQo+IGRyaXZlcnMvY3B1ZnJlcS9LY29uZmlnLnBvd2VycGMg
ICAgICAgICAgICAgICAgfCAgMiArLQ0KPiA0IGZpbGVzIGNoYW5nZWQsIDI0IGluc2VydGlvbnMo
KyksIDE5IGRlbGV0aW9ucygtKSAgcmVuYW1lDQo+ZHJpdmVycy9jbGsve2Nsay1wcGMtY29yZW5l
dC5jID0+IGNsay1xb3JpcS5jfSAoODklKQ0KPg0KPmRpZmYgLS1naXQgYS9kcml2ZXJzL2Nsay9L
Y29uZmlnIGIvZHJpdmVycy9jbGsvS2NvbmZpZyBpbmRleA0KPjQ1NWZkMTcuLjQ3MDZhOWYgMTAw
NjQ0DQo+LS0tIGEvZHJpdmVycy9jbGsvS2NvbmZpZw0KPisrKyBiL2RyaXZlcnMvY2xrL0tjb25m
aWcNCj5AQCAtMTAxLDEyICsxMDEsMTIgQEAgY29uZmlnIENPTU1PTl9DTEtfQVhJX0NMS0dFTg0K
PiAJICBTdXBwb3J0IGZvciB0aGUgQW5hbG9nIERldmljZXMgYXhpLWNsa2dlbiBwY29yZSBjbG9j
ayBnZW5lcmF0b3INCj5mb3IgWGlsaW54DQo+IAkgIEZQR0FzLiBJdCBpcyBjb21tb25seSB1c2Vk
IGluIEFuYWxvZyBEZXZpY2VzJyByZWZlcmVuY2UgZGVzaWducy4NCj4NCj4tY29uZmlnIENMS19Q
UENfQ09SRU5FVA0KPi0JYm9vbCAiQ2xvY2sgZHJpdmVyIGZvciBQb3dlclBDIGNvcmVuZXQgcGxh
dGZvcm1zIg0KPi0JZGVwZW5kcyBvbiBQUENfRTUwME1DICYmIE9GDQo+K2NvbmZpZyBDTEtfUU9S
SVENCj4rCWJvb2wgIkNsb2NrIGRyaXZlciBmb3IgRnJlZXNjYWxlIFFvcklRIHBsYXRmb3JtcyIN
Cj4rCWRlcGVuZHMgb24gKFBQQ19FNTAwTUMgfHwgQVJNKSAmJiBPRg0KPiAJLS0taGVscC0tLQ0K
Pi0JICBUaGlzIGFkZHMgdGhlIGNsb2NrIGRyaXZlciBzdXBwb3J0IGZvciBGcmVlc2NhbGUgUG93
ZXJQQyBjb3JlbmV0DQo+LQkgIHBsYXRmb3JtcyB1c2luZyBjb21tb24gY2xvY2sgZnJhbWV3b3Jr
Lg0KPisJICBUaGlzIGFkZHMgdGhlIGNsb2NrIGRyaXZlciBzdXBwb3J0IGZvciBGcmVlc2NhbGUg
UW9ySVEgcGxhdGZvcm1zDQo+KwkgIHVzaW5nIGNvbW1vbiBjbG9jayBmcmFtZXdvcmsuDQo+DQo+
IGNvbmZpZyBDT01NT05fQ0xLX1hHRU5FDQo+IAlib29sICJDbG9jayBkcml2ZXIgZm9yIEFQTSBY
R2VuZSBTb0MiDQo+ZGlmZiAtLWdpdCBhL2RyaXZlcnMvY2xrL01ha2VmaWxlIGIvZHJpdmVycy9j
bGsvTWFrZWZpbGUgaW5kZXgNCj5kNWZiYTViLi40ZmY5NGNkIDEwMDY0NA0KPi0tLSBhL2RyaXZl
cnMvY2xrL01ha2VmaWxlDQo+KysrIGIvZHJpdmVycy9jbGsvTWFrZWZpbGUNCj5AQCAtMzAsNyAr
MzAsNyBAQCBvYmotJChDT05GSUdfQVJDSF9NT1hBUlQpCQkrPSBjbGstbW94YXJ0Lm8NCj4gb2Jq
LSQoQ09ORklHX0FSQ0hfTk9NQURJSykJCSs9IGNsay1ub21hZGlrLm8NCj4gb2JqLSQoQ09ORklH
X0FSQ0hfTlNQSVJFKQkJKz0gY2xrLW5zcGlyZS5vDQo+IG9iai0kKENPTkZJR19DT01NT05fQ0xL
X1BBTE1BUykJCSs9IGNsay1wYWxtYXMubw0KPi1vYmotJChDT05GSUdfQ0xLX1BQQ19DT1JFTkVU
KQkJKz0gY2xrLXBwYy1jb3JlbmV0Lm8NCj4rb2JqLSQoQ09ORklHX0NMS19RT1JJUSkJCQkrPSBj
bGstcW9yaXEubw0KPiBvYmotJChDT05GSUdfQ09NTU9OX0NMS19SSzgwOCkJCSs9IGNsay1yazgw
OC5vDQo+IG9iai0kKENPTkZJR19DT01NT05fQ0xLX1MyTVBTMTEpCSs9IGNsay1zMm1wczExLm8N
Cj4gb2JqLSQoQ09ORklHX0NPTU1PTl9DTEtfU0k1MzUxKQkJKz0gY2xrLXNpNTM1MS5vDQo+ZGlm
ZiAtLWdpdCBhL2RyaXZlcnMvY2xrL2Nsay1wcGMtY29yZW5ldC5jIGIvZHJpdmVycy9jbGsvY2xr
LXFvcmlxLmMNCj5zaW1pbGFyaXR5IGluZGV4IDg5JSByZW5hbWUgZnJvbSBkcml2ZXJzL2Nsay9j
bGstcHBjLWNvcmVuZXQuYyByZW5hbWUgdG8NCj5kcml2ZXJzL2Nsay9jbGstcW9yaXEuYyBpbmRl
eCA4ZTU4ZWRmLi40OGNiOTIzIDEwMDY0NA0KPi0tLSBhL2RyaXZlcnMvY2xrL2Nsay1wcGMtY29y
ZW5ldC5jDQo+KysrIGIvZHJpdmVycy9jbGsvY2xrLXFvcmlxLmMNCj5AQCAtNSw3ICs1LDcgQEAN
Cj4gICogaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5z
ZSB2ZXJzaW9uIDIgYXMNCj4gICogcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5k
YXRpb24uDQo+ICAqDQo+LSAqIGNsb2NrIGRyaXZlciBmb3IgRnJlZXNjYWxlIFBvd2VyUEMgY29y
ZW5ldCBTb0NzLg0KPisgKiBjbG9jayBkcml2ZXIgZm9yIEZyZWVzY2FsZSBRb3JJUSBTb0NzLg0K
PiAgKi8NCj4gI2luY2x1ZGUgPGxpbnV4L2Nsay1wcm92aWRlci5oPg0KPiAjaW5jbHVkZSA8bGlu
dXgvaW8uaD4NCj5AQCAtMTU1LDcgKzE1NSw3IEBAIHN0YXRpYyB2b2lkIF9faW5pdCBjb3JlX3Bs
bF9pbml0KHN0cnVjdCBkZXZpY2Vfbm9kZQ0KPipucCkNCj4NCj4gCWJhc2UgPSBvZl9pb21hcChu
cCwgMCk7DQo+IAlpZiAoIWJhc2UpIHsNCj4tCQlwcl9lcnIoImNsay1wcGM6IGlvbWFwIGVycm9y
XG4iKTsNCj4rCQlwcl9lcnIoImNsay1xb3JpcTogaW9tYXAgZXJyb3JcbiIpOw0KPiAJCXJldHVy
bjsNCj4gCX0NCj4NCj5AQCAtMjUyLDcgKzI1Miw3IEBAIHN0YXRpYyB2b2lkIF9faW5pdCBzeXNj
bGtfaW5pdChzdHJ1Y3QgZGV2aWNlX25vZGUNCj4qbm9kZSkNCj4gCXUzMiByYXRlOw0KPg0KPiAJ
aWYgKCFucCkgew0KPi0JCXByX2VycigicHBjLWNsazogY291bGQgbm90IGdldCBwYXJlbnQgbm9k
ZVxuIik7DQo+KwkJcHJfZXJyKCJxb3JpcS1jbGs6IGNvdWxkIG5vdCBnZXQgcGFyZW50IG5vZGVc
biIpOw0KPiAJCXJldHVybjsNCj4gCX0NCj4NCj5AQCAtMjc4LDMwICsyNzgsMzUgQEAgc3RhdGlj
IGNvbnN0IHN0cnVjdCBvZl9kZXZpY2VfaWQgY2xrX21hdGNoW10NCj5fX2luaXRjb25zdCA9IHsN
Cj4gCXt9DQo+IH07DQo+DQo+LXN0YXRpYyBpbnQgX19pbml0IHBwY19jb3JlbmV0X2Nsa19wcm9i
ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQ0KPitzdGF0aWMgaW50IF9faW5pdCBxb3Jp
cV9jbGtfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikNCj4gew0KPiAJb2ZfY2xr
X2luaXQoY2xrX21hdGNoKTsNCj4NCj4gCXJldHVybiAwOw0KPiB9DQo+DQo+LXN0YXRpYyBjb25z
dCBzdHJ1Y3Qgb2ZfZGV2aWNlX2lkIHBwY19jbGtfaWRzW10gX19pbml0Y29uc3QgPSB7DQo+K3N0
YXRpYyBjb25zdCBzdHJ1Y3Qgb2ZfZGV2aWNlX2lkIHFvcmlxX2Nsa19pZHNbXSBfX2luaXRjb25z
dCA9IHsNCj4gCXsgLmNvbXBhdGlibGUgPSAiZnNsLHFvcmlxLWNsb2NrZ2VuLTEuMCIsIH0sDQo+
IAl7IC5jb21wYXRpYmxlID0gImZzbCxxb3JpcS1jbG9ja2dlbi0yLjAiLCB9LA0KPiAJe30NCj4g
fTsNCj4NCj4tc3RhdGljIHN0cnVjdCBwbGF0Zm9ybV9kcml2ZXIgcHBjX2NvcmVuZXRfY2xrX2Ry
aXZlciBfX2luaXRkYXRhID0gew0KPitzdGF0aWMgc3RydWN0IHBsYXRmb3JtX2RyaXZlciBxb3Jp
cV9jbGtfZHJpdmVyIF9faW5pdGRhdGEgPSB7DQo+IAkuZHJpdmVyID0gew0KPi0JCS5uYW1lID0g
InBwY19jb3JlbmV0X2Nsb2NrIiwNCj4rCQkubmFtZSA9ICJxb3JpcV9jbG9jayIsDQo+IAkJLm93
bmVyID0gVEhJU19NT0RVTEUsDQo+LQkJLm9mX21hdGNoX3RhYmxlID0gcHBjX2Nsa19pZHMsDQo+
KwkJLm9mX21hdGNoX3RhYmxlID0gcW9yaXFfY2xrX2lkcywNCj4gCX0sDQo+LQkucHJvYmUgPSBw
cGNfY29yZW5ldF9jbGtfcHJvYmUsDQo+KwkucHJvYmUgPSBxb3JpcV9jbGtfcHJvYmUsDQo+IH07
DQo+DQo+LXN0YXRpYyBpbnQgX19pbml0IHBwY19jb3JlbmV0X2Nsa19pbml0KHZvaWQpDQo+K3N0
YXRpYyBpbnQgX19pbml0IHFvcmlxX2Nsa19pbml0KHZvaWQpDQo+IHsNCj4tCXJldHVybiBwbGF0
Zm9ybV9kcml2ZXJfcmVnaXN0ZXIoJnBwY19jb3JlbmV0X2Nsa19kcml2ZXIpOw0KPisJcmV0dXJu
IHBsYXRmb3JtX2RyaXZlcl9yZWdpc3RlcigmcW9yaXFfY2xrX2RyaXZlcik7DQo+IH0NCj4tc3Vi
c3lzX2luaXRjYWxsKHBwY19jb3JlbmV0X2Nsa19pbml0KTsNCj4rc3Vic3lzX2luaXRjYWxsKHFv
cmlxX2Nsa19pbml0KTsNCj4rDQo+K0NMS19PRl9ERUNMQVJFKHFvcmlxX2NvcmVfcGxsX3YxLCAi
ZnNsLHFvcmlxLWNvcmUtcGxsLTEuMCIsDQo+K2NvcmVfcGxsX2luaXQpOyBDTEtfT0ZfREVDTEFS
RShxb3JpcV9jb3JlX3BsbF92MiwNCj4rImZzbCxxb3JpcS1jb3JlLXBsbC0yLjAiLCBjb3JlX3Bs
bF9pbml0KTsNCj4rQ0xLX09GX0RFQ0xBUkUocW9yaXFfY29yZV9tdXhfdjEsICJmc2wscW9yaXEt
Y29yZS1tdXgtMS4wIiwNCj4rY29yZV9tdXhfaW5pdCk7IENMS19PRl9ERUNMQVJFKHFvcmlxX2Nv
cmVfbXV4X3YyLA0KPisiZnNsLHFvcmlxLWNvcmUtbXV4LTIuMCIsIGNvcmVfbXV4X2luaXQpOw0K
PmRpZmYgLS1naXQgYS9kcml2ZXJzL2NwdWZyZXEvS2NvbmZpZy5wb3dlcnBjDQo+Yi9kcml2ZXJz
L2NwdWZyZXEvS2NvbmZpZy5wb3dlcnBjIGluZGV4IDcyNTY0YjcuLjdlYTI0NDEgMTAwNjQ0DQo+
LS0tIGEvZHJpdmVycy9jcHVmcmVxL0tjb25maWcucG93ZXJwYw0KPisrKyBiL2RyaXZlcnMvY3B1
ZnJlcS9LY29uZmlnLnBvd2VycGMNCj5AQCAtMjYsNyArMjYsNyBAQCBjb25maWcgQ1BVX0ZSRVFf
TUFQTEUNCj4gY29uZmlnIFBQQ19DT1JFTkVUX0NQVUZSRVENCj4gCXRyaXN0YXRlICJDUFUgZnJl
cXVlbmN5IHNjYWxpbmcgZHJpdmVyIGZvciBGcmVlc2NhbGUgRTUwME1DIFNvQ3MiDQo+IAlkZXBl
bmRzIG9uIFBQQ19FNTAwTUMgJiYgT0YgJiYgQ09NTU9OX0NMSw0KPi0Jc2VsZWN0IENMS19QUENf
Q09SRU5FVA0KPisJc2VsZWN0IENMS19RT1JJUQ0KPiAJaGVscA0KPiAJICBUaGlzIGFkZHMgdGhl
IENQVUZyZXEgZHJpdmVyIHN1cHBvcnQgZm9yIEZyZWVzY2FsZSBlNTAwbWMsDQo+IAkgIGU1NTAw
IGFuZCBlNjUwMCBzZXJpZXMgU29DcyB3aGljaCBhcmUgY2FwYWJsZSBvZiBjaGFuZ2luZw0KPi0t
DQo+MS44LjANCg0K
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCHv5] clk: ppc-corenet: rename to qoriq and add CLK_OF_DECLARE support
2014-10-14 10:32 ` Jingchang Lu
@ 2014-10-30 23:12 ` Scott Wood
0 siblings, 0 replies; 3+ messages in thread
From: Scott Wood @ 2014-10-30 23:12 UTC (permalink / raw)
To: Lu Jingchang-B35083
Cc: linuxppc-dev@lists.ozlabs.org, mturquette@linaro.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
The CLK_OF_DECLARE part is addressed by:
http://patchwork.ozlabs.org/patch/400740/
http://patchwork.ozlabs.org/patch/400741/
http://patchwork.ozlabs.org/patch/400742/
...which does what I was asking earlier, getting rid of the (currently
broken due to a misguided attempt to remove an __init warning) platform
driver part rather than maintaining both approaches.
I suggest sending a rename patch that applies after those patches.
-Scott
On Tue, 2014-10-14 at 05:32 -0500, Lu Jingchang-B35083 wrote:
> Hi, Scott and Mike,
>
> Could you please help review this patch. Thanks.
>
> Best Regards,
> Jingchang
>
> >-----Original Message-----
> >From: Jingchang Lu [mailto:jingchang.lu@freescale.com]
> >Sent: Friday, October 10, 2014 5:15 PM
> >To: mturquette@linaro.org
> >Cc: Wood Scott-B07421; linuxppc-dev@lists.ozlabs.org; linux-
> >kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org; Lu
> >Jingchang-B35083
> >Subject: [PATCHv5] clk: ppc-corenet: rename to qoriq and add
> >CLK_OF_DECLARE support
> >
> >The IP is shared by PPC and ARM, this renames it to qoriq for better
> >represention, and this also adds the CLK_OF_DECLARE support for being
> >initialized by of_clk_init() on ARM.
> >
> >Signed-off-by: Jingchang Lu <jingchang.lu@freescale.com>
> >---
> >changes in v5:
> > update drivers/cpufreq/Kconfig.powerpc to slect the renamed config option.
> >
> >changes in v4:
> > remove "corenet" literals omitted in v3 remove.
> >
> >changes in v3:
> > generate the patch with -M -C option
> >
> >changes in v2:
> > rename the driver name to ppc-qoriq.c for shared on PPC and ARM.
> >
> > drivers/clk/Kconfig | 10 ++++-----
> > drivers/clk/Makefile | 2 +-
> > drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} | 29 +++++++++++++++------
> >-----
> > drivers/cpufreq/Kconfig.powerpc | 2 +-
> > 4 files changed, 24 insertions(+), 19 deletions(-) rename
> >drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} (89%)
> >
> >diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index
> >455fd17..4706a9f 100644
> >--- a/drivers/clk/Kconfig
> >+++ b/drivers/clk/Kconfig
> >@@ -101,12 +101,12 @@ config COMMON_CLK_AXI_CLKGEN
> > Support for the Analog Devices axi-clkgen pcore clock generator
> >for Xilinx
> > FPGAs. It is commonly used in Analog Devices' reference designs.
> >
> >-config CLK_PPC_CORENET
> >- bool "Clock driver for PowerPC corenet platforms"
> >- depends on PPC_E500MC && OF
> >+config CLK_QORIQ
> >+ bool "Clock driver for Freescale QorIQ platforms"
> >+ depends on (PPC_E500MC || ARM) && OF
> > ---help---
> >- This adds the clock driver support for Freescale PowerPC corenet
> >- platforms using common clock framework.
> >+ This adds the clock driver support for Freescale QorIQ platforms
> >+ using common clock framework.
> >
> > config COMMON_CLK_XGENE
> > bool "Clock driver for APM XGene SoC"
> >diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index
> >d5fba5b..4ff94cd 100644
> >--- a/drivers/clk/Makefile
> >+++ b/drivers/clk/Makefile
> >@@ -30,7 +30,7 @@ obj-$(CONFIG_ARCH_MOXART) += clk-moxart.o
> > obj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o
> > obj-$(CONFIG_ARCH_NSPIRE) += clk-nspire.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_S2MPS11) += clk-s2mps11.o
> > obj-$(CONFIG_COMMON_CLK_SI5351) += clk-si5351.o
> >diff --git a/drivers/clk/clk-ppc-corenet.c b/drivers/clk/clk-qoriq.c
> >similarity index 89% rename from drivers/clk/clk-ppc-corenet.c rename to
> >drivers/clk/clk-qoriq.c index 8e58edf..48cb923 100644
> >--- a/drivers/clk/clk-ppc-corenet.c
> >+++ b/drivers/clk/clk-qoriq.c
> >@@ -5,7 +5,7 @@
> > * it under the terms of the GNU General Public License version 2 as
> > * 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/io.h>
> >@@ -155,7 +155,7 @@ static void __init core_pll_init(struct device_node
> >*np)
> >
> > base = of_iomap(np, 0);
> > if (!base) {
> >- pr_err("clk-ppc: iomap error\n");
> >+ pr_err("clk-qoriq: iomap error\n");
> > return;
> > }
> >
> >@@ -252,7 +252,7 @@ static void __init sysclk_init(struct device_node
> >*node)
> > u32 rate;
> >
> > if (!np) {
> >- pr_err("ppc-clk: could not get parent node\n");
> >+ pr_err("qoriq-clk: could not get parent node\n");
> > return;
> > }
> >
> >@@ -278,30 +278,35 @@ static const struct of_device_id clk_match[]
> >__initconst = {
> > {}
> > };
> >
> >-static int __init ppc_corenet_clk_probe(struct platform_device *pdev)
> >+static int __init qoriq_clk_probe(struct platform_device *pdev)
> > {
> > of_clk_init(clk_match);
> >
> > return 0;
> > }
> >
> >-static const struct of_device_id ppc_clk_ids[] __initconst = {
> >+static const struct of_device_id qoriq_clk_ids[] __initconst = {
> > { .compatible = "fsl,qoriq-clockgen-1.0", },
> > { .compatible = "fsl,qoriq-clockgen-2.0", },
> > {}
> > };
> >
> >-static struct platform_driver ppc_corenet_clk_driver __initdata = {
> >+static struct platform_driver qoriq_clk_driver __initdata = {
> > .driver = {
> >- .name = "ppc_corenet_clock",
> >+ .name = "qoriq_clock",
> > .owner = THIS_MODULE,
> >- .of_match_table = ppc_clk_ids,
> >+ .of_match_table = qoriq_clk_ids,
> > },
> >- .probe = ppc_corenet_clk_probe,
> >+ .probe = qoriq_clk_probe,
> > };
> >
> >-static int __init ppc_corenet_clk_init(void)
> >+static int __init qoriq_clk_init(void)
> > {
> >- return platform_driver_register(&ppc_corenet_clk_driver);
> >+ return platform_driver_register(&qoriq_clk_driver);
> > }
> >-subsys_initcall(ppc_corenet_clk_init);
> >+subsys_initcall(qoriq_clk_init);
> >+
> >+CLK_OF_DECLARE(qoriq_core_pll_v1, "fsl,qoriq-core-pll-1.0",
> >+core_pll_init); CLK_OF_DECLARE(qoriq_core_pll_v2,
> >+"fsl,qoriq-core-pll-2.0", core_pll_init);
> >+CLK_OF_DECLARE(qoriq_core_mux_v1, "fsl,qoriq-core-mux-1.0",
> >+core_mux_init); CLK_OF_DECLARE(qoriq_core_mux_v2,
> >+"fsl,qoriq-core-mux-2.0", core_mux_init);
> >diff --git a/drivers/cpufreq/Kconfig.powerpc
> >b/drivers/cpufreq/Kconfig.powerpc index 72564b7..7ea2441 100644
> >--- a/drivers/cpufreq/Kconfig.powerpc
> >+++ b/drivers/cpufreq/Kconfig.powerpc
> >@@ -26,7 +26,7 @@ config CPU_FREQ_MAPLE
> > config PPC_CORENET_CPUFREQ
> > tristate "CPU frequency scaling driver for Freescale E500MC SoCs"
> > depends on PPC_E500MC && OF && COMMON_CLK
> >- select CLK_PPC_CORENET
> >+ select CLK_QORIQ
> > help
> > This adds the CPUFreq driver support for Freescale e500mc,
> > e5500 and e6500 series SoCs which are capable of changing
> >--
> >1.8.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-10-30 23:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-10 9:14 [PATCHv5] clk: ppc-corenet: rename to qoriq and add CLK_OF_DECLARE support Jingchang Lu
2014-10-14 10:32 ` Jingchang Lu
2014-10-30 23:12 ` Scott Wood
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).