[PATCH v2 0/4] ARCH_BCM rename

[PATCH v2 0/4] ARCH_BCM rename

[Christian Daudt]

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(-)

-- 
1.7.10.4

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

[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 <bcm@fixthebug.org>
Acked-by: Olof Johansson <olof@lixom.net>

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

diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig
index 6e49310..efb0132 100644
--- a/arch/arm/configs/bcm_defconfig
+++ b/arch/arm/configs/bcm_defconfig
@@ -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
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 6e572c6..89a5064 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -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
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 69d67f7..af86cda 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -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
diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile
index e3d0303..c2ccd5a 100644
--- a/arch/arm/mach-bcm/Makefile
+++ b/arch/arm/mach-bcm/Makefile
@@ -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)
-- 
1.7.10.4

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

[Olof Johansson]

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.

On Mon, Sep 23, 2013 at 10:20 AM, Christian Daudt <bcm@fixthebug.org> wrote:
> 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 <bcm@fixthebug.org>
> Acked-by: Olof Johansson <olof@lixom.net>
>
> Changes from v1:
>  - fix alpha ordering in dts/Makefile
>  - break into 4 patches for separate subsys
>
> diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig
> index 6e49310..efb0132 100644
> --- a/arch/arm/configs/bcm_defconfig
> +++ b/arch/arm/configs/bcm_defconfig
> @@ -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
> diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
> index 6e572c6..89a5064 100644
> --- a/arch/arm/configs/multi_v7_defconfig
> +++ b/arch/arm/configs/multi_v7_defconfig
> @@ -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
> diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
> index 69d67f7..af86cda 100644
> --- a/arch/arm/mach-bcm/Kconfig
> +++ b/arch/arm/mach-bcm/Kconfig
> @@ -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.

> +       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. :)

>         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


-Olof

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

[Christian Daudt]

On Mon, Oct 28, 2013 at 1:38 PM, Olof Johansson <olof@lixom.net> wrote:
> On Mon, Sep 23, 2013 at 10:20 AM, Christian Daudt <bcm@fixthebug.org> wrote:
>> --- a/arch/arm/mach-bcm/Kconfig
>> +++ b/arch/arm/mach-bcm/Kconfig
>> @@ -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
>> +       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.
>
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

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

[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 <bcm@fixthebug.org>
Acked-by: Olof Johansson <olof@lixom.net>

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

diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index 704d6d3..4207ab4 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -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
-- 
1.7.10.4

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

[Daniel Lezcano]

On 09/23/2013 07:20 PM, Christian Daudt wrote:
> 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 <bcm@fixthebug.org>
> Acked-by: Olof Johansson <olof@lixom.net>

Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>


> Changes from v1:
>   - fix alpha ordering in dts/Makefile
>   - break into 4 patches for separate subsys
>
> diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
> index 704d6d3..4207ab4 100644
> --- a/drivers/clocksource/Makefile
> +++ b/drivers/clocksource/Makefile
> @@ -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
>


-- 
  <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

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

[Christian Daudt]

On Fri, Dec 13, 2013 at 12:48 AM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> On 09/23/2013 07:20 PM, Christian Daudt wrote:
>>
>> 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 <bcm@fixthebug.org>
>> Acked-by: Olof Johansson <olof@lixom.net>
>
>
> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
>

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


 csd

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

[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 <bcm@fixthebug.org>
Acked-by: Olof Johansson <olof@lixom.net>

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

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 7fc5099..7e89650 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -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
-- 
1.7.10.4

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

[Christian Daudt]

On Mon, Sep 23, 2013 at 10:20 AM, Christian Daudt <bcm@fixthebug.org> wrote:
> 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 <bcm@fixthebug.org>
> Acked-by: Olof Johansson <olof@lixom.net>
>
> Changes from v1:
>  - fix alpha ordering in dts/Makefile
>  - break into 4 patches for separate subsys
>
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index 7fc5099..7e89650 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -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
> --
> 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

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

[Matt Porter]

On Mon, Sep 23, 2013 at 10:20:35AM -0700, Christian Daudt wrote:
> 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 <bcm@fixthebug.org>
> Acked-by: Olof Johansson <olof@lixom.net>

Hi Chris,

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

Thanks,
Matt

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

[Chris Ball]

Hi,

On Wed, Mar 12 2014, Matt Porter wrote:
> On Mon, Sep 23, 2013 at 10:20:35AM -0700, Christian Daudt wrote:
>> 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 <bcm@fixthebug.org>
>> Acked-by: Olof Johansson <olof@lixom.net>
>
> 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.
-- 
Chris Ball   <chris@printf.net>   <http://printf.net/>

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

[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 <bcm@fixthebug.org>
Acked-by: Olof Johansson <olof@lixom.net>

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

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index cc0f1fb..2b07eb8 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
-- 
1.7.10.4