Merge tag 'bcm-for-3.13-soc2' of git://github.com/broadcom/bcm11351 into next/soc
authorOlof Johansson <olof@lixom.net>
Wed, 30 Oct 2013 21:03:39 +0000 (14:03 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 30 Oct 2013 21:03:39 +0000 (14:03 -0700)
From Christian Daudt, BCM changes for 3.13/soc. Mostly cleanups and
renaming of kernel config options, pushing down the mobile platforms
one level in the naming scheme, keeping ARCH_BCM as a wider family
config option.

* tag 'bcm-for-3.13-soc2' of git://github.com/broadcom/bcm11351:
  ARM: bcm_defconfig: Run "make savedefconfig"
  ARM: bcm281xx: Add ARCH Timers to config
  rename ARCH_BCM to ARCH_BCM_MOBILE (mach-bcm)
  ARM: bcm281xx: more descriptive machine string
  ARM: bcm281xx: Enable GPIO driver

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
arch/arm/configs/multi_v7_defconfig
arch/arm/mach-bcm/board_bcm281xx.c

Simple merge
index 26b2390492b801927f6376a725db237a4cc82416,dcfaf4ab25d66307cbeaa318b5139db113f7759b..cb3dc364405c4eec94465adbb503b7763fe4887f
@@@ -67,7 -67,8 +67,7 @@@ static void __init board_init(void
  
  static const char * const bcm11351_dt_compat[] = { "brcm,bcm11351", NULL, };
  
- DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")
+ DT_MACHINE_START(BCM11351_DT, "BCM281xx Broadcom Application Processor")
 -      .init_time = clocksource_of_init,
        .init_machine = board_init,
        .restart = bcm_kona_restart,
        .dt_compat = bcm11351_dt_compat,