summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-05-24 00:44:26 +0200
committerArnd Bergmann <arnd@arndb.de>2014-05-24 00:44:26 +0200
commit1ef81bf7bcc9d795619197b15218304c9d42c18c (patch)
treec5989c5ee1d46ce9a4983f191545ed39357d7a5d
parent80e98a9ca6ded6d0fb6c2362c07638cbe3c58e2c (diff)
parent387468d190f0ba72e239c11e9663cfeaeaf9ae2d (diff)
Merge tag 'for-3.16/bcm-soc' of git://github.com/broadcom/mach-bcm into next/soc
Merge "mach-bcm 3.16 soc updates" From Matt Porter: * only show ARCH_BCM in multi v6/v7 configs * enable ARM erratum 775420 * bcm_defconfig updates for pwm * tag 'for-3.16/bcm-soc' of git://github.com/broadcom/mach-bcm: ARM: bcm_defconfig: Enable PWM and Backlight ARM: mach-bcm: add ARM_ERRATA_775420 ARM: bcm: Restrict ARCH_BCM selection to ARCH_MULTI_V6_V7 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/configs/bcm_defconfig3
-rw-r--r--arch/arm/mach-bcm/Kconfig12
2 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig
index 3df3f3a79ef4..9d13dae99125 100644
--- a/arch/arm/configs/bcm_defconfig
+++ b/arch/arm/configs/bcm_defconfig
@@ -91,6 +91,7 @@ CONFIG_FB=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_PWM=y
# CONFIG_USB_SUPPORT is not set
CONFIG_MMC=y
CONFIG_MMC_UNSAFE_RESUME=y
@@ -104,6 +105,8 @@ CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_PWM=y
+CONFIG_PWM_BCM_KONA=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index b8cc9e8992f1..1c73a7c55418 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -1,19 +1,17 @@
config ARCH_BCM
- bool "Broadcom SoC Support"
- depends on ARCH_MULTIPLATFORM
+ bool "Broadcom SoC Support" if ARCH_MULTI_V6_V7
help
- This enables support for Broadcom ARM based SoC
- chips
-
-if ARCH_BCM
+ This enables support for Broadcom ARM based SoC chips
menu "Broadcom SoC Selection"
+ depends on ARCH_BCM
config ARCH_BCM_MOBILE
bool "Broadcom Mobile SoC Support" if ARCH_MULTI_V7
select ARCH_REQUIRE_GPIOLIB
select ARM_ERRATA_754322
select ARM_ERRATA_764369 if SMP
+ select ARM_ERRATA_775420
select ARM_GIC
select GPIO_BCM_KONA
select TICK_ONESHOT
@@ -92,5 +90,3 @@ config ARCH_BCM_5301X
network SoC using a MIPS CPU, they are supported by arch/mips/bcm47xx
endmenu
-
-endif