kernel: refresh patches

[openwrt/svn-archive/archive.git] / target / linux / brcm2708 / patches-3.14 / 0019-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch

diff --git a/target/linux/brcm2708/patches-3.14/0019-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch b/target/linux/brcm2708/patches-3.14/0019-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch
index b38b5d175ebbb220b38942322db2c692241449c6..bbbab67f13f975866b2885bacd6a5aee4c231d06 100644 (file)
--- a/target/linux/brcm2708/patches-3.14/0019-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch
+++ b/target/linux/brcm2708/patches-3.14/0019-enabling-the-realtime-clock-1-wire-chip-DS1307-and-1.patch
@@ -26,8 +26,6 @@ Signed-off-by: Alex J Lennon <ajlennon@dynamicdevices.co.uk>
  drivers/w1/w1_io.c              | 18 ++++++++++---
  5 files changed, 115 insertions(+), 9 deletions(-)
 
-diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
-index e892006..221d145 100644
 --- a/arch/arm/mach-bcm2708/bcm2708.c
 +++ b/arch/arm/mach-bcm2708/bcm2708.c
 @@ -32,6 +32,7 @@
@@ -58,7 +56,7 @@ index e892006..221d145 100644
  
  static void __init bcm2708_init_led(void);
  
-@@ -258,6 +266,20 @@ static struct platform_device bcm2708_dmaman_device = {
+@@ -258,6 +266,20 @@ static struct platform_device bcm2708_dm
        .num_resources = ARRAY_SIZE(bcm2708_dmaman_resources),
  };
  
@@ -97,8 +95,6 @@ index e892006..221d145 100644
  module_param(reboot_part, uint, 0644);
 +module_param(w1_gpio_pin, uint, 0644);
 +module_param(w1_gpio_pullup, uint, 0644);
-diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
-index 9709b8b..b10f9c9 100644
 --- a/drivers/w1/masters/w1-gpio.c
 +++ b/drivers/w1/masters/w1-gpio.c
 @@ -23,6 +23,15 @@
@@ -134,7 +130,7 @@ index 9709b8b..b10f9c9 100644
  #if defined(CONFIG_OF)
  static struct of_device_id w1_gpio_dt_ids[] = {
        { .compatible = "w1-gpio" },
-@@ -102,14 +121,16 @@ static int w1_gpio_probe_dt(struct platform_device *pdev)
+@@ -102,14 +121,16 @@ static int w1_gpio_probe_dt(struct platf
  static int w1_gpio_probe(struct platform_device *pdev)
  {
        struct w1_bus_master *master;
@@ -157,7 +153,7 @@ index 9709b8b..b10f9c9 100644
                }
        }
  
-@@ -127,6 +148,19 @@ static int w1_gpio_probe(struct platform_device *pdev)
+@@ -127,6 +148,19 @@ static int w1_gpio_probe(struct platform
                return -ENOMEM;
        }
  
@@ -177,7 +173,7 @@ index 9709b8b..b10f9c9 100644
        err = devm_gpio_request(&pdev->dev, pdata->pin, "w1");
        if (err) {
                dev_err(&pdev->dev, "gpio_request (pin) failed\n");
-@@ -156,6 +190,14 @@ static int w1_gpio_probe(struct platform_device *pdev)
+@@ -156,6 +190,14 @@ static int w1_gpio_probe(struct platform
                master->set_pullup = w1_gpio_set_pullup;
        }
  
@@ -192,7 +188,7 @@ index 9709b8b..b10f9c9 100644
        err = w1_add_master_device(master);
        if (err) {
                dev_err(&pdev->dev, "w1_add_master device failed\n");
-@@ -186,6 +228,9 @@ static int w1_gpio_remove(struct platform_device *pdev)
+@@ -186,6 +228,9 @@ static int w1_gpio_remove(struct platfor
  
        w1_remove_master_device(master);
  
@@ -202,8 +198,6 @@ index 9709b8b..b10f9c9 100644
        return 0;
  }
  
-diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
-index ca8081a..3392959 100644
 --- a/drivers/w1/w1.h
 +++ b/drivers/w1/w1.h
 @@ -148,6 +148,12 @@ struct w1_bus_master
@@ -219,11 +213,9 @@ index ca8081a..3392959 100644
        /** Really nice hardware can handles the different types of ROM search
         *  w1_master* is passed to the slave found callback.
         */
-diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
-index 590bd8a..a4d69b6 100644
 --- a/drivers/w1/w1_int.c
 +++ b/drivers/w1/w1_int.c
-@@ -118,6 +118,20 @@ int w1_add_master_device(struct w1_bus_master *master)
+@@ -118,6 +118,20 @@ int w1_add_master_device(struct w1_bus_m
                return(-EINVAL);
          }
  
@@ -244,11 +236,9 @@ index 590bd8a..a4d69b6 100644
        /* Lock until the device is added (or not) to w1_masters. */
        mutex_lock(&w1_mlock);
        /* Search for the first available id (starting at 1). */
-diff --git a/drivers/w1/w1_io.c b/drivers/w1/w1_io.c
-index e10acc2..667fdd5 100644
 --- a/drivers/w1/w1_io.c
 +++ b/drivers/w1/w1_io.c
-@@ -127,10 +127,22 @@ static void w1_pre_write(struct w1_master *dev)
+@@ -127,10 +127,22 @@ static void w1_pre_write(struct w1_maste
  static void w1_post_write(struct w1_master *dev)
  {
        if (dev->pullup_duration) {
@@ -274,6 +264,3 @@ index e10acc2..667fdd5 100644
                dev->pullup_duration = 0;
        }
  }
--- 
-1.9.1
-