diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-22 11:22:30 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-22 13:47:13 +0200 |
| commit | 6b4ba118ac1ba1318182eb3a22864e86165f0b09 (patch) | |
| tree | 4f47188239e811ae1a9ea924e2871e0726a7aff3 /target/linux/ar71xx/patches-4.14/451-gpio-74x164-improve-platform-device-support.patch | |
| parent | 7a9afb8783d60e16308f98efb59907aec0fdd5f7 (diff) | |
| download | upstream-6b4ba118ac1ba1318182eb3a22864e86165f0b09.tar.gz upstream-6b4ba118ac1ba1318182eb3a22864e86165f0b09.tar.bz2 upstream-6b4ba118ac1ba1318182eb3a22864e86165f0b09.zip | |
kernel: bump 4.14 to 4.14.66
Refreshed all patches
Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ar71xx/patches-4.14/451-gpio-74x164-improve-platform-device-support.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-4.14/451-gpio-74x164-improve-platform-device-support.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/ar71xx/patches-4.14/451-gpio-74x164-improve-platform-device-support.patch b/target/linux/ar71xx/patches-4.14/451-gpio-74x164-improve-platform-device-support.patch index a3d752e9a4..870804e937 100644 --- a/target/linux/ar71xx/patches-4.14/451-gpio-74x164-improve-platform-device-support.patch +++ b/target/linux/ar71xx/patches-4.14/451-gpio-74x164-improve-platform-device-support.patch @@ -1,6 +1,6 @@ --- a/drivers/gpio/gpio-74x164.c +++ b/drivers/gpio/gpio-74x164.c -@@ -12,6 +12,7 @@ +@@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/mutex.h> #include <linux/spi/spi.h> @@ -8,7 +8,7 @@ #include <linux/gpio.h> #include <linux/of_gpio.h> #include <linux/slab.h> -@@ -103,9 +104,16 @@ static int gen_74x164_direction_output(s +@@ -105,9 +106,16 @@ static int gen_74x164_direction_output(s static int gen_74x164_probe(struct spi_device *spi) { struct gen_74x164_chip *chip; @@ -25,7 +25,7 @@ /* * bits_per_word cannot be configured in platform data */ -@@ -115,12 +123,15 @@ static int gen_74x164_probe(struct spi_d +@@ -117,12 +125,15 @@ static int gen_74x164_probe(struct spi_d if (ret < 0) return ret; @@ -47,7 +47,7 @@ chip = devm_kzalloc(&spi->dev, sizeof(*chip) + nregs, GFP_KERNEL); if (!chip) -@@ -133,7 +144,11 @@ static int gen_74x164_probe(struct spi_d +@@ -142,7 +153,11 @@ static int gen_74x164_probe(struct spi_d chip->gpio_chip.get = gen_74x164_get_value; chip->gpio_chip.set = gen_74x164_set_value; chip->gpio_chip.set_multiple = gen_74x164_set_multiple; @@ -60,7 +60,7 @@ chip->registers = nregs; chip->gpio_chip.ngpio = GEN_74X164_NUMBER_GPIOS * chip->registers; -@@ -142,6 +157,9 @@ static int gen_74x164_probe(struct spi_d +@@ -151,6 +166,9 @@ static int gen_74x164_probe(struct spi_d chip->gpio_chip.parent = &spi->dev; chip->gpio_chip.owner = THIS_MODULE; @@ -70,7 +70,7 @@ mutex_init(&chip->lock); ret = __gen_74x164_write_config(chip); -@@ -170,17 +188,19 @@ static int gen_74x164_remove(struct spi_ +@@ -180,17 +198,19 @@ static int gen_74x164_remove(struct spi_ return 0; } @@ -109,7 +109,7 @@ +#endif --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig -@@ -1154,7 +1154,6 @@ menu "SPI GPIO expanders" +@@ -1250,7 +1250,6 @@ menu "SPI GPIO expanders" config GPIO_74X164 tristate "74x164 serial-in/parallel-out 8-bits shift register" |