ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-27 09:12:39 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
4eba86820f
openwrt/target/linux/ar71xx/patches-4.9/451-gpio-74x164-improve-platform-device-support.patch

120 lines
3.3 KiB
Diff
Raw Normal View History

ar71xx: Add kernel 4.9 support This add support for kernel 4.9 to the ar71xx target. It was compile tested with the generic, NAND and mikrotik subtarget. Multiple members of the community tested it on their boards and did not report any major problem so far. Especially the NAND part received some changes to adapt to the new kernel APIs. The serial driver hack used for the Arduino Yun was not ported because the kernel changed there a lot. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2017-10-03 16:02:59 +00:00
--- a/drivers/gpio/gpio-74x164.c
+++ b/drivers/gpio/gpio-74x164.c
@@ -12,6 +12,7 @@
#include <linux/init.h>
#include <linux/mutex.h>
#include <linux/spi/spi.h>
+#include <linux/spi/74x164.h>
#include <linux/gpio.h>
#include <linux/of_gpio.h>
#include <linux/slab.h>
@@ -103,9 +104,16 @@ static int gen_74x164_direction_output(s
static int gen_74x164_probe(struct spi_device *spi)
{
struct gen_74x164_chip *chip;
+ struct gen_74x164_chip_platform_data *pdata = spi->dev.platform_data;
+ struct device_node *np = spi->dev.of_node;
u32 nregs;
int ret;
+ if (!np && !pdata) {
+ dev_err(&spi->dev, "No configuration data available.\n");
+ return -EINVAL;
+ }
+
/*
* bits_per_word cannot be configured in platform data
*/
ar71xx: fix regression in 74x164 initialization with 4.9 The memcpy of the init data relies on chip->registers to be initialized, which only happens later in the code. Move this initialization further down to make it work. This was breaking PCIe/USB on some MikroTik RouterBoard devices. Signed-off-by: Felix Fietkau <nbd@nbd.name>
2017-11-09 23:51:44 +00:00
@@ -115,12 +123,15 @@ static int gen_74x164_probe(struct spi_d
ar71xx: Add kernel 4.9 support This add support for kernel 4.9 to the ar71xx target. It was compile tested with the generic, NAND and mikrotik subtarget. Multiple members of the community tested it on their boards and did not report any major problem so far. Especially the NAND part received some changes to adapt to the new kernel APIs. The serial driver hack used for the Arduino Yun was not ported because the kernel changed there a lot. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2017-10-03 16:02:59 +00:00
if (ret < 0)
return ret;
- if (of_property_read_u32(spi->dev.of_node, "registers-number",
- &nregs)) {
- dev_err(&spi->dev,
- "Missing registers-number property in the DT.\n");
- return -EINVAL;
- }
+ if (np) {
+ if (of_property_read_u32(np, "registers-number", &nregs)) {
+ dev_err(&spi->dev,
+ "Missing registers-number property in the DT.\n");
+ return -EINVAL;
+ }
+ } else if (pdata) {
+ nregs = pdata->num_registers;
+ }
chip = devm_kzalloc(&spi->dev, sizeof(*chip) + nregs, GFP_KERNEL);
if (!chip)
ar71xx: fix regression in 74x164 initialization with 4.9 The memcpy of the init data relies on chip->registers to be initialized, which only happens later in the code. Move this initialization further down to make it work. This was breaking PCIe/USB on some MikroTik RouterBoard devices. Signed-off-by: Felix Fietkau <nbd@nbd.name>
2017-11-09 23:51:44 +00:00
@@ -133,7 +144,11 @@ static int gen_74x164_probe(struct spi_d
ar71xx: Add kernel 4.9 support This add support for kernel 4.9 to the ar71xx target. It was compile tested with the generic, NAND and mikrotik subtarget. Multiple members of the community tested it on their boards and did not report any major problem so far. Especially the NAND part received some changes to adapt to the new kernel APIs. The serial driver hack used for the Arduino Yun was not ported because the kernel changed there a lot. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2017-10-03 16:02:59 +00:00
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;
- chip->gpio_chip.base = -1;
+ if (np)
+ chip->gpio_chip.base = -1;
+ else if (pdata)
+ chip->gpio_chip.base = pdata->base;
+
chip->registers = nregs;
chip->gpio_chip.ngpio = GEN_74X164_NUMBER_GPIOS * chip->registers;
ar71xx: fix regression in 74x164 initialization with 4.9 The memcpy of the init data relies on chip->registers to be initialized, which only happens later in the code. Move this initialization further down to make it work. This was breaking PCIe/USB on some MikroTik RouterBoard devices. Signed-off-by: Felix Fietkau <nbd@nbd.name>
2017-11-09 23:51:44 +00:00
@@ -142,6 +157,9 @@ static int gen_74x164_probe(struct spi_d
chip->gpio_chip.parent = &spi->dev;
chip->gpio_chip.owner = THIS_MODULE;
+ if (pdata && pdata->init_data)
+ memcpy(chip->buffer, pdata->init_data, chip->registers);
+
mutex_init(&chip->lock);
ret = __gen_74x164_write_config(chip);
ar71xx: Add kernel 4.9 support This add support for kernel 4.9 to the ar71xx target. It was compile tested with the generic, NAND and mikrotik subtarget. Multiple members of the community tested it on their boards and did not report any major problem so far. Especially the NAND part received some changes to adapt to the new kernel APIs. The serial driver hack used for the Arduino Yun was not ported because the kernel changed there a lot. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2017-10-03 16:02:59 +00:00
@@ -170,17 +188,19 @@ static int gen_74x164_remove(struct spi_
return 0;
}
+#ifdef CONFIG_OF
static const struct of_device_id gen_74x164_dt_ids[] = {
{ .compatible = "fairchild,74hc595" },
{ .compatible = "nxp,74lvc594" },
{},
};
MODULE_DEVICE_TABLE(of, gen_74x164_dt_ids);
+#endif
static struct spi_driver gen_74x164_driver = {
.driver = {
.name = "74x164",
- .of_match_table = gen_74x164_dt_ids,
+ .of_match_table = of_match_ptr(gen_74x164_dt_ids),
},
.probe = gen_74x164_probe,
.remove = gen_74x164_remove,
--- /dev/null
+++ b/include/linux/spi/74x164.h
@@ -0,0 +1,13 @@
+#ifndef LINUX_SPI_74X164_H
+#define LINUX_SPI_74X164_H
+
+struct gen_74x164_chip_platform_data {
+ /* number assigned to the first GPIO */
+ unsigned base;
+ /* number of chained registers */
+ unsigned num_registers;
+ /* address of a buffer containing initial data */
+ u8 *init_data;
+};
+
+#endif
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
kernel: bump 4.9 to 4.9.183 Refreshed all patches. Remove upstreamed: - 010-revert-staging-vc04_services-prevent-integer-overflow-in-create_pagelist.patch Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
2019-06-24 11:42:02 +00:00
@@ -1155,7 +1155,6 @@ menu "SPI GPIO expanders"
ar71xx: Add kernel 4.9 support This add support for kernel 4.9 to the ar71xx target. It was compile tested with the generic, NAND and mikrotik subtarget. Multiple members of the community tested it on their boards and did not report any major problem so far. Especially the NAND part received some changes to adapt to the new kernel APIs. The serial driver hack used for the Arduino Yun was not ported because the kernel changed there a lot. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2017-10-03 16:02:59 +00:00
config GPIO_74X164
tristate "74x164 serial-in/parallel-out 8-bits shift register"
- depends on OF_GPIO
help
Driver for 74x164 compatible serial-in/parallel-out 8-outputs
shift registers. This driver can be used to provide access
Reference in New Issue Copy Permalink