From: Mark Brown <broonie@kernel•org>
To: Stephen Warren <swarren@wwwdotorg•org>, Rob Herring <robh@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the bcm2835 tree with the arm-soc tree
Date: Sun, 9 Mar 2014 12:14:39 +0000 [thread overview]
Message-ID: <20140309121439.7da8f5ac65985cebdbf19f05@kernel.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1191 bytes --]
Hi Stephen/Rob,
Today's linux-next merge of the bcm2835 tree got a conflict in between commit ddb902cc34593ecb ("ARM: centralize common multi-platform kconfig options") from the arm-soc tree and commit d30fe6272183f3cc8b ("ARM: bcm2835: Move to mach-bcm directory") from the bcm2835 tree. Commit 0676b21fffd17baeff589 ("ARM: bcm2835: enable V6K instead of plain V6") also collided.
I've fixed up as below and can carry:
diff --cc arch/arm/mach-bcm/Kconfig
index af4f2dfda40c,4e466e9eef44..7de3282a8613
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@@ -27,6 -32,22 +27,18 @@@ config ARCH_BCM_MOBIL
BCM11130, BCM11140, BCM11351, BCM28145 and
BCM28155 variants.
+ config ARCH_BCM2835
+ bool "Broadcom BCM2835 family" if ARCH_MULTI_V6
+ select ARCH_REQUIRE_GPIOLIB
+ select ARM_AMBA
+ select ARM_ERRATA_411920
+ select ARM_TIMER_SP804
- select CLKDEV_LOOKUP
- select CLKSRC_OF
- select CPU_V6
- select GENERIC_CLOCKEVENTS
+ select PINCTRL
+ select PINCTRL_BCM2835
+ help
+ This enables support for the Broadcom BCM2835 SoC. This SoC is
+ used in the Raspberry Pi and Roku 2 devices.
+
endmenu
endif
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-03-09 12:14 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-09 12:14 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-12-08 1:06 linux-next: manual merge of the bcm2835 tree with the arm-soc tree Stephen Rothwell
2014-12-08 11:25 ` Arnd Bergmann
2014-12-08 13:00 ` Lee Jones
2014-12-08 13:28 ` Arnd Bergmann
2014-12-08 13:49 ` Lee Jones
2014-12-08 15:08 ` Arnd Bergmann
2014-12-08 16:08 ` Stephen Warren
2014-12-08 16:51 ` Lee Jones
2014-12-08 17:37 ` Stephen Warren
2014-12-09 8:21 ` Lee Jones
2014-03-03 1:02 Stephen Rothwell
2014-03-03 5:21 ` Stephen Warren
2014-03-03 5:35 ` Olof Johansson
2013-03-18 4:06 Stephen Rothwell
2013-03-18 4:04 Stephen Rothwell
2013-03-18 15:19 ` Stephen Warren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140309121439.7da8f5ac65985cebdbf19f05@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robh@kernel$(echo .)org \
--cc=swarren@wwwdotorg$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox