Skip to contentSkip to conversation

ARM: versatile: Don't use platform clock for Integrator & VE

PATCH New Pawel Moll 2 participants 3 messages Jul 25, 2012 Arm (32-bit)

lore
Share & tools
lore

Pawel Moll

author
#0 lore raw

PATCH 1/1 ARM: versatile: Don't use platform clock for Integrator & VE

Due to automatic merge of a613163dff04cbfcb7d66b06ef4a5f65498ee59b "ARM: integrator: convert to common clock" and 56a34b03ff427046494db87f05fc810aaedd23a5 "ARM: versatile: Make plat-versatile clock optional" two platforms: Integrator and Versatile Express now select both COMMON_CLK and PLAT_VERSATILE_CLOCK which breaks building them. Fixed now.

---
 arch/arm/Kconfig |    2 --
 1 file changed, 2 deletions(-)

Arnd, Olof,

Would you consider adding this patch to one of your late pull requests for 3.6 or do you want me to wait till 3.6-rc1?

Regards

Pawel

arch/arm/Kconfig +0 -2
index b25c9d3..9124ff7 100644
@@ -279,7 +279,6 @@ config ARCH_INTEGRATOR
 	select ICST
 	select GENERIC_CLOCKEVENTS
 	select PLAT_VERSATILE
-	select PLAT_VERSATILE_CLOCK
 	select PLAT_VERSATILE_FPGA_IRQ
 	select NEED_MACH_IO_H
 	select NEED_MACH_MEMORY_H
@@ -336,7 +335,6 @@ config ARCH_VEXPRESS
 	select ICST
 	select NO_IOPORT
 	select PLAT_VERSATILE
-	select PLAT_VERSATILE_CLOCK
 	select PLAT_VERSATILE_CLCD
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 	help
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 ARM: versatile: Don't use platform clock for Integrator & VE

Quoted 8 lines · Pawel Moll

Due to automatic merge of a613163dff04cbfcb7d66b06ef4a5f65498ee59b "ARM: integrator: convert to common clock" and 56a34b03ff427046494db87f05fc810aaedd23a5 "ARM: versatile: Make plat-versatile clock optional" two platforms: Integrator and Versatile Express now select both COMMON_CLK and PLAT_VERSATILE_CLOCK which breaks building them. Fixed now.

Quoted 8 lines
---
 arch/arm/Kconfig |    2 --
 1 file changed, 2 deletions(-)

Arnd, Olof,

Would you consider adding this patch to one of your late pull requests for 3.6 or do you want me to wait till 3.6-rc1?

Applied to the fixes branch. I still don't see why this happened, but the result is obviously broken and your patch looks good.

Arnd

#2 lore raw

PATCH 1/1 ARM: versatile: Don't use platform clock for Integrator & VE

In reply to Pawel Moll
Quoted 8 lines · Pawel Moll

Due to automatic merge of a613163dff04cbfcb7d66b06ef4a5f65498ee59b "ARM: integrator: convert to common clock" and 56a34b03ff427046494db87f05fc810aaedd23a5 "ARM: versatile: Make plat-versatile clock optional" two platforms: Integrator and Versatile Express now select both COMMON_CLK and PLAT_VERSATILE_CLOCK which breaks building them. Fixed now.

Quoted 9 lines
---
 arch/arm/Kconfig |    2 --
 1 file changed, 2 deletions(-)

Arnd, Olof,

Would you consider adding this patch to one of your late pull requests for 3.6 or do you want me to wait till 3.6-rc1?

Applied to fixes branch now.

There is never a reason to delay bug fixes IMHO, although you may want to test them more in cases where there is a risk of regressions.

Arnd