From 295d6763bf8e44fa453633791c77cd919bccdcab Mon Sep 17 00:00:00 2001 From: Alexander Aring Date: Sat, 19 Dec 2015 19:34:01 +0100 Subject: bcm2835: introduce mach-bcm283x This patch changes the most part of mach-bcm2835 to mach-bcm283x. This prepares to add RPi2 support which is a bcm2836. This patch changes the Kconfig entry namens to BCM283X for drivers only. These drivers should working the same in bcm2836. While updating defconfig I added LED support/trigger option. Signed-off-by: Alexander Aring Signed-off-by: Sascha Hauer --- drivers/clocksource/Kconfig | 4 ++-- drivers/clocksource/Makefile | 2 +- drivers/gpio/Kconfig | 6 +++--- drivers/gpio/Makefile | 2 +- drivers/mci/Kconfig | 6 +++--- drivers/mci/Makefile | 2 +- drivers/regulator/Kconfig | 4 ++-- drivers/regulator/Makefile | 2 +- drivers/video/Kconfig | 8 ++++---- drivers/video/Makefile | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) (limited to 'drivers') diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 598edc9a81..3fb09fbec4 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -6,9 +6,9 @@ config ARM_SMP_TWD bool depends on ARM && CPU_V7 -config CLOCKSOURCE_BCM2835 +config CLOCKSOURCE_BCM283X bool - depends on ARCH_BCM2835 + depends on ARCH_BCM283X config CLOCKSOURCE_CLPS711X bool diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index f5f5141a3d..4eb1656ee0 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -1,6 +1,6 @@ obj-$(CONFIG_AMBA_SP804) += amba-sp804.o obj-$(CONFIG_ARM_SMP_TWD) += arm_smp_twd.o -obj-$(CONFIG_CLOCKSOURCE_BCM2835) += bcm2835.o +obj-$(CONFIG_CLOCKSOURCE_BCM283X) += bcm2835.o obj-$(CONFIG_CLOCKSOURCE_CLPS711X) += clps711x.o obj-$(CONFIG_CLOCKSOURCE_DIGIC) += digic.o obj-$(CONFIG_CLOCKSOURCE_MVEBU) += mvebu.o diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 9cb22613dd..d839d7a426 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -21,9 +21,9 @@ config GPIO_74164 shift registers. This driver can be used to provide access to more gpio outputs. -config GPIO_BCM2835 - bool "GPIO support for BCM2835" - depends on ARCH_BCM2835 +config GPIO_BCM283X + bool "GPIO support for BCM283X" + depends on ARCH_BCM283X config GPIO_CLPS711X bool "GPIO support for CLPS711X" diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index f39e8da6e1..8767eed1e8 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -2,7 +2,7 @@ obj-$(CONFIG_GPIOLIB) += gpiolib.o obj-$(CONFIG_GPIO_74164) += gpio-74164.o obj-$(CONFIG_MACH_MIPS_ATH79) += gpio-ath79.o -obj-$(CONFIG_GPIO_BCM2835) += gpio-bcm2835.o +obj-$(CONFIG_GPIO_BCM283X) += gpio-bcm2835.o obj-$(CONFIG_GPIO_DAVINCI) += gpio-davinci.o obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o obj-$(CONFIG_GPIO_DIGIC) += gpio-digic.o diff --git a/drivers/mci/Kconfig b/drivers/mci/Kconfig index ebd8da9591..0f3504c735 100644 --- a/drivers/mci/Kconfig +++ b/drivers/mci/Kconfig @@ -62,9 +62,9 @@ config MCI_S3C Enable this entry to add support to read and write SD cards on a Samsung S3C24xx based system. -config MCI_BCM2835 - bool "MCI support for BCM2835" - depends on ARCH_BCM2835 +config MCI_BCM283X + bool "MCI support for BCM283X" + depends on ARCH_BCM283X config MCI_IMX bool "i.MX" diff --git a/drivers/mci/Makefile b/drivers/mci/Makefile index 1e8443c1af..88ec456aa3 100644 --- a/drivers/mci/Makefile +++ b/drivers/mci/Makefile @@ -1,6 +1,6 @@ obj-$(CONFIG_MCI) += mci-core.o obj-$(CONFIG_MCI_ATMEL) += atmel_mci.o -obj-$(CONFIG_MCI_BCM2835) += mci-bcm2835.o +obj-$(CONFIG_MCI_BCM283X) += mci-bcm2835.o obj-$(CONFIG_MCI_IMX) += imx.o obj-$(CONFIG_MCI_IMX_ESDHC) += imx-esdhc.o obj-$(CONFIG_MCI_MXS) += mxs.o diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 05c3f48980..4b4125254f 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -11,9 +11,9 @@ config REGULATOR_FIXED This enables a simple fixed regulator. It is used for regulators which are not software controllable or controllable via gpio. -config REGULATOR_BCM2835 +config REGULATOR_BCM283X bool - depends on ARCH_BCM2835 + depends on ARCH_BCM283X default y endif diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index d663c16b1a..a8dd9bd055 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -1,3 +1,3 @@ obj-$(CONFIG_REGULATOR) += core.o obj-$(CONFIG_REGULATOR_FIXED) += fixed.o -obj-$(CONFIG_REGULATOR_BCM2835) += bcm2835.o +obj-$(CONFIG_REGULATOR_BCM283X) += bcm2835.o diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index eabd246d53..7ff67e525e 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -82,11 +82,11 @@ config DRIVER_VIDEO_PXA Add support for the frame buffer device found on the PXA270 CPU. -config DRIVER_VIDEO_BCM2835 - bool "BCM2835 framebuffer driver" - depends on ARCH_BCM2835 +config DRIVER_VIDEO_BCM283X + bool "BCM283X framebuffer driver" + depends on ARCH_BCM283X help - Add support for the BCM2835/VideoCore frame buffer device. + Add support for the BCM283X/VideoCore frame buffer device. source drivers/video/imx-ipu-v3/Kconfig diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 57e4864a6d..a64fc5f24d 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -17,6 +17,6 @@ obj-$(CONFIG_DRIVER_VIDEO_S3C24XX) += s3c24xx.o obj-$(CONFIG_DRIVER_VIDEO_PXA) += pxa.o obj-$(CONFIG_DRIVER_VIDEO_SDL) += sdl.o obj-$(CONFIG_DRIVER_VIDEO_OMAP) += omap.o -obj-$(CONFIG_DRIVER_VIDEO_BCM2835) += bcm2835.o +obj-$(CONFIG_DRIVER_VIDEO_BCM283X) += bcm2835.o obj-$(CONFIG_DRIVER_VIDEO_SIMPLEFB) += simplefb.o obj-$(CONFIG_DRIVER_VIDEO_IMX_IPUV3) += imx-ipu-v3/ -- cgit v1.2.3