ARCH_BCM rename

PATCH New Christian Daudt 5 participants 12 messages Sep 23, 2013 – Mar 24, 2014

Subsystems (7)

Device tree bindings Arm (32-bit) Arm sub-architectures MMC, SD and SDIO +3 more subsystems

lore

Share & tools

lore

Christian Daudt

author

2013-09-23 17:20 UTC #0 lore raw

v2 cover ARCH_BCM rename

Rename ARCH_BCM to ARCH_BCM_MOBILE. Currently only the Broadcom mobile SoCs reside in the mach-bcm directory and are chosen by the ARCH_BCM config option.
This patchset changes so that ARCH_BCM becomes a menu select
for Broadcom ARM SoCs. ARCH_BCM_MOBILE is created to signify the (multiplatform) Mobile SoCs.

Christian Daudt (4):
rename ARCH_BCM to ARCH_BCM_MOBILE (mach-bcm) rename ARCH_BCM to ARCH_BCM_MOBILE (clocksource) rename ARCH_BCM to ARCH_BCM_MOBILE (mmc) rename ARCH_BCM to ARCH_BCM_MOBILE (dt)

 arch/arm/boot/dts/Makefile          |    4 ++--
 arch/arm/configs/bcm_defconfig      |    1 +
 arch/arm/configs/multi_v7_defconfig |    1 +
 arch/arm/mach-bcm/Kconfig           |   20 ++++++++++++++++++--
 arch/arm/mach-bcm/Makefile          |    2 +-
 drivers/clocksource/Makefile        |    2 +-
 drivers/mmc/host/Kconfig            |    2 +-
 7 files changed, 25 insertions(+), 7 deletions(-)

Signature · 1 line

1.7.10.4

Christian Daudt

author

2013-09-23 17:20 UTC #1 lore raw

PATCH v2 1/4 rename ARCH_BCM to ARCH_BCM_MOBILE (mach-bcm)

Currently ARCH_BCM has been used for Broadcom Mobile V7 based SoCs. In order to allow other Broadcom SoCs to also use mach-bcm directory and files, this patch renames the original ARCH_BCM to ARCH_BCM_MOBILE, and uses ARCH_BCM to define any Broadcom chip residing in mach-bcm directory.

Signed-off-by Christian Daudt <[email protected]>

Acked-by Olof Johansson <[email protected]>

Changes from v1:
- fix alpha ordering in dts/Makefile
- break into 4 patches for separate subsys

arch/arm/configs/bcm_defconfig +1 -0

index 6e49310..efb0132 100644
@@ -27,6 +27,7 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_EFI_PARTITION=y
 CONFIG_ARCH_BCM=y
+CONFIG_ARCH_BCM_MOBILE=y
 CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_ERRATA_743622=y
 CONFIG_PREEMPT=y

arch/arm/configs/multi_v7_defconfig +1 -0

index 6e572c6..89a5064 100644
@@ -6,6 +6,7 @@ CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_ARMADA_370=y
 CONFIG_MACH_ARMADA_XP=y
 CONFIG_ARCH_BCM=y
+CONFIG_ARCH_BCM_MOBILE=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_KEYSTONE=y

arch/arm/mach-bcm/Kconfig +18 -2

index 69d67f7..af86cda 100644
@@ -1,5 +1,17 @@
 config ARCH_BCM
-	bool "Broadcom SoC" if ARCH_MULTI_V7
+	bool "Broadcom SoC Support"
+	select ARCH_MULTIPLATFORM
+	help
+	  This enables support for Broadcom ARM based SoC
+          chips
+
+if ARCH_BCM
+
+menu "Broadcom SoC Selection"
+
+config ARCH_BCM_MOBILE
+	bool "Broadcom Mobile SoC" if ARCH_MULTI_V7
+	default y
 	depends on MMU
 	select ARCH_REQUIRE_GPIOLIB
 	select ARM_ERRATA_754322

@@ -14,7 +26,11 @@ config ARCH_BCM
 	select TICK_ONESHOT
 	select CACHE_L2X0
 	help
-	  This enables support for system based on Broadcom SoCs.
+	  This enables support for systems based on Broadcom mobile SoCs.
 	  It currently supports the 'BCM281XX' family, which includes
 	  BCM11130, BCM11140, BCM11351, BCM28145 and
 	  BCM28155 variants.
+
+endmenu
+
+endif

arch/arm/mach-bcm/Makefile +1 -1

index e3d0303..c2ccd5a 100644
@@ -10,6 +10,6 @@
 # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-obj-$(CONFIG_ARCH_BCM)		:= board_bcm281xx.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.o
+obj-$(CONFIG_ARCH_BCM_MOBILE)	:= board_bcm281xx.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.o
 plus_sec := $(call as-instr,.arch_extension sec,+sec)
 AFLAGS_bcm_kona_smc_asm.o	:=-Wa,-march=armv7-a$(plus_sec)

Signature · 1 line

1.7.10.4

Olof Johansson

2013-10-28 20:38 UTC #2 lore raw

PATCH v2 1/4 rename ARCH_BCM to ARCH_BCM_MOBILE (mach-bcm)

Hi,

Replying here but since this is a part of your pull request. There's still time to get this in since it's a fairly small self-contained change, so let's try to get it right from the get-go. See comments below.

Quoted 43 lines · Christian Daudt

Currently ARCH_BCM has been used for Broadcom Mobile V7 based SoCs. In order to allow other Broadcom SoCs to also use mach-bcm directory and files, this patch renames the original ARCH_BCM to ARCH_BCM_MOBILE, and uses ARCH_BCM to define any Broadcom chip residing in mach-bcm directory.
Signed-off-by Christian Daudt <[email protected]>
Acked-by Olof Johansson <[email protected]>
Changes from v1:
- fix alpha ordering in dts/Makefile
- break into 4 patches for separate subsys
arch/arm/configs/bcm_defconfig +1 -0
index 6e49310..efb0132 100644
@@ -27,6 +27,7 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_EFI_PARTITION=y
 CONFIG_ARCH_BCM=y
+CONFIG_ARCH_BCM_MOBILE=y
 CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_ERRATA_743622=y
 CONFIG_PREEMPT=y
arch/arm/configs/multi_v7_defconfig +1 -0
index 6e572c6..89a5064 100644
@@ -6,6 +6,7 @@ CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_ARMADA_370=y
 CONFIG_MACH_ARMADA_XP=y
 CONFIG_ARCH_BCM=y
+CONFIG_ARCH_BCM_MOBILE=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_KEYSTONE=y
arch/arm/mach-bcm/Kconfig +0 -0
index 69d67f7..af86cda 100644

arch/arm/mach-bcm/Kconfig line 3

Quoted 4 lines

arch/arm/mach-bcm/Kconfig +2 -1

@@ -1,5 +1,17 @@
 config ARCH_BCM
-       bool "Broadcom SoC" if ARCH_MULTI_V7
+       bool "Broadcom SoC Support"
+       select ARCH_MULTIPLATFORM

This should be the other way around -- all other platforms seem to depend on ARCH_MULTIPLATFORM instead of selecting it.

arch/arm/mach-bcm/Kconfig line 14

Quoted 11 lines

arch/arm/mach-bcm/Kconfig +11 -0

+       help
+         This enables support for Broadcom ARM based SoC
+          chips
+
+if ARCH_BCM
+
+menu "Broadcom SoC Selection"
+
+config ARCH_BCM_MOBILE
+       bool "Broadcom Mobile SoC" if ARCH_MULTI_V7
+       default y

This shouldn't be default y, since it makes it less obvious in configs such as multi_v7_defconfig that the platform is enabled.

Also, since you have default y here, the addition of CONFIG_ARCH_BCM_MOBILE=y in the defconfigs doesn't actually look accurate, they would fall out. As a matter of fact, the patch after this in your branch you requested us to merge removes them again. :)

Quoted 6 lines

arch/arm/mach-bcm/Kconfig +0 -0

        depends on MMU
        select ARCH_REQUIRE_GPIOLIB
        select ARM_ERRATA_754322

@@ -14,7 +26,11 @@ config ARCH_BCM
        select TICK_ONESHOT
        select CACHE_L2X0

arch/arm/mach-bcm/Kconfig config ARCH_BCM · line 36

Quoted 10 lines

arch/arm/mach-bcm/Kconfig +5 -1

        help
-         This enables support for system based on Broadcom SoCs.
+         This enables support for systems based on Broadcom mobile SoCs.
          It currently supports the 'BCM281XX' family, which includes
          BCM11130, BCM11140, BCM11351, BCM28145 and
          BCM28155 variants.
+
+endmenu
+
+endif

-Olof

Christian Daudt

author

2013-10-30 06:22 UTC #3 lore raw

PATCH v2 1/4 rename ARCH_BCM to ARCH_BCM_MOBILE (mach-bcm)

Quoted 12 lines · Olof Johansson

arch/arm/mach-bcm/Kconfig line 3
Quoted 7 lines · Christian Daudt
arch/arm/mach-bcm/Kconfig +2 -1
@@ -1,5 +1,17 @@
 config ARCH_BCM
-       bool "Broadcom SoC" if ARCH_MULTI_V7
+       bool "Broadcom SoC Support"
+       select ARCH_MULTIPLATFORM
This should be the other way around -- all other platforms seem to depend on ARCH_MULTIPLATFORM instead of selecting it.

Done

Quoted 6 lines

arch/arm/mach-bcm/Kconfig +6 -0

+       help
+         This enables support for Broadcom ARM based SoC
+          chips
+
+if ARCH_BCM
+

Quoted 9 lines

arch/arm/mach-bcm/Kconfig line 14
Quoted 5 lines
arch/arm/mach-bcm/Kconfig +5 -0
+menu "Broadcom SoC Selection"
+
+config ARCH_BCM_MOBILE
+       bool "Broadcom Mobile SoC" if ARCH_MULTI_V7
+       default y
This shouldn't be default y, since it makes it less obvious in configs such as multi_v7_defconfig that the platform is enabled.

done.

I've amended the existing patch with the mods above, and since they
were pretty minor, I've already folded it into a subsequent pull request that I just sent out.

Thanks,
csd

Christian Daudt

author

2013-09-23 17:20 UTC #4 lore raw

PATCH v2 2/4 rename ARCH_BCM to ARCH_BCM_MOBILE (clocksource)

In reply to Christian Daudt

Signed-off-by Christian Daudt <[email protected]>

Acked-by Olof Johansson <[email protected]>

Changes from v1:
- fix alpha ordering in dts/Makefile
- break into 4 patches for separate subsys

drivers/clocksource/Makefile +1 -1

index 704d6d3..4207ab4 100644
@@ -25,7 +25,7 @@ obj-$(CONFIG_SUN4I_TIMER)	+= sun4i_timer.o
 obj-$(CONFIG_ARCH_TEGRA)	+= tegra20_timer.o
 obj-$(CONFIG_VT8500_TIMER)	+= vt8500_timer.o
 obj-$(CONFIG_ARCH_NSPIRE)	+= zevio-timer.o
-obj-$(CONFIG_ARCH_BCM)		+= bcm_kona_timer.o
+obj-$(CONFIG_ARCH_BCM_MOBILE)	+= bcm_kona_timer.o
 obj-$(CONFIG_CADENCE_TTC_TIMER)	+= cadence_ttc_timer.o
 obj-$(CONFIG_CLKSRC_EXYNOS_MCT)	+= exynos_mct.o
 obj-$(CONFIG_CLKSRC_SAMSUNG_PWM)	+= samsung_pwm_timer.o

Signature · 1 line

1.7.10.4

Daniel Lezcano

2013-12-13 08:48 UTC #5 lore raw

PATCH v2 2/4 rename ARCH_BCM to ARCH_BCM_MOBILE (clocksource)

Quoted 9 lines · Christian Daudt

Currently ARCH_BCM has been used for Broadcom Mobile V7 based SoCs. In order to allow other Broadcom SoCs to also use mach-bcm directory and files, this patch renames the original ARCH_BCM to ARCH_BCM_MOBILE, and uses ARCH_BCM to define any Broadcom chip residing in mach-bcm directory.
Signed-off-by Christian Daudt <[email protected]>
Acked-by Olof Johansson <[email protected]>

Acked-by Daniel Lezcano <[email protected]>

Quoted 18 lines

Changes from v1:
- fix alpha ordering in dts/Makefile
- break into 4 patches for separate subsys

drivers/clocksource/Makefile +1 -1

index 704d6d3..4207ab4 100644
@@ -25,7 +25,7 @@ obj-$(CONFIG_SUN4I_TIMER)	+= sun4i_timer.o
  obj-$(CONFIG_ARCH_TEGRA)	+= tegra20_timer.o
  obj-$(CONFIG_VT8500_TIMER)	+= vt8500_timer.o
  obj-$(CONFIG_ARCH_NSPIRE)	+= zevio-timer.o
-obj-$(CONFIG_ARCH_BCM)		+= bcm_kona_timer.o
+obj-$(CONFIG_ARCH_BCM_MOBILE)	+= bcm_kona_timer.o
  obj-$(CONFIG_CADENCE_TTC_TIMER)	+= cadence_ttc_timer.o
  obj-$(CONFIG_CLKSRC_EXYNOS_MCT)	+= exynos_mct.o
  obj-$(CONFIG_CLKSRC_SAMSUNG_PWM)	+= samsung_pwm_timer.o

Signature · 5 lines

  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Christian Daudt

author

2013-12-13 16:43 UTC #6 lore raw

PATCH v2 2/4 rename ARCH_BCM to ARCH_BCM_MOBILE (clocksource)

Quoted 9 lines · Daniel Lezcano

Quoted 8 lines · Christian Daudt
Currently ARCH_BCM has been used for Broadcom Mobile V7 based SoCs. In order to allow other Broadcom SoCs to also use mach-bcm directory and files, this patch renames the original ARCH_BCM to ARCH_BCM_MOBILE, and uses ARCH_BCM to define any Broadcom chip residing in mach-bcm directory.

Quoted 6 lines

Quoted 2 lines
Signed-off-by Christian Daudt <[email protected]>
Acked-by Olof Johansson <[email protected]>
Acked-by Daniel Lezcano <[email protected]>

Thanks. I've applied it to armsoc/for-3.14/soc

csd

Christian Daudt

author

2013-09-23 17:20 UTC #7 lore raw

PATCH v2 3/4 rename ARCH_BCM to ARCH_BCM_MOBILE (mmc)

In reply to Christian Daudt

Signed-off-by Christian Daudt <[email protected]>

Acked-by Olof Johansson <[email protected]>

Changes from v1:
- fix alpha ordering in dts/Makefile
- break into 4 patches for separate subsys

drivers/mmc/host/Kconfig +1 -1

index 7fc5099..7e89650 100644
@@ -251,7 +251,7 @@ config MMC_SDHCI_S3C_DMA
 
 config MMC_SDHCI_BCM_KONA
 	tristate "SDHCI support on Broadcom KONA platform"
-	depends on ARCH_BCM
+	depends on ARCH_BCM_MOBILE
 	select MMC_SDHCI_PLTFM
 	help
 	  This selects the Broadcom Kona Secure Digital Host Controller

Signature · 1 line

1.7.10.4

Christian Daudt

author

2013-12-13 17:59 UTC #8 lore raw

PATCH v2 3/4 rename ARCH_BCM to ARCH_BCM_MOBILE (mmc)

Quoted 28 lines · Christian Daudt

Currently ARCH_BCM has been used for Broadcom Mobile V7 based SoCs. In order to allow other Broadcom SoCs to also use mach-bcm directory and files, this patch renames the original ARCH_BCM to ARCH_BCM_MOBILE, and uses ARCH_BCM to define any Broadcom chip residing in mach-bcm directory.
Signed-off-by Christian Daudt <[email protected]>
Acked-by Olof Johansson <[email protected]>
Changes from v1:
- fix alpha ordering in dts/Makefile
- break into 4 patches for separate subsys
drivers/mmc/host/Kconfig +1 -2
index 7fc5099..7e89650 100644
@@ -251,7 +251,7 @@ config MMC_SDHCI_S3C_DMA
 
 config MMC_SDHCI_BCM_KONA
        tristate "SDHCI support on Broadcom KONA platform"
-       depends on ARCH_BCM
+       depends on ARCH_BCM_MOBILE
        select MMC_SDHCI_PLTFM
        help
          This selects the Broadcom Kona Secure Digital Host Controller
--

Quoted 2 lines

1.7.10.4

Chris,
This is the last unacked piece of this patchset - could you pls
review it ? Also let me know if you're pulling it in or if you want me to pull it into bcm to armsoc.

Thanks,
csd

Matt Porter

2014-03-12 21:45 UTC #9 lore raw

PATCH v2 3/4 rename ARCH_BCM to ARCH_BCM_MOBILE (mmc)

In reply to Christian Daudt

Quoted 9 lines · Christian Daudt

Currently ARCH_BCM has been used for Broadcom Mobile V7 based SoCs. In order to allow other Broadcom SoCs to also use mach-bcm directory and files, this patch renames the original ARCH_BCM to ARCH_BCM_MOBILE, and uses ARCH_BCM to define any Broadcom chip residing in mach-bcm directory.
Signed-off-by Christian Daudt <[email protected]>
Acked-by Olof Johansson <[email protected]>

Hi Chris,

Could you please take this patch for 3.15? It was missed for 3.14.

Thanks,
Matt

Chris Ball

2014-03-24 13:29 UTC #10 lore raw

PATCH v2 3/4 rename ARCH_BCM to ARCH_BCM_MOBILE (mmc)

Hi,

Quoted 8 lines · Matt Porter

Quoted 7 lines · Christian Daudt
Currently ARCH_BCM has been used for Broadcom Mobile V7 based SoCs. In order to allow other Broadcom SoCs to also use mach-bcm directory and files, this patch renames the original ARCH_BCM to ARCH_BCM_MOBILE, and uses ARCH_BCM to define any Broadcom chip residing in mach-bcm directory.

Quoted 6 lines

Quoted 2 lines
Signed-off-by Christian Daudt <[email protected]>
Acked-by Olof Johansson <[email protected]>
Hi Chris,
Could you please take this patch for 3.15? It was missed for 3.14.

Sorry about that -- it's in mmc-next for 3.15 now.

Thanks,

- Chris.

Signature · 1 line

Chris Ball   <[email protected]>   <http://printf.net/>

Christian Daudt

author

2013-09-23 17:20 UTC #11 lore raw

PATCH v2 4/4 rename ARCH_BCM to ARCH_BCM_MOBILE (dt)

In reply to Christian Daudt

Signed-off-by Christian Daudt <[email protected]>

Acked-by Olof Johansson <[email protected]>

Changes from v1:
- fix alpha ordering in dts/Makefile
- break into 4 patches for separate subsys

arch/arm/boot/dts/Makefile +2 -2

index cc0f1fb..2b07eb8 100644
@@ -41,9 +41,9 @@ dtb-$(CONFIG_ARCH_AT91)	+= sama5d33ek.dtb
 dtb-$(CONFIG_ARCH_AT91)	+= sama5d34ek.dtb
 dtb-$(CONFIG_ARCH_AT91)	+= sama5d35ek.dtb
 
-dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
-dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb \
+dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm11351-brt.dtb \
 	bcm28155-ap.dtb
+dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
 	da850-evm.dtb
 dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \

Signature · 1 line

1.7.10.4