Update to 3.10.31

diff --git a/KERNEL_VERSION b/KERNEL_VERSION
index 6b266693cd8db8e7bd7e64a007837f6043ed800c..ab33b0b7366d23e2de45e1d6499c2cb09f805c96 100644 (file)
--- a/KERNEL_VERSION
+++ b/KERNEL_VERSION
@@ -1 +1 @@
-3.10.30
+3.10.31

diff --git a/patches.baytrail/1103-pinctrl-add-pin-list-based-GPIO-ranges.patch b/patches.baytrail/1103-pinctrl-add-pin-list-based-GPIO-ranges.patch
index 59d556fe19436e7b0796cb8cb7313a545724a4ae..32dd6e443141e76ae8deebf1148e23034f760d23 100644 (file)
--- a/patches.baytrail/1103-pinctrl-add-pin-list-based-GPIO-ranges.patch
+++ b/patches.baytrail/1103-pinctrl-add-pin-list-based-GPIO-ranges.patch
@@ -12,15 +12,13 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
 (cherry picked from commit c8587eeef8fc219e806e868c6f0c7170c769efab)
 Signed-off-by: Darren Hart <dvhart@linux.intel.com>
 ---
- drivers/pinctrl/core.c          | 59 ++++++++++++++++++++++++++++++++++-------
- include/linux/pinctrl/pinctrl.h |  4 ++-
+ drivers/pinctrl/core.c          |   59 +++++++++++++++++++++++++++++++++-------
+ include/linux/pinctrl/pinctrl.h |    4 ++
  2 files changed, 52 insertions(+), 11 deletions(-)
 
-diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
-index 5327f35d9b5c..25bb17ebee24 100644
 --- a/drivers/pinctrl/core.c
 +++ b/drivers/pinctrl/core.c
-@@ -280,6 +280,29 @@ static int pinctrl_register_pins(struct pinctrl_dev *pctldev,
+@@ -280,6 +280,29 @@ static int pinctrl_register_pins(struct
  }
  
  /**
@@ -50,7 +48,7 @@ index 5327f35d9b5c..25bb17ebee24 100644
   * pinctrl_match_gpio_range() - check if a certain GPIO pin is in range
   * @pctldev: pin controller device to check
   * @gpio: gpio pin to check taken from the global GPIO pin space
-@@ -444,8 +467,14 @@ pinctrl_find_gpio_range_from_pin(struct pinctrl_dev *pctldev,
+@@ -444,8 +467,14 @@ pinctrl_find_gpio_range_from_pin(struct
        /* Loop over the ranges */
        list_for_each_entry(range, &pctldev->gpio_ranges, node) {
                /* Check if we're in the valid range */
@@ -85,7 +83,7 @@ index 5327f35d9b5c..25bb17ebee24 100644
  
        pinmux_free_gpio(pctldev, pin, range);
  
-@@ -589,7 +618,7 @@ static int pinctrl_gpio_direction(unsigned gpio, bool input)
+@@ -589,7 +618,7 @@ static int pinctrl_gpio_direction(unsign
        mutex_lock(&pctldev->mutex);
  
        /* Convert to the pin controllers number space */
@@ -94,7 +92,7 @@ index 5327f35d9b5c..25bb17ebee24 100644
        ret = pinmux_gpio_direction(pctldev, range, pin, input);
  
        mutex_unlock(&pctldev->mutex);
-@@ -1296,11 +1325,21 @@ static int pinctrl_gpioranges_show(struct seq_file *s, void *what)
+@@ -1298,11 +1327,21 @@ static int pinctrl_gpioranges_show(struc
  
        /* Loop over the ranges */
        list_for_each_entry(range, &pctldev->gpio_ranges, node) {
@@ -121,8 +119,6 @@ index 5327f35d9b5c..25bb17ebee24 100644
        }
  
        mutex_unlock(&pctldev->mutex);
-diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h
-index 2c2a9e8d8578..176a6c1b4e03 100644
 --- a/include/linux/pinctrl/pinctrl.h
 +++ b/include/linux/pinctrl/pinctrl.h
 @@ -49,7 +49,8 @@ struct pinctrl_pin_desc {
@@ -143,6 +139,3 @@ index 2c2a9e8d8578..176a6c1b4e03 100644
        unsigned int npins;
        struct gpio_chip *gc;
  };
--- 
-1.8.5.rc3
-

diff --git a/patches.ltsi/ltsi-makefile-addition.patch b/patches.ltsi/ltsi-makefile-addition.patch
index f957b82dc7244b003b3c1ee64e8b01decadc9cb3..f8868342562f73ef4078779dafec6087b0dcd101 100644 (file)
--- a/patches.ltsi/ltsi-makefile-addition.patch
+++ b/patches.ltsi/ltsi-makefile-addition.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 @@ -1,7 +1,7 @@
  VERSION = 3
  PATCHLEVEL = 10
- SUBLEVEL = 30
+ SUBLEVEL = 31
 -EXTRAVERSION =
 +EXTRAVERSION = -ltsi
  NAME = TOSSUG Baby Fish