summaryrefslogtreecommitdiff
path: root/arch/arm/mach-bcm2708
diff options
context:
space:
mode:
authornotro <notro@tronnes.org>2014-07-10 13:59:47 +0200
committerpopcornmix <popcornmix@gmail.com>2015-05-18 14:11:09 +0100
commita54d4c766a1ae6d104cf7f3937c7beb2a04c533e (patch)
tree27f56c4247485597e70ce0a75b4f164f8f912417 /arch/arm/mach-bcm2708
parentdfbf7f32a3a0322eba728c1d5f210abb37170fd1 (diff)
downloadlinux-a54d4c766a1ae6d104cf7f3937c7beb2a04c533e.tar.gz
BCM2708: use pinctrl-bcm2835
Use pinctrl-bcm2835 instead of the pinctrl-bcm2708 and bcm2708_gpio combination. Signed-off-by: Noralf Tronnes <notro@tronnes.org>
Diffstat (limited to 'arch/arm/mach-bcm2708')
-rw-r--r--arch/arm/mach-bcm2708/Kconfig3
-rw-r--r--arch/arm/mach-bcm2708/bcm2708.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-bcm2708/Kconfig b/arch/arm/mach-bcm2708/Kconfig
index 182e7bafbfe3..4cfae55ed0ff 100644
--- a/arch/arm/mach-bcm2708/Kconfig
+++ b/arch/arm/mach-bcm2708/Kconfig
@@ -14,6 +14,9 @@ config BCM2708_DT
depends on MACH_BCM2708
default n
select USE_OF
+ select ARCH_REQUIRE_GPIOLIB
+ select PINCTRL
+ select PINCTRL_BCM2835
help
Enable Device Tree support for BCM2708
diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
index a812b514a7d9..a207ad851d2a 100644
--- a/arch/arm/mach-bcm2708/bcm2708.c
+++ b/arch/arm/mach-bcm2708/bcm2708.c
@@ -816,7 +816,7 @@ void __init bcm2708_init(void)
bcm_register_device(&bcm2708_dmaengine_device);
bcm_register_device(&bcm2708_vcio_device);
#ifdef CONFIG_BCM2708_GPIO
- bcm_register_device(&bcm2708_gpio_device);
+ bcm_register_device_dt(&bcm2708_gpio_device);
#endif
#if defined(CONFIG_W1_MASTER_GPIO) || defined(CONFIG_W1_MASTER_GPIO_MODULE)
w1_gpio_pdata.pin = w1_gpio_pin;