clk: ppc-corenet: rename to ppc-qoriq and add CLK_OF_DECLARE support
PATCH v4 1/1 clk: ppc-corenet: rename to ppc-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.
---
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 | 9 +++++----
drivers/clk/Makefile | 2 +-
drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} | 27 +++++++++++++++-----------
3 files changed, 22 insertions(+), 16 deletions(-)
rename drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} (89%)drivers/clk/Kconfig +5 -4
@@ -92,12 +92,13 @@ 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 PowerPC corenet and compatible ARM-based platforms" + depends on (PPC_E500MC || ARM) && OF ---help--- This adds the clock driver support for Freescale PowerPC corenet - platforms using common clock framework. + platforms and compatible Freescale ARM based platforms using common + clock framework. config COMMON_CLK_XGENE bool "Clock driver for APM XGene SoC"
drivers/clk/Makefile +1 -1
@@ -29,7 +29,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_S2MPS11) += clk-s2mps11.o obj-$(CONFIG_COMMON_CLK_SI5351) += clk-si5351.o obj-$(CONFIG_COMMON_CLK_SI570) += clk-si570.o
drivers/clk/clk-qoriq.c renamed from drivers/clk/clk-ppc-corenet.c +16 -11
@@ -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);
Signature · 1 line
1.8.0
Hi, Scott and Mike,
Could you please help review this patch and give an ACK if ok. Thanks.
Best Regards,
Jingchang
Quoted 145 lines
-----Original Message-----
From: Jingchang Lu [mailto:jingchang.lu at freescale.com]
Sent: Tuesday, September 23, 2014 2:47 PM
To: mturquette at linaro.org
Cc: Wood Scott-B07421; linuxppc-dev at lists.ozlabs.org; linux- kernel at vger.kernel.org; linux-arm-kernel at lists.infradead.org; Lu Jingchang-B35083
Subject: [PATCHv4] clk: ppc-corenet: rename to ppc-qoriq and addCLK_OF_DECLAREsupportThe IP is shared by PPC and ARM, this renames it to qoriq for better represention, and this also adds the
CLK_OF_DECLAREsupport for being initialized byof_clk_init()on ARM.Signed-off-by Jingchang Lu <[email protected]>---
changes in v4:
remove "corenet" literals omitted in v3 remove.changes in v3:
generate the patch with -M -C optionchanges in v2:
rename the driver name toppc-qoriq.cfor shared on PPC and ARM.drivers/clk/Kconfig | 9 +++++---- drivers/clk/Makefile | 2 +- drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} | 27 +++++++++++++++------ ----- 3 files changed, 22 insertions(+), 16 deletions(-) rename
drivers/clk/{clk-ppc-corenet.c=>clk-qoriq.c} (89%)drivers/clk/Kconfig index renamed from drivers/clk/Kconfig +0
-085131ae..f5f76cb 100644
drivers/clk/Kconfig +0
-0@@ -92,12 +92,13 @@ config COMMON_CLK_AXI_CLKGEN Support for the Analog Devices axi-clkgen pcore clock generatorfor Xilinx
FPGAs. It is commonly used in Analog Devices' reference designs.drivers/clk/Kconfig +2
-3-config CLK_PPC_CORENET - bool "Clock driver for PowerPC corenet platforms" - depends on PPC_E500MC && OF +config CLK_QORIQ + bool "Clock driver for PowerPC corenet and compatible ARM-basedplatforms"
drivers/clk/Kconfig +1
-0+ depends on (PPC_E500MC || ARM) && OF---help--- This adds the clock driver support for Freescale PowerPC corenetdrivers/clk/Kconfig +1
-1- platforms using common clock framework. + platforms and compatible Freescale ARM based platforms usingcommon
drivers/clk/Kconfig +1
-0+ clock framework.config
COMMON_CLK_XGENE
bool "Clock driver for APM XGene SoC"drivers/clk/Makefile index renamed from drivers/clk/Makefile +0
-027c542b..20f42e9 100644
drivers/clk/Makefile +0
-0@@ -29,7 +29,7 @@ obj-$(CONFIG_ARCH_MOXART) += clk-moxart.oobj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o
obj-$(CONFIG_ARCH_NSPIRE) += clk-nspire.o
obj-$(CONFIG_COMMON_CLK_PALMAS) += clk-palmas.odrivers/clk/Makefile +1
-1-obj-$(CONFIG_CLK_PPC_CORENET) += clk-ppc-corenet.o +obj-$(CONFIG_CLK_QORIQ) += clk-qoriq.oobj-$(CONFIG_COMMON_CLK_S2MPS11) += clk-s2mps11.o
obj-$(CONFIG_COMMON_CLK_SI5351) += clk-si5351.o
obj-$(CONFIG_COMMON_CLK_SI570) += clk-si570.odrivers/clk/clk-qoriq.c renamed from drivers/clk/clk-ppc-corenet.c +0
-0
drivers/clk/clk-qoriq.cindex 8e58edf..cba8abe 100644drivers/clk/clk-qoriq.c renamed from drivers/clk/clk-ppc-corenet.c +18
-12@@ -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); --1.8.0
Well, like I said, I'd rather see the CLK_OF_DECLARE stuff be made to work on PPC rather than have the driver carry around two binding methods.
-Scott
Quoted 153 lines · On Thu, 2014-09-25 at 04:47 -0500, Lu Jingchang-B35083 wrote:
Hi, Scott and Mike,
Could you please help review this patch and give an ACK if ok. Thanks.
Best Regards,
JingchangQuoted 145 lines
-----Original Message-----
From: Jingchang Lu [mailto:jingchang.lu at freescale.com]
Sent: Tuesday, September 23, 2014 2:47 PM
To: mturquette at linaro.org
Cc: Wood Scott-B07421; linuxppc-dev at lists.ozlabs.org; linux- kernel at vger.kernel.org; linux-arm-kernel at lists.infradead.org; Lu Jingchang-B35083
Subject: [PATCHv4] clk: ppc-corenet: rename to ppc-qoriq and addCLK_OF_DECLAREsupportThe IP is shared by PPC and ARM, this renames it to qoriq for better represention, and this also adds the
CLK_OF_DECLAREsupport for being initialized byof_clk_init()on ARM.Signed-off-by Jingchang Lu <[email protected]>---
changes in v4:
remove "corenet" literals omitted in v3 remove.changes in v3:
generate the patch with -M -C optionchanges in v2:
rename the driver name toppc-qoriq.cfor shared on PPC and ARM.drivers/clk/Kconfig | 9 +++++---- drivers/clk/Makefile | 2 +- drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} | 27 +++++++++++++++------ ----- 3 files changed, 22 insertions(+), 16 deletions(-) rename
drivers/clk/{clk-ppc-corenet.c=>clk-qoriq.c} (89%)drivers/clk/Kconfig index renamed from drivers/clk/Kconfig +0
-085131ae..f5f76cb 100644
drivers/clk/Kconfig +0
-0@@ -92,12 +92,13 @@ config COMMON_CLK_AXI_CLKGEN Support for the Analog Devices axi-clkgen pcore clock generatorfor Xilinx
FPGAs. It is commonly used in Analog Devices' reference designs.drivers/clk/Kconfig +2
-3-config CLK_PPC_CORENET - bool "Clock driver for PowerPC corenet platforms" - depends on PPC_E500MC && OF +config CLK_QORIQ + bool "Clock driver for PowerPC corenet and compatible ARM-basedplatforms"
drivers/clk/Kconfig +1
-0+ depends on (PPC_E500MC || ARM) && OF---help--- This adds the clock driver support for Freescale PowerPC corenetdrivers/clk/Kconfig +1
-1- platforms using common clock framework. + platforms and compatible Freescale ARM based platforms usingcommon
drivers/clk/Kconfig +1
-0+ clock framework.config
COMMON_CLK_XGENE
bool "Clock driver for APM XGene SoC"drivers/clk/Makefile index renamed from drivers/clk/Makefile +0
-027c542b..20f42e9 100644
drivers/clk/Makefile +0
-0@@ -29,7 +29,7 @@ obj-$(CONFIG_ARCH_MOXART) += clk-moxart.oobj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o
obj-$(CONFIG_ARCH_NSPIRE) += clk-nspire.o
obj-$(CONFIG_COMMON_CLK_PALMAS) += clk-palmas.odrivers/clk/Makefile +1
-1-obj-$(CONFIG_CLK_PPC_CORENET) += clk-ppc-corenet.o +obj-$(CONFIG_CLK_QORIQ) += clk-qoriq.oobj-$(CONFIG_COMMON_CLK_S2MPS11) += clk-s2mps11.o
obj-$(CONFIG_COMMON_CLK_SI5351) += clk-si5351.o
obj-$(CONFIG_COMMON_CLK_SI570) += clk-si570.odrivers/clk/clk-qoriq.c renamed from drivers/clk/clk-ppc-corenet.c +0
-0
drivers/clk/clk-qoriq.cindex 8e58edf..cba8abe 100644drivers/clk/clk-qoriq.c renamed from drivers/clk/clk-ppc-corenet.c +18
-12@@ -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); --1.8.0
Quoting Scott Wood (2014-09-25 13:08:00)
Quoted 3 lines
Well, like I said, I'd rather see the
CLK_OF_DECLAREstuff be made to work on PPC rather than have the driver carry around two binding methods.
I guess that is an existing problem, and not related directly to this patch? This patch is essentially just renames (though the V1.0/V2.0 stuff seems weird).
Regards,
Mike
Quoted 159 lines
-Scott
Quoted 153 lines · On Thu, 2014-09-25 at 04:47 -0500, Lu Jingchang-B35083 wrote:
Hi, Scott and Mike,
Could you please help review this patch and give an ACK if ok. Thanks.
Best Regards,
JingchangQuoted 145 lines
-----Original Message-----
From: Jingchang Lu [mailto:jingchang.lu at freescale.com]
Sent: Tuesday, September 23, 2014 2:47 PM
To: mturquette at linaro.org
Cc: Wood Scott-B07421; linuxppc-dev at lists.ozlabs.org; linux- kernel at vger.kernel.org; linux-arm-kernel at lists.infradead.org; Lu Jingchang-B35083
Subject: [PATCHv4] clk: ppc-corenet: rename to ppc-qoriq and addCLK_OF_DECLAREsupportThe IP is shared by PPC and ARM, this renames it to qoriq for better represention, and this also adds the
CLK_OF_DECLAREsupport for being initialized byof_clk_init()on ARM.Signed-off-by Jingchang Lu <[email protected]>---
changes in v4:
remove "corenet" literals omitted in v3 remove.changes in v3:
generate the patch with -M -C optionchanges in v2:
rename the driver name toppc-qoriq.cfor shared on PPC and ARM.drivers/clk/Kconfig | 9 +++++---- drivers/clk/Makefile | 2 +- drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} | 27 +++++++++++++++------ ----- 3 files changed, 22 insertions(+), 16 deletions(-) rename
drivers/clk/{clk-ppc-corenet.c=>clk-qoriq.c} (89%)drivers/clk/Kconfig index renamed from drivers/clk/Kconfig +0
-085131ae..f5f76cb 100644
drivers/clk/Kconfig +0
-0@@ -92,12 +92,13 @@ config COMMON_CLK_AXI_CLKGEN Support for the Analog Devices axi-clkgen pcore clock generatorfor Xilinx
FPGAs. It is commonly used in Analog Devices' reference designs.drivers/clk/Kconfig +2
-3-config CLK_PPC_CORENET - bool "Clock driver for PowerPC corenet platforms" - depends on PPC_E500MC && OF +config CLK_QORIQ + bool "Clock driver for PowerPC corenet and compatible ARM-basedplatforms"
drivers/clk/Kconfig +2
-1+ depends on (PPC_E500MC || ARM) && OF ---help--- This adds the clock driver support for Freescale PowerPC corenet - platforms using common clock framework. + platforms and compatible Freescale ARM based platforms usingcommon
+ clock framework.config
COMMON_CLK_XGENE
bool "Clock driver for APM XGene SoC"drivers/clk/Makefile index renamed from drivers/clk/Makefile +0
-027c542b..20f42e9 100644
drivers/clk/Makefile +0
-0@@ -29,7 +29,7 @@ obj-$(CONFIG_ARCH_MOXART) += clk-moxart.oobj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o
obj-$(CONFIG_ARCH_NSPIRE) += clk-nspire.o
obj-$(CONFIG_COMMON_CLK_PALMAS) += clk-palmas.odrivers/clk/Makefile +1
-1-obj-$(CONFIG_CLK_PPC_CORENET) += clk-ppc-corenet.o +obj-$(CONFIG_CLK_QORIQ) += clk-qoriq.oobj-$(CONFIG_COMMON_CLK_S2MPS11) += clk-s2mps11.o
obj-$(CONFIG_COMMON_CLK_SI5351) += clk-si5351.o
obj-$(CONFIG_COMMON_CLK_SI570) += clk-si570.odrivers/clk/clk-qoriq.c renamed from drivers/clk/clk-ppc-corenet.c +0
-0
drivers/clk/clk-qoriq.cindex 8e58edf..cba8abe 100644drivers/clk/clk-qoriq.c renamed from drivers/clk/clk-ppc-corenet.c +18
-12@@ -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); --1.8.0
Quoted 8 lines · Mike Turquette
Quoting Scott Wood (2014-09-25 13:08:00)
Quoted 3 lines
Well, like I said, I'd rather see the
CLK_OF_DECLAREstuff be made to work on PPC rather than have the driver carry around two binding methods.I guess that is an existing problem, and not related directly to this patch? This patch is essentially just renames (though the V1.0/V2.0 stuff seems weird).
This patch is adding CLK_OF_DECLARE.
-Scott
PATCH v4 1/1 clk: ppc-corenet: rename to ppc-qoriq and add CLK_OF_DECLARE support
Quoting Scott Wood (2014-09-25 15:56:20)
Quoted 11 lines · Mike Turquette
Quoted 8 lines
Quoting Scott Wood (2014-09-25 13:08:00)
Quoted 3 lines
Well, like I said, I'd rather see the
CLK_OF_DECLAREstuff be made to work on PPC rather than have the driver carry around two binding methods.I guess that is an existing problem, and not related directly to this patch? This patch is essentially just renames (though the V1.0/V2.0 stuff seems weird).
This patch is adding
CLK_OF_DECLARE.
I'm fine taking this patch but your comments are still unresolved. What do you think needs to be done to fix the problems that you see?
Regards,
Mike
Quoted 4 lines
-Scott
Quoted 18 lines
-----Original Message-----
From: Linuxppc-dev [mailto:linuxppc-dev-bounces+b29983=freescale.com at lists.ozlabs.org] On Behalf Of Mike Turquette
Sent: Saturday, September 27, 2014 7:29 AM
To: Wood Scott-B07421
Cc: linuxppc-dev at lists.ozlabs.org; linux-kernel at vger.kernel.org; linux-arm-kernel at lists.infradead.org; Lu Jingchang-B35083
Subject: Re: [PATCHv4] clk: ppc-corenet: rename to ppc-qoriq and addCLK_OF_DECLAREsupportQuoting Scott Wood (2014-09-25 15:56:20)
Quoted 6 lines · Mike Turquette
Quoted 5 lines
Quoting Scott Wood (2014-09-25 13:08:00)
Quoted 3 lines
Well, like I said, I'd rather see the
CLK_OF_DECLAREstuff be made to work on PPC rather than have the driver carry around two binding methods.
Quoted 9 lines
Quoted 5 lines
Quoted 3 lines
I guess that is an existing problem, and not related directly to this patch? This patch is essentially just renames (though the V1.0/V2.0 stuff seems weird).
This patch is adding
CLK_OF_DECLARE.I'm fine taking this patch but your comments are still unresolved. What do you think needs to be done to fix the problems that you see?
CLK_OF_DECLARE is totally worked on PPC. I will do it in a separate patch.
Regarding V1.0 and V2.0, it is not wired just same for now. But we are not sure if it is same for v3.0 in the future.
Besides updating drivers/cpufreq/Kconfig.powerpc, there is one more thing I am not comfortable with:
This patch uses " fixed-clock" as sysclk's compatible string, while on PPC we treated it as " fsl,qoriq-sysclk-[1-2].0". That's inconsistent on both ARM and PPC platforms, neither did on bindings.
Thanks,
Yuantian
Quoted 11 lines
Regards,
MikeQuoted 4 lines
-Scott
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev at lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
Quoted 27 lines · On Sat, 2014-09-27 at 21:18 -0500, Tang Yuantian-B29983 wrote:
Quoted 18 lines
-----Original Message-----
From: Linuxppc-dev [mailto:linuxppc-dev-bounces+b29983=freescale.com at lists.ozlabs.org] On Behalf Of Mike Turquette
Sent: Saturday, September 27, 2014 7:29 AM
To: Wood Scott-B07421
Cc: linuxppc-dev at lists.ozlabs.org; linux-kernel at vger.kernel.org; linux-arm-kernel at lists.infradead.org; Lu Jingchang-B35083
Subject: Re: [PATCHv4] clk: ppc-corenet: rename to ppc-qoriq and addCLK_OF_DECLAREsupportQuoting Scott Wood (2014-09-25 15:56:20)
Quoted 6 lines · Mike Turquette
Quoted 5 lines
Quoting Scott Wood (2014-09-25 13:08:00)
Quoted 3 lines
Well, like I said, I'd rather see the
CLK_OF_DECLAREstuff be made to work on PPC rather than have the driver carry around two binding methods.Quoted 9 lines
Quoted 5 lines
Quoted 3 lines
I guess that is an existing problem, and not related directly to this patch? This patch is essentially just renames (though the V1.0/V2.0 stuff seems weird).
This patch is adding
CLK_OF_DECLARE.I'm fine taking this patch but your comments are still unresolved. What do you think needs to be done to fix the problems that you see?
Quoted 6 lines
CLK_OF_DECLAREis totally worked on PPC. I will do it in a separate patch.
Regarding V1.0 and V2.0, it is not wired just same for now. But we are not sure if it is same for v3.0 in the future.Besides updating
drivers/cpufreq/Kconfig.powerpc, there is one more thing I am not comfortable with:
This patch uses " fixed-clock" as sysclk's compatible string, while on PPC we treated it as " fsl,qoriq-sysclk-[1-2].0". That's inconsistent on both ARM and PPC platforms, neither did on bindings.
fsl,qoriq-sysclk-XXX is the way it is because of compatibility with the fixups in existing U-Boots. It shouldn't be used as a model.
That said, I don't think you really mean "this patch", as it doesn't contain the device tree updates, and "fixed-clock" does not appear.
-Scott
Quoted 44 lines
-----Original Message-----
From: Wood Scott-B07421
Sent: Tuesday, September 30, 2014 7:58 AM
To: Tang Yuantian-B29983
Cc: Mike Turquette; linuxppc-dev at lists.ozlabs.org; linux-kernel at vger.kernel.org; linux-arm-kernel at lists.infradead.org; Lu Jingchang-B35083
Subject: Re: [PATCHv4] clk: ppc-corenet: rename to ppc-qoriq and addCLK_OF_DECLAREsupportQuoted 22 lines · On Sat, 2014-09-27 at 21:18 -0500, Tang Yuantian-B29983 wrote:
Quoted 22 lines
-----Original Message-----
From: Linuxppc-dev [mailto:linuxppc-dev-bounces+b29983=freescale.com at lists.ozlabs.org] On Behalf Of Mike Turquette
Sent: Saturday, September 27, 2014 7:29 AM
To: Wood Scott-B07421
Cc: linuxppc-dev at lists.ozlabs.org; linux-kernel at vger.kernel.org; linux-arm-kernel at lists.infradead.org; Lu Jingchang-B35083
Subject: Re: [PATCHv4] clk: ppc-corenet: rename to ppc-qoriq and addCLK_OF_DECLAREsupportQuoting Scott Wood (2014-09-25 15:56:20)
Quoted 10 lines · Mike Turquette
Quoted 8 lines
Quoting Scott Wood (2014-09-25 13:08:00)
Quoted 3 lines
Well, like I said, I'd rather see the
CLK_OF_DECLAREstuff be made to work on PPC rather than have the driver carry around two binding methods.I guess that is an existing problem, and not related directly to this patch? This patch is essentially just renames (though the V1.0/V2.0 stuff seems weird).
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
This patch is adding
CLK_OF_DECLARE.I'm fine taking this patch but your comments are still unresolved. What do you think needs to be done to fix the problems that you see?
CLK_OF_DECLAREis totally worked on PPC. I will do it in a separate patch. Regarding V1.0 and V2.0, it is not wired just same for now. But we are not sureif it is same for v3.0 in the future.
Quoted 2 lines
Besides updating
drivers/cpufreq/Kconfig.powerpc, there is one more thing Iam not comfortable with:
Quoted 1 line
This patch uses " fixed-clock" as sysclk's compatible string, while on PPC we
Quoted 9 lines
treated it as " fsl,qoriq-sysclk-[1-2].0".
Quoted 1 line
That's inconsistent on both ARM and PPC platforms, neither did on bindings.
fsl,qoriq-sysclk-XXX is the way it is because of compatibility with the fixups in existing U-Boots. It shouldn't be used as a model.
That said, I don't think you really mean "this patch", as it doesn't contain the device tree updates, and "fixed-clock" does not appear.
"fixed-clock" will appear when ls102x platform DTS gets upstreamed eventually.
That would be fine if you don't think "fsl,qoriq-sysclk-xxx" having different meaning on ARM and PowerPC is a issue.
Thanks,
Yuantian
Quoted 2 lines
-Scott
Hi Jingchang,
Quoted 4 lines · 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_DECLAREsupport for being initialized byof_clk_init()on ARM.
I think you need to also update drivers/cpufreq/Kconfig.powerpc to use the renamed config option.
---
Best Regards, Laurentiu
Quoted 11 lines
-----Original Message-----
From: Tudor Laurentiu-B10716
Sent: Thursday, September 25, 2014 8:56 PM
To: Lu Jingchang-B35083; mturquette at linaro.org
Cc: Wood Scott-B07421; linuxppc-dev at lists.ozlabs.org; linux- kernel at vger.kernel.org; linux-arm-kernel at lists.infradead.org
Subject: Re: [PATCHv4] clk: ppc-corenet: rename to ppc-qoriq and addCLK_OF_DECLAREsupportHi Jingchang,
Quoted 9 lines
Quoted 4 lines · 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_DECLAREsupport for being initialized byof_clk_init()on ARM.I think you need to also update
drivers/cpufreq/Kconfig.powerpcto use the renamed config option.
Thanks, I will update that selected config option of CLK_PPC_CORENET.
Best Regards,
Jingchang
Quoted 2 lines
---
Best Regards, Laurentiu
PATCH v4 1/1 clk: ppc-corenet: rename to ppc-qoriq and add CLK_OF_DECLARE support
In reply to Jingchang LuQuoting Jingchang Lu (2014-09-22 23:46:46)
Quoted 116 lines
The IP is shared by PPC and ARM, this renames it to qoriq for better represention, and this also adds the
CLK_OF_DECLAREsupport for being initialized byof_clk_init()on ARM.Signed-off-by Jingchang Lu <[email protected]>---
changes in v4:
remove "corenet" literals omitted in v3 remove.changes in v3:
generate the patch with -M -C optionchanges in v2:
rename the driver name to ppc-qoriq.c for shared on PPC and ARM.drivers/clk/Kconfig | 9 +++++---- drivers/clk/Makefile | 2 +- drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} | 27 +++++++++++++++----------- 3 files changed, 22 insertions(+), 16 deletions(-) rename drivers/clk/{clk-ppc-corenet.c => clk-qoriq.c} (89%)drivers/clk/Kconfig +5
-4@@ -92,12 +92,13 @@ 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 PowerPC corenet and compatible ARM-based platforms" + depends on (PPC_E500MC || ARM) && OF ---help--- This adds the clock driver support for Freescale PowerPC corenet - platforms using common clock framework. + platforms and compatible Freescale ARM based platforms using common + clock framework. config COMMON_CLK_XGENE bool "Clock driver for APM XGene SoC"drivers/clk/Makefile +1
-1@@ -29,7 +29,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_S2MPS11) += clk-s2mps11.o obj-$(CONFIG_COMMON_CLK_SI5351) += clk-si5351.o obj-$(CONFIG_COMMON_CLK_SI570) += clk-si570.odrivers/clk/clk-qoriq.c renamed from drivers/clk/clk-ppc-corenet.c +9
-9@@ -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 ) {
drivers/clk/clk-qoriq.c static const struct of_device_id clk_match[] __initconst = { · line 312
Quoted 10 lines
drivers/clk/clk-qoriq.c renamed from drivers/clk/clk-ppc-corenet.c +7
-2-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);
Is there binding documentation for these compatibles?
Regards,
Mike
Quoted 3 lines
Signature · 1 line
1.8.0
Quoted 7 lines · Mike Turquette
Quoting Jingchang Lu (2014-09-22 23:46:46)
drivers/clk/clk-qoriq.c static const struct of_device_id clk_match[] __initconst = { · line 312
Quoted 4 lines
drivers/clk/clk-qoriq.c renamed from drivers/clk/clk-ppc-corenet.c +4
-0+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);Is there binding documentation for these compatibles?
Documentation/devicetree/bindings/clock/qoriq-clock.txt
-Scott