clk: pxa clocks build system fix
PATCH 1/1 clk: pxa clocks build system fix
Fix the building of pxa clock drivers so that the files are actually compiled if and only if COMMON_CLK was selected by the architecture.
This prevents conflicts with mach-pxa clock legacy implementation.
--- drivers/clk/Kconfig | 5 +++++ drivers/clk/Makefile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/clk/Kconfig +5 -0
@@ -109,6 +109,11 @@ config COMMON_CLK_PALMAS This driver supports TI Palmas devices 32KHz output KG and KG_AUDIO using common clock framework. +config COMMON_CLK_PXA + def_bool COMMON_CLK && ARCH_PXA + ---help--- + Sypport for the Marvell PXA SoC. + source "drivers/clk/qcom/Kconfig" endmenu
drivers/clk/Makefile +1 -1
@@ -48,7 +48,7 @@ obj-$(CONFIG_ARCH_MMP) += mmp/ endif obj-$(CONFIG_PLAT_ORION) += mvebu/ obj-$(CONFIG_ARCH_MXS) += mxs/ -obj-$(CONFIG_ARCH_PXA) += pxa/ +obj-$(CONFIG_COMMON_CLK_PXA) += pxa/ obj-$(CONFIG_COMMON_CLK_QCOM) += qcom/ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ obj-$(CONFIG_COMMON_CLK_SAMSUNG) += samsung/
Signature · 1 line
2.1.0
Mike Turquette
AppliedPATCH 1/1 clk: pxa clocks build system fix
Quoting Robert Jarzmik (2014-10-01 14:39:29)
Quoted 6 lines
Fix the building of pxa clock drivers so that the files are actually compiled if and only if
COMMON_CLKwas selected by the architecture.This prevents conflicts with mach-pxa clock legacy implementation.
Signed-off-by Robert Jarzmik <[email protected]>
Applied.
Thanks,
Mike
Quoted 37 lines
--- drivers/clk/Kconfig | 5 +++++ drivers/clk/Makefile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)drivers/clk/Kconfig +5
-0@@ -109,6 +109,11 @@ config COMMON_CLK_PALMAS This driver supports TI Palmas devices 32KHz output KG and KG_AUDIO using common clock framework. +config COMMON_CLK_PXA + def_bool COMMON_CLK && ARCH_PXA + ---help--- + Sypport for the Marvell PXA SoC. + source "drivers/clk/qcom/Kconfig" endmenudrivers/clk/Makefile +1
-1@@ -48,7 +48,7 @@ obj-$(CONFIG_ARCH_MMP) += mmp/ endif obj-$(CONFIG_PLAT_ORION) += mvebu/ obj-$(CONFIG_ARCH_MXS) += mxs/ -obj-$(CONFIG_ARCH_PXA) += pxa/ +obj-$(CONFIG_COMMON_CLK_PXA) += pxa/ obj-$(CONFIG_COMMON_CLK_QCOM) += qcom/ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ obj-$(CONFIG_COMMON_CLK_SAMSUNG) += samsung/Signature · 1 line
2.1.0
PATCH 1/1 clk: pxa clocks build system fix
Quoted 8 lines · On Sunday 05 October 2014 13:43:58 Mike Turquette wrote:
Quoting Robert Jarzmik (2014-10-01 14:39:29)
Quoted 6 lines
Fix the building of pxa clock drivers so that the files are actually compiled if and only if
COMMON_CLKwas selected by the architecture.This prevents conflicts with mach-pxa clock legacy implementation.
Signed-off-by Robert Jarzmik <[email protected]>
I seem to still hit a build error with this applied in e.g. build/palmz72_defconfig, which enables both pxa25x and pxa27x, so I get both the pxa250 private clock code and the pxa270 common clock code, resulting in this error message:
drivers/built-in.o:(___ksymtab_gpl+clk_enable+0x0): multiple definition of __ksymtab_clk_enable' arch/arm/mach-pxa/built-in.o:(___ksymtab+clk_enable+0x0): first defined here drivers/built-in.o:(___ksymtab_gpl+clk_get_rate+0x0): multiple definition of __ksymtab_clk_get_rate' arch/arm/mach-pxa/built-in.o:(___ksymtab+clk_get_rate+0x0): first defined here drivers/built-in.o:(___ksymtab_gpl+clk_round_rate+0x0): multiple definition of __ksymtab_clk_round_rate' arch/arm/mach-pxa/built-in.o:(___ksymtab+clk_round_rate+0x0): first defined here drivers/built-in.o: In function clk_set_rate':
:(.text+0x86930): multiple definition of `clk_set_rate' arch/arm/mach-pxa/built-in.o::(.text+0x103c): first defined heredrivers/built-in.o: In function `clk_set_parent':
:(.text+0x869c4): multiple definition of `clk_set_parent' arch/arm/mach-pxa/built-in.o::(.text+0x127c): first defined heredrivers/built-in.o: In function `clk_round_rate':
:(.text+0x85c18): multiple definition of clk_round_rate' arch/arm/mach-pxa/built-in.o::(.text+0x1248): first defined here drivers/built-in.o:(___ksymtab_gpl+clk_set_parent+0x0): multiple definition of __ksymtab_clk_set_parent' arch/arm/mach-pxa/built-in.o:(___ksymtab+clk_set_parent+0x0): first defined here drivers/built-in.o:(___ksymtab_gpl+clk_disable+0x0): multiple definition of __ksymtab_clk_disable' arch/arm/mach-pxa/built-in.o:(___ksymtab+clk_disable+0x0): first defined here drivers/built-in.o: In function clk_get_rate':
:(.text+0x85c64): multiple definition of clk_get_rate' arch/arm/mach-pxa/built-in.o::(.text+0x1014): first defined here drivers/built-in.o:(___ksymtab_gpl+clk_set_rate+0x0): multiple definition of __ksymtab_clk_set_rate' arch/arm/mach-pxa/built-in.o:(___ksymtab+clk_set_rate+0x0): first defined here drivers/built-in.o: In function `clk_get_parent':
:(.text+0x85c44): multiple definition of `clk_get_parent' arch/arm/mach-pxa/built-in.o::(.text+0x12b0): first defined heredrivers/built-in.o: In function `clk_disable':
:(.text+0x85b08): multiple definition of clk_disable' arch/arm/mach-pxa/built-in.o::(.text+0x118c): first defined here drivers/built-in.o:(___ksymtab_gpl+clk_get_parent+0x0): multiple definition of __ksymtab_clk_get_parent' arch/arm/mach-pxa/built-in.o:(___ksymtab+clk_get_parent+0x0): first defined here drivers/built-in.o: In function `clk_enable':
:(.text+0x85808): multiple definition of `clk_enable' arch/arm/mach-pxa/built-in.o::(.text+0x10d8): first defined here
Arnd
PATCH 1/1 clk: pxa clocks build system fix
Quoted 7 lines · Arnd Bergmann
Quoted 6 lines · On Sunday 05 October 2014 13:43:58 Mike Turquette wrote:
Quoting Robert Jarzmik (2014-10-01 14:39:29)
Quoted 5 lines
Fix the building of pxa clock drivers so that the files are actually compiled if and only if
COMMON_CLKwas selected by the architecture.This prevents conflicts with mach-pxa clock legacy implementation.
Quoted 7 lines
Quoted 2 lines
Quoted 1 line
Signed-off-by Robert Jarzmik <[email protected]>I seem to still hit a build error with this applied in e.g. build/palmz72_defconfig, which enables both pxa25x and pxa27x, so I get both the pxa250 private clock code and the pxa270 common clock code, resulting in this error message:
Do you have the patch "Revert "arm: pxa: Transition pxa27x to clk framework" in your tree ?
Normally the fix was made of :
- the fixup patch "clk: pxa clocks build system fix"
- the revert queued by Mike "arm: pxa: Transition pxa27x to clk framework"
Cheers.
--
Robert
PATCH 1/1 clk: pxa clocks build system fix
Quoted 16 lines · On Monday 06 October 2014 23:25:13 Robert Jarzmik wrote:
Quoted 7 lines · Arnd Bergmann
Quoted 6 lines · On Sunday 05 October 2014 13:43:58 Mike Turquette wrote:
Quoting Robert Jarzmik (2014-10-01 14:39:29)
Quoted 5 lines
Fix the building of pxa clock drivers so that the files are actually compiled if and only if
COMMON_CLKwas selected by the architecture.This prevents conflicts with mach-pxa clock legacy implementation.
Quoted 7 lines
Quoted 2 lines
Quoted 1 line
Signed-off-by Robert Jarzmik <[email protected]>I seem to still hit a build error with this applied in e.g. build/palmz72_defconfig, which enables both pxa25x and pxa27x, so I get both the pxa250 private clock code and the pxa270 common clock code, resulting in this error message:
Quoted 6 lines
Do you have the patch "Revert "arm: pxa: Transition pxa27x to clk framework" in your tree ?
Normally the fix was made of :
- the fixup patch "clk: pxa clocks build system fix"
- the revert queued by Mike "arm: pxa: Transition pxa27x to clk framework"
No, I was missing that one, sorry for the noise. It works now after I've applied it. I was using the latest -next kernel as a base and assumed that it had all the latest fixes from Mike's tree.
Arnd
PATCH 1/1 clk: pxa clocks build system fix
Quoting Arnd Bergmann (2014-10-06 14:36:43)
Quoted 20 lines · On Monday 06 October 2014 23:25:13 Robert Jarzmik wrote:
Quoted 19 lines
Quoted 7 lines · Arnd Bergmann
Quoted 6 lines · On Sunday 05 October 2014 13:43:58 Mike Turquette wrote:
Quoting Robert Jarzmik (2014-10-01 14:39:29)
Quoted 5 lines
Fix the building of pxa clock drivers so that the files are actually compiled if and only if
COMMON_CLKwas selected by the architecture.This prevents conflicts with mach-pxa clock legacy implementation.
Quoted 7 lines
Quoted 2 lines
Quoted 1 line
Signed-off-by Robert Jarzmik <[email protected]>I seem to still hit a build error with this applied in e.g. build/palmz72_defconfig, which enables both pxa25x and pxa27x, so I get both the pxa250 private clock code and the pxa270 common clock code, resulting in this error message:
Do you have the patch "Revert "arm: pxa: Transition pxa27x to clk framework" in your tree ?
Quoted 7 lines
Quoted 3 lines
Normally the fix was made of :
- the fixup patch "clk: pxa clocks build system fix"
- the revert queued by Mike "arm: pxa: Transition pxa27x to clk framework"No, I was missing that one, sorry for the noise. It works now after I've applied it. I was using the latest -next kernel as a base and assumed that it had all the latest fixes from Mike's tree.
I pushed the changes to my mirror over the weekend. I guess -next hasn't picked it up. I'm waiting for a couple of -next cycles this week before I push my tag to Linus.
Regards,
Mike
Quoted 2 lines
Arnd
PATCH 1/1 clk: pxa clocks build system fix
Quoted 4 lines · On Monday 06 October 2014 15:15:16 Mike Turquette wrote:
I pushed the changes to my mirror over the weekend. I guess -next hasn't picked it up. I'm waiting for a couple of -next cycles this week before I push my tag to Linus.
I think there was no linux-next yesterday. Today's -next just arrived and it has the fix.
Arnd