* [PATCH] rename ARCH_BCM to ARCH_BCM_MOBILE
@ 2013-09-20 23:04 Christian Daudt
2013-09-21 0:23 ` Olof Johansson
0 siblings, 1 reply; 3+ messages in thread
From: Christian Daudt @ 2013-09-20 23:04 UTC (permalink / raw)
To: Christian Daudt, Olof Johansson, Arnd Bergmann, Rob Herring,
Pawel Moll, Mark Rutland, Stephen Warren, Ian Campbell,
Russell King, Daniel Lezcano, Thomas Gleixner, Chris Ball
Cc: Domenico Andreoli, Hauke Mehrtens, Matt Porter, Alex Elder,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-mmc-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
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 <csd-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index cc0f1fb..dd00e22 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -42,8 +42,6 @@ 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 \
- bcm28155-ap.dtb
dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
da850-evm.dtb
dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \
@@ -101,6 +99,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
kirkwood-ts219-6282.dtb \
kirkwood-openblocks_a6.dtb
dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
+dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm11351-brt.dtb \
+ bcm28155-ap.dtb
dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
msm8960-cdp.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
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)
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
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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] rename ARCH_BCM to ARCH_BCM_MOBILE
2013-09-20 23:04 [PATCH] rename ARCH_BCM to ARCH_BCM_MOBILE Christian Daudt
@ 2013-09-21 0:23 ` Olof Johansson
2013-09-21 19:16 ` Christian Daudt
0 siblings, 1 reply; 3+ messages in thread
From: Olof Johansson @ 2013-09-21 0:23 UTC (permalink / raw)
To: Christian Daudt
Cc: Christian Daudt, Arnd Bergmann, Rob Herring, Pawel Moll,
Mark Rutland, Stephen Warren, Ian Campbell, Russell King,
Daniel Lezcano, Thomas Gleixner, Chris Ball, Domenico Andreoli,
Hauke Mehrtens, Matt Porter, Alex Elder,
devicetree@vger.kernel.org, linux-mmc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
On Fri, Sep 20, 2013 at 4:04 PM, Christian Daudt <csd@broadcom.com> 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 <csd@broadcom.com>
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index cc0f1fb..dd00e22 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -42,8 +42,6 @@ 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 \
> - bcm28155-ap.dtb
> dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
> da850-evm.dtb
> dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \
> @@ -101,6 +99,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
> kirkwood-ts219-6282.dtb \
> kirkwood-openblocks_a6.dtb
> dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
> +dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm11351-brt.dtb \
> + bcm28155-ap.dtb
This reordering looks off. The entries should be alphabetically
ordered, so if anything it should move up above BCM2835.
> 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
> 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
Since nothing breaks (i.e. ARCH_BCM is still there, and will be
enabled for any ARCH_BCM_MOBILE platform), the above two can go
through the corresponding subsystem trees as separate patches.
With the above fixed:
Acked-by: Olof Johansson <olof@lixom.net>
-Olof
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] rename ARCH_BCM to ARCH_BCM_MOBILE
2013-09-21 0:23 ` Olof Johansson
@ 2013-09-21 19:16 ` Christian Daudt
0 siblings, 0 replies; 3+ messages in thread
From: Christian Daudt @ 2013-09-21 19:16 UTC (permalink / raw)
To: Olof Johansson
Cc: Christian Daudt, Arnd Bergmann, Rob Herring, Pawel Moll,
Mark Rutland, Stephen Warren, Ian Campbell, Russell King,
Daniel Lezcano, Thomas Gleixner, Chris Ball, Domenico Andreoli,
Hauke Mehrtens, Matt Porter, Alex Elder,
devicetree@vger.kernel.org, linux-mmc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
[plain-text resend]
On Fri, Sep 20, 2013 at 5:23 PM, Olof Johansson <olof@lixom.net> wrote:
>
> On Fri, Sep 20, 2013 at 4:04 PM, Christian Daudt <csd@broadcom.com> 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 <csd@broadcom.com>
> >
> > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> > index cc0f1fb..dd00e22 100644
> > --- a/arch/arm/boot/dts/Makefile
> > +++ b/arch/arm/boot/dts/Makefile
> > @@ -42,8 +42,6 @@ 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 \
> > - bcm28155-ap.dtb
> > dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
> > da850-evm.dtb
> > dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \
> > @@ -101,6 +99,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
> > kirkwood-ts219-6282.dtb \
> > kirkwood-openblocks_a6.dtb
> > dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
> > +dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm11351-brt.dtb \
> > + bcm28155-ap.dtb
>
> This reordering looks off. The entries should be alphabetically
> ordered, so if anything it should move up above BCM2835.
Heh. I started the rename with ARCH_MOBiLE_BCM and later renamed to
ARCH_BCM_MOBILE. Forgot to move it up to reflect the change in
ordering. Fixed.
>
>
>
> > 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
> > 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
>
> Since nothing breaks (i.e. ARCH_BCM is still there, and will be
> enabled for any ARCH_BCM_MOBILE platform), the above two can go
> through the corresponding subsystem trees as separate patches.
>
I was thinking of doing that, but it will actually break if the
changes to drivers show up before the changes to mach-bcm because the
drivers will no longer be compiled. I'll split it and keep the
nag-ometer set to high to ensure their inclusion then...
Thanks,
csd
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-21 19:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-20 23:04 [PATCH] rename ARCH_BCM to ARCH_BCM_MOBILE Christian Daudt
2013-09-21 0:23 ` Olof Johansson
2013-09-21 19:16 ` Christian Daudt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox