brcm2708: refresh patches

[15.05/openwrt.git] / target / linux / brcm2708 / patches-3.18 / 0051-BCM2708-use-pinctrl-bcm2835.patch

diff --git a/target/linux/brcm2708/patches-3.18/0051-BCM2708-use-pinctrl-bcm2835.patch b/target/linux/brcm2708/patches-3.18/0051-BCM2708-use-pinctrl-bcm2835.patch
old mode 100755 (executable)
new mode 100644 (file)
index 9c1b037..84abb3e
--- a/target/linux/brcm2708/patches-3.18/0051-BCM2708-use-pinctrl-bcm2835.patch
+++ b/target/linux/brcm2708/patches-3.18/0051-BCM2708-use-pinctrl-bcm2835.patch
@@ -14,8 +14,6 @@ Signed-off-by: Noralf Tronnes <notro@tronnes.org>
  drivers/pinctrl/pinctrl-bcm2835.c |  2 +-
  4 files changed, 17 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi
-index a06f5b8..b2920c8 100644
 --- a/arch/arm/boot/dts/bcm2708.dtsi
 +++ b/arch/arm/boot/dts/bcm2708.dtsi
 @@ -26,6 +26,18 @@
@@ -37,8 +35,6 @@ index a06f5b8..b2920c8 100644
        };
  
        clocks {
-diff --git a/arch/arm/mach-bcm2708/Kconfig b/arch/arm/mach-bcm2708/Kconfig
-index 182e7ba..4cfae55 100644
 --- a/arch/arm/mach-bcm2708/Kconfig
 +++ b/arch/arm/mach-bcm2708/Kconfig
 @@ -14,6 +14,9 @@ config BCM2708_DT
@@ -51,8 +47,6 @@ index 182e7ba..4cfae55 100644
        help
          Enable Device Tree support for BCM2708
  
-diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
-index 747e27a..0e5bd43 100644
 --- a/arch/arm/mach-bcm2708/bcm2708.c
 +++ b/arch/arm/mach-bcm2708/bcm2708.c
 @@ -767,7 +767,7 @@ void __init bcm2708_init(void)
@@ -64,11 +58,9 @@ index 747e27a..0e5bd43 100644
  #endif
  #if defined(CONFIG_W1_MASTER_GPIO) || defined(CONFIG_W1_MASTER_GPIO_MODULE)
        w1_gpio_pdata.pin = w1_gpio_pin;
-diff --git a/drivers/pinctrl/pinctrl-bcm2835.c b/drivers/pinctrl/pinctrl-bcm2835.c
-index eabba02..962e180 100644
 --- a/drivers/pinctrl/pinctrl-bcm2835.c
 +++ b/drivers/pinctrl/pinctrl-bcm2835.c
-@@ -382,7 +382,7 @@ static struct gpio_chip bcm2835_gpio_chip = {
+@@ -382,7 +382,7 @@ static struct gpio_chip bcm2835_gpio_chi
        .get = bcm2835_gpio_get,
        .set = bcm2835_gpio_set,
        .to_irq = bcm2835_gpio_to_irq,
@@ -77,6 +69,3 @@ index eabba02..962e180 100644
        .ngpio = BCM2835_NUM_GPIOS,
        .can_sleep = false,
  };
--- 
-1.8.3.2
-