Skip to contentSkip to conversation

ARM: spear: Remove references to PLAT_SPEAR_SINGLE

PATCH Superseded Paul Bolle 5 participants 13 messages Feb 11, 2014 – Sep 5, 2014

Subsystems (3)
lore
Share & tools
lore

Paul Bolle

author
#0 lore raw

PATCH 1/1 ARM: spear: Remove references to PLAT_SPEAR_SINGLE

The Kconfig symbol PLAT_SPEAR_SINGLE briefly appeared during the v3.10 development cycle. It was removed in a merge commit before v3.10. A few references to it were left in the tree, probably because they didn't generate merge conflicts. Whatever it was, they're useless now and can safely be removed.

---
Untested.

 arch/arm/mach-spear/Kconfig | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
arch/arm/mach-spear/Kconfig +3 -5
index ac1710e6..1595776 100644
@@ -4,7 +4,6 @@
 
 menuconfig PLAT_SPEAR
 	bool "ST SPEAr Family" if ARCH_MULTI_V7 || ARCH_MULTI_V5
-	default PLAT_SPEAR_SINGLE
 	select ARCH_REQUIRE_GPIOLIB
 	select ARM_AMBA
 	select CLKSRC_MMIO
@@ -15,7 +14,7 @@ if PLAT_SPEAR
 
 config ARCH_SPEAR13XX
 	bool "ST SPEAr13xx"
-	depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE
+	depends on ARCH_MULTI_V7
 	select ARCH_HAS_CPUFREQ
 	select ARM_GIC
 	select CPU_V7
@@ -47,7 +46,7 @@ endif #ARCH_SPEAR13XX
 
 config ARCH_SPEAR3XX
 	bool "ST SPEAr3xx"
-	depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE
+	depends on ARCH_MULTI_V5
 	depends on !ARCH_SPEAR13XX
 	select ARM_VIC
 	select CPU_ARM926T
@@ -80,7 +79,7 @@ endif
 
 config ARCH_SPEAR6XX
 	bool "ST SPEAr6XX"
-	depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE
+	depends on ARCH_MULTI_V5
 	depends on !ARCH_SPEAR13XX
 	select ARM_VIC
 	select CPU_ARM926T
@@ -95,7 +94,6 @@ config MACH_SPEAR600
 	  Supports ST SPEAr600 boards configured via the device-treesource "arch/arm/mach-spear6xx/Kconfig"
 
 config ARCH_SPEAR_AUTO
-	def_bool PLAT_SPEAR_SINGLE
 	depends on !ARCH_SPEAR13XX && !ARCH_SPEAR6XX
 	select ARCH_SPEAR3XX
 
Signature · 1 line
1.8.5.3
author
#1 lore raw

I got a bounce for Shiraz' address. Has Shiraz left ST?

Paul Bolle

author
#2 lore raw

PATCH v2 1/1 ARM: spear: Remove references to PLAT_SPEAR_SINGLE

In reply to Paul Bolle

The Kconfig symbol PLAT_SPEAR_SINGLE briefly appeared during the v3.10 development cycle. It was removed in a merge commit before v3.10. A few references to it were left in the tree, probably because they didn't generate merge conflicts. Whatever it was, they're useless now and can safely be removed.

---
0) First version was broken: it left config ARCH_SPEAR_AUTO without its bool type. This version is done on top of v3.15-rc1.

1) Still untested.

 arch/arm/mach-spear/Kconfig | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
arch/arm/mach-spear/Kconfig +4 -5
index 0786249b2832..bc8a11c53377 100644
@@ -4,7 +4,6 @@
 
 menuconfig PLAT_SPEAR
 	bool "ST SPEAr Family" if ARCH_MULTI_V7 || ARCH_MULTI_V5
-	default PLAT_SPEAR_SINGLE
 	select ARCH_REQUIRE_GPIOLIB
 	select ARM_AMBA
 	select CLKSRC_MMIO
@@ -13,7 +12,7 @@ if PLAT_SPEAR
 
 config ARCH_SPEAR13XX
 	bool "ST SPEAr13xx"
-	depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE
+	depends on ARCH_MULTI_V7
 	select ARCH_HAS_CPUFREQ
 	select ARM_GIC
 	select GPIO_SPEAR_SPICS
@@ -41,7 +40,7 @@ endif #ARCH_SPEAR13XX
 
 config ARCH_SPEAR3XX
 	bool "ST SPEAr3xx"
-	depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE
+	depends on ARCH_MULTI_V5
 	depends on !ARCH_SPEAR13XX
 	select ARM_VIC
 	select PINCTRL
@@ -72,7 +71,7 @@ endif
 
 config ARCH_SPEAR6XX
 	bool "ST SPEAr6XX"
-	depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE
+	depends on ARCH_MULTI_V5
 	depends on !ARCH_SPEAR13XX
 	select ARM_VIC
 	help
@@ -85,7 +84,7 @@ config MACH_SPEAR600
 	  Supports ST SPEAr600 boards configured via the device-tree
 
 config ARCH_SPEAR_AUTO
-	def_bool PLAT_SPEAR_SINGLE
+	bool
 	depends on !ARCH_SPEAR13XX && !ARCH_SPEAR6XX
 	select ARCH_SPEAR3XX
 
Signature · 1 line
1.9.0
Reviewed-by on v2 1/1
#3 lore raw
Quoted 58 lines · Paul Bolle

The Kconfig symbol PLAT_SPEAR_SINGLE briefly appeared during the v3.10 development cycle. It was removed in a merge commit before v3.10. A few references to it were left in the tree, probably because they didn't generate merge conflicts. Whatever it was, they're useless now and can safely be removed.

---
0) First version was broken: it left config ARCH_SPEAR_AUTO without its bool type. This version is done on top of v3.15-rc1.

1) Still untested.

  arch/arm/mach-spear/Kconfig | 9 ++++-----
  1 file changed, 4 insertions(+), 5 deletions(-)
arch/arm/mach-spear/Kconfig +3 -4
index 0786249b2832..bc8a11c53377 100644
@@ -4,7 +4,6 @@
 
  menuconfig PLAT_SPEAR
  	bool "ST SPEAr Family" if ARCH_MULTI_V7 || ARCH_MULTI_V5
-	default PLAT_SPEAR_SINGLE
  	select ARCH_REQUIRE_GPIOLIB
  	select ARM_AMBA
  	select CLKSRC_MMIO
@@ -13,7 +12,7 @@ if PLAT_SPEAR
 
  config ARCH_SPEAR13XX
  	bool "ST SPEAr13xx"
-	depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE
+	depends on ARCH_MULTI_V7
  	select ARCH_HAS_CPUFREQ
  	select ARM_GIC
  	select GPIO_SPEAR_SPICS
@@ -41,7 +40,7 @@ endif #ARCH_SPEAR13XX
 
  config ARCH_SPEAR3XX
  	bool "ST SPEAr3xx"
-	depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE
+	depends on ARCH_MULTI_V5
  	depends on !ARCH_SPEAR13XX
  	select ARM_VIC
  	select PINCTRL
@@ -72,7 +71,7 @@ endif
 
  config ARCH_SPEAR6XX
  	bool "ST SPEAr6XX"
-	depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE
+	depends on ARCH_MULTI_V5
  	depends on !ARCH_SPEAR13XX
  	select ARM_VIC
  	help

arch/arm/mach-spear/Kconfig config MACH_SPEAR600 · line 90

Quoted 8 lines
arch/arm/mach-spear/Kconfig +1 -1
@@ -85,7 +84,7 @@ config MACH_SPEAR600
  	  Supports ST SPEAr600 boards configured via the device-tree
 
  config ARCH_SPEAR_AUTO
-	def_bool PLAT_SPEAR_SINGLE
+	bool
  	depends on !ARCH_SPEAR13XX && !ARCH_SPEAR6XX
  	select ARCH_SPEAR3XX
 
author
#4 lore raw
Quoted 60 lines · Rajeev kumar
Quoted 59 lines · Paul Bolle

The Kconfig symbol PLAT_SPEAR_SINGLE briefly appeared during the v3.10 development cycle. It was removed in a merge commit before v3.10. A few references to it were left in the tree, probably because they didn't generate merge conflicts. Whatever it was, they're useless now and can safely be removed.

---
0) First version was broken: it left config ARCH_SPEAR_AUTO without its bool type. This version is done on top of v3.15-rc1.

1) Still untested.

  arch/arm/mach-spear/Kconfig | 9 ++++-----
  1 file changed, 4 insertions(+), 5 deletions(-)
arch/arm/mach-spear/Kconfig +3 -4
index 0786249b2832..bc8a11c53377 100644
@@ -4,7 +4,6 @@
 
  menuconfig PLAT_SPEAR
  	bool "ST SPEAr Family" if ARCH_MULTI_V7 || ARCH_MULTI_V5
-	default PLAT_SPEAR_SINGLE
  	select ARCH_REQUIRE_GPIOLIB
  	select ARM_AMBA
  	select CLKSRC_MMIO
@@ -13,7 +12,7 @@ if PLAT_SPEAR
 
  config ARCH_SPEAR13XX
  	bool "ST SPEAr13xx"
-	depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE
+	depends on ARCH_MULTI_V7
  	select ARCH_HAS_CPUFREQ
  	select ARM_GIC
  	select GPIO_SPEAR_SPICS
@@ -41,7 +40,7 @@ endif #ARCH_SPEAR13XX
 
  config ARCH_SPEAR3XX
  	bool "ST SPEAr3xx"
-	depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE
+	depends on ARCH_MULTI_V5
  	depends on !ARCH_SPEAR13XX
  	select ARM_VIC
  	select PINCTRL
@@ -72,7 +71,7 @@ endif
 
  config ARCH_SPEAR6XX
  	bool "ST SPEAr6XX"
-	depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE
+	depends on ARCH_MULTI_V5
  	depends on !ARCH_SPEAR13XX
  	select ARM_VIC
  	help
@@ -85,7 +84,7 @@ config MACH_SPEAR600
  	  Supports ST SPEAr600 boards configured via the device-tree
 
Quoted 10 lines

arch/arm/mach-spear/Kconfig config MACH_SPEAR600 · line 90

Quoted 7 lines
arch/arm/mach-spear/Kconfig +1 -1
  config ARCH_SPEAR_AUTO
-	def_bool PLAT_SPEAR_SINGLE
+	bool
  	depends on !ARCH_SPEAR13XX && !ARCH_SPEAR6XX
  	select ARCH_SPEAR3XX
 

Thanks!

This can still be seen in v3.16-rc1 and in today's linux-next (ie, next-20140616). Is this trivial patch queued somewhere?

Paul Bolle

author
#5 lore raw
Quoted 72 lines · Paul Bolle
Quoted 60 lines · Rajeev kumar
Quoted 59 lines · Paul Bolle

The Kconfig symbol PLAT_SPEAR_SINGLE briefly appeared during the v3.10 development cycle. It was removed in a merge commit before v3.10. A few references to it were left in the tree, probably because they didn't generate merge conflicts. Whatever it was, they're useless now and can safely be removed.

---
0) First version was broken: it left config ARCH_SPEAR_AUTO without its bool type. This version is done on top of v3.15-rc1.

1) Still untested.

  arch/arm/mach-spear/Kconfig | 9 ++++-----
  1 file changed, 4 insertions(+), 5 deletions(-)
arch/arm/mach-spear/Kconfig +3 -4
index 0786249b2832..bc8a11c53377 100644
@@ -4,7 +4,6 @@
 
  menuconfig PLAT_SPEAR
  	bool "ST SPEAr Family" if ARCH_MULTI_V7 || ARCH_MULTI_V5
-	default PLAT_SPEAR_SINGLE
  	select ARCH_REQUIRE_GPIOLIB
  	select ARM_AMBA
  	select CLKSRC_MMIO
@@ -13,7 +12,7 @@ if PLAT_SPEAR
 
  config ARCH_SPEAR13XX
  	bool "ST SPEAr13xx"
-	depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE
+	depends on ARCH_MULTI_V7
  	select ARCH_HAS_CPUFREQ
  	select ARM_GIC
  	select GPIO_SPEAR_SPICS
@@ -41,7 +40,7 @@ endif #ARCH_SPEAR13XX
 
  config ARCH_SPEAR3XX
  	bool "ST SPEAr3xx"
-	depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE
+	depends on ARCH_MULTI_V5
  	depends on !ARCH_SPEAR13XX
  	select ARM_VIC
  	select PINCTRL
@@ -72,7 +71,7 @@ endif
 
  config ARCH_SPEAR6XX
  	bool "ST SPEAr6XX"
-	depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE
+	depends on ARCH_MULTI_V5
  	depends on !ARCH_SPEAR13XX
  	select ARM_VIC
  	help
@@ -85,7 +84,7 @@ config MACH_SPEAR600
  	  Supports ST SPEAr600 boards configured via the device-tree
 
Quoted 10 lines

arch/arm/mach-spear/Kconfig config MACH_SPEAR600 · line 90

Quoted 7 lines
arch/arm/mach-spear/Kconfig +1 -1
  config ARCH_SPEAR_AUTO
-	def_bool PLAT_SPEAR_SINGLE
+	bool
  	depends on !ARCH_SPEAR13XX && !ARCH_SPEAR6XX
  	select ARCH_SPEAR3XX
 
Quoted 4 lines

Thanks!

This can still be seen in v3.16-rc1 and in today's linux-next (ie, next-20140616). Is this trivial patch queued somewhere?

Ditto for v3.17-rc3 and next-20140904. Could someone please pix this up?

Paul Bolle

author
#6 lore raw
Quoted 10 lines · Paul Bolle
Quoted 7 lines · Paul Bolle
Quoted 1 line · Rajeev kumar

Thanks!

This can still be seen in v3.16-rc1 and in today's linux-next (ie, next-20140616). Is this trivial patch queued somewhere?

Ditto for v3.17-rc3 and next-20140904. Could someone please pix this up?

And now Rajeev's address bounces. Has Rajeev left ST?

Paul Bolle

Acked-by
#7 lore raw
Quoted 1 line · Paul Bolle
Quoted 1 line

Ditto for v3.17-rc3 and next-20140904. Could someone please pix this up?

You need to send it to arm at kernel.org..

Quoted 1 line

And now Rajeev's address bounces. Has Rajeev left ST?

Yeah both Shiraz/Rajeev and myself have left ST :)

You can add

--
viresh

author
#8 lore raw

Viresh,

Quoted 4 lines · Viresh Kumar
Quoted 1 line · Paul Bolle
Quoted 1 line

Ditto for v3.17-rc3 and next-20140904. Could someone please pix this up?

You need to send it to arm at kernel.org..

Will do, no problem. But why actually? (Note that MAINTAINERS is silent on arm at kernel.org. Maybe that address is documented elsewhere.)

Quoted 3 lines
Quoted 1 line

And now Rajeev's address bounces. Has Rajeev left ST?

Yeah both Shiraz/Rajeev and myself have left ST :)

I see. Is there a current address for Rajeev.? I will not keep an Acked-by on a bouncing address.

Quoted 2 lines

You can add

Thanks,

Paul Bolle

#9 lore raw
Quoted 8 lines · Paul Bolle
Quoted 4 lines · Viresh Kumar
Quoted 1 line · Paul Bolle
Quoted 1 line

Ditto for v3.17-rc3 and next-20140904. Could someone please pix this up?

You need to send it to arm at kernel.org..

Will do, no problem. But why actually? (Note that MAINTAINERS is silent on arm at kernel.org. Maybe that address is documented elsewhere.)

Don't know where it is documented.

@Arnd: ??

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

And now Rajeev's address bounces. Has Rajeev left ST?

Yeah both Shiraz/Rajeev and myself have left ST :)

I see. Is there a current address for Rajeev.? I will not keep an Acked-by on a bouncing address.

rajivrec at gmail.com

Quoted 4 lines
Quoted 2 lines

You can add

Thanks,

Welcome !!

Reviewed-by Rajeev Kumar Acked-by Viresh Kumar
#10 lore raw
Quoted 5 lines · On Friday 05 September 2014 15:24:31 Viresh Kumar wrote:
Quoted 4 lines · Paul Bolle
Quoted 3 lines · Viresh Kumar
Quoted 1 line · Paul Bolle
Quoted 1 line

Ditto for v3.17-rc3 and next-20140904. Could someone please pix this up?

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

You need to send it to arm at kernel.org..

Will do, no problem. But why actually? (Note that MAINTAINERS is silent on arm at kernel.org. Maybe that address is documented elsewhere.)

Don't know where it is documented.

@Arnd: ??

We have avoided documenting it so far, to avoid getting spammed with trivial patches that should get picked up by the subarch maintainers instead.

I've applied this patch to the next/fixes-non-critical branch now, with minor fixup for a conflict that has come in. See below for the final version.

Arnd

---
commit 3b0b8ec99aadea710f3dece74c95523463c0087a

Author: Paul Bolle <[email protected]>
Date:   Tue Apr 15 10:26:47 2014 +0200

ARM: spear: Remove references to PLAT_SPEAR_SINGLE

The Kconfig symbol PLAT_SPEAR_SINGLE briefly appeared during the v3.10 development cycle. It was removed in a merge commit before v3.10. A few references to it were left in the tree, probably because they didn't generate merge conflicts. Whatever it was, they're useless now and can safely be removed.

arch/arm/mach-spear/Kconfig +4 -5
index 6fd4dc88160b..b6f4bda273b3 100644
@@ -4,7 +4,6 @@
 
 menuconfig PLAT_SPEAR
 	bool "ST SPEAr Family" if ARCH_MULTI_V7 || ARCH_MULTI_V5
-	default PLAT_SPEAR_SINGLE
 	select ARCH_REQUIRE_GPIOLIB
 	select ARM_AMBA
 	select CLKSRC_MMIO
@@ -13,7 +12,7 @@ if PLAT_SPEAR
 
 config ARCH_SPEAR13XX
 	bool "ST SPEAr13xx"
-	depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE
+	depends on ARCH_MULTI_V7
 	select ARM_GIC
 	select GPIO_SPEAR_SPICS
 	select HAVE_ARM_SCU if SMP
@@ -44,7 +43,7 @@ endif #ARCH_SPEAR13XX
 
 config ARCH_SPEAR3XX
 	bool "ST SPEAr3xx"
-	depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE
+	depends on ARCH_MULTI_V5
 	depends on !ARCH_SPEAR13XX
 	select ARM_VIC
 	select PINCTRL
@@ -75,7 +74,7 @@ endif
 
 config ARCH_SPEAR6XX
 	bool "ST SPEAr6XX"
-	depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE
+	depends on ARCH_MULTI_V5
 	depends on !ARCH_SPEAR13XX
 	select ARM_VIC
 	help
@@ -88,7 +87,7 @@ config MACH_SPEAR600
 	  Supports ST SPEAr600 boards configured via the device-tree
 
 config ARCH_SPEAR_AUTO
-	def_bool PLAT_SPEAR_SINGLE
+	bool
 	depends on !ARCH_SPEAR13XX && !ARCH_SPEAR6XX
 	select ARCH_SPEAR3XX
 
author
#11 lore raw
Quoted 2 lines · Arnd Bergmann

I've applied this patch to the next/fixes-non-critical branch now, with minor fixup for a conflict that has come in. See below for the final version.

Thanks for picking this up!

Paul Bolle

#12 lore raw
In reply to Paul Bolle
Quoted 19 lines

-----Original Message-----
From: linux-arm-kernel [mailto:linux-arm-kernel- bounces at lists.infradead.org] On Behalf Of Paul Bolle
Sent: Friday, September 05, 2014 3:09 PM
To: Viresh Kumar; Shiraz Hashim
Cc: Russell King; Richard Weinberger; Martin Walch; spear- devel at list.st.com; linux-kernel at vger.kernel.org; linux-arm- kernel at lists.infradead.org
Subject: Re: [PATCH v2] ARM: spear: Remove references to PLAT_SPEAR_SINGLE

Quoted 6 lines · Paul Bolle
Quoted 5 lines · Paul Bolle
Quoted 1 line · Rajeev kumar

Thanks!

Quoted 9 lines
Quoted 4 lines
Quoted 2 lines

This can still be seen in v3.16-rc1 and in today's linux-next (ie, next-20140616). Is this trivial patch queued somewhere?

Ditto for v3.17-rc3 and next-20140904. Could someone please pix this

up?

And now Rajeev's address bounces. Has Rajeev left ST?

Copying Rajeev' new id.

Regards,
Bhupesh

Quoted 7 lines

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel