1 From fff70fcc73e09e86d46f87dd44459870f15423b2 Mon Sep 17 00:00:00 2001
2 From: notro <notro@tronnes.org>
3 Date: Thu, 10 Jul 2014 13:59:47 +0200
4 Subject: [PATCH 051/114] BCM2708: use pinctrl-bcm2835
6 Use pinctrl-bcm2835 instead of the pinctrl-bcm2708 and bcm2708_gpio
9 Signed-off-by: Noralf Tronnes <notro@tronnes.org>
11 arch/arm/boot/dts/bcm2708.dtsi | 12 ++++++++++++
12 arch/arm/mach-bcm2708/Kconfig | 3 +++
13 arch/arm/mach-bcm2708/bcm2708.c | 2 +-
14 drivers/pinctrl/pinctrl-bcm2835.c | 2 +-
15 4 files changed, 17 insertions(+), 2 deletions(-)
17 diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi
18 index a06f5b8..b2920c8 100644
19 --- a/arch/arm/boot/dts/bcm2708.dtsi
20 +++ b/arch/arm/boot/dts/bcm2708.dtsi
23 #interrupt-cells = <2>;
27 + compatible = "brcm,bcm2835-gpio";
28 + reg = <0x7e200000 0xb4>;
29 + interrupts = <2 17>, <2 18>;
34 + interrupt-controller;
35 + #interrupt-cells = <2>;
40 diff --git a/arch/arm/mach-bcm2708/Kconfig b/arch/arm/mach-bcm2708/Kconfig
41 index 182e7ba..4cfae55 100644
42 --- a/arch/arm/mach-bcm2708/Kconfig
43 +++ b/arch/arm/mach-bcm2708/Kconfig
44 @@ -14,6 +14,9 @@ config BCM2708_DT
45 depends on MACH_BCM2708
48 + select ARCH_REQUIRE_GPIOLIB
50 + select PINCTRL_BCM2835
52 Enable Device Tree support for BCM2708
54 diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
55 index 747e27a..0e5bd43 100644
56 --- a/arch/arm/mach-bcm2708/bcm2708.c
57 +++ b/arch/arm/mach-bcm2708/bcm2708.c
58 @@ -767,7 +767,7 @@ void __init bcm2708_init(void)
59 bcm_register_device(&bcm2708_dmaman_device);
60 bcm_register_device(&bcm2708_vcio_device);
61 #ifdef CONFIG_BCM2708_GPIO
62 - bcm_register_device(&bcm2708_gpio_device);
63 + bcm_register_device_dt(&bcm2708_gpio_device);
65 #if defined(CONFIG_W1_MASTER_GPIO) || defined(CONFIG_W1_MASTER_GPIO_MODULE)
66 w1_gpio_pdata.pin = w1_gpio_pin;
67 diff --git a/drivers/pinctrl/pinctrl-bcm2835.c b/drivers/pinctrl/pinctrl-bcm2835.c
68 index eabba02..962e180 100644
69 --- a/drivers/pinctrl/pinctrl-bcm2835.c
70 +++ b/drivers/pinctrl/pinctrl-bcm2835.c
71 @@ -382,7 +382,7 @@ static struct gpio_chip bcm2835_gpio_chip = {
72 .get = bcm2835_gpio_get,
73 .set = bcm2835_gpio_set,
74 .to_irq = bcm2835_gpio_to_irq,
77 .ngpio = BCM2835_NUM_GPIOS,