1 --- a/drivers/gpio/gpio-74x164.c
2 +++ b/drivers/gpio/gpio-74x164.c
3 @@ -107,8 +107,18 @@ static int gen_74x164_direction_output(s
4 static int gen_74x164_probe(struct spi_device *spi)
6 struct gen_74x164_chip *chip;
7 + struct gen_74x164_chip_platform_data *pdata;
8 + struct device_node *np;
11 + pdata = spi->dev.platform_data;
12 + np = spi->dev.of_node;
14 + if (!np && !pdata) {
15 + dev_err(&spi->dev, "No configuration data available.\n");
20 * bits_per_word cannot be configured in platform data
22 @@ -130,18 +140,27 @@ static int gen_74x164_probe(struct spi_d
23 chip->gpio_chip.set = gen_74x164_set_value;
24 chip->gpio_chip.base = -1;
26 - if (of_property_read_u32(spi->dev.of_node, "registers-number",
27 - &chip->registers)) {
29 - "Missing registers-number property in the DT.\n");
32 + if (of_property_read_u32(spi->dev.of_node, "registers-number", &chip->registers)) {
33 + dev_err(&spi->dev, "Missing registers-number property in the DT.\n");
38 + chip->registers = pdata->num_registers;
41 + if (!chip->registers)
42 + chip->registers = 1;
44 chip->gpio_chip.ngpio = GEN_74X164_NUMBER_GPIOS * chip->registers;
45 chip->buffer = devm_kzalloc(&spi->dev, chip->registers, GFP_KERNEL);
49 + if (pdata && pdata->init_data)
50 + memcpy(chip->buffer, pdata->init_data, chip->registers);
52 chip->gpio_chip.can_sleep = true;
53 chip->gpio_chip.dev = &spi->dev;
54 chip->gpio_chip.owner = THIS_MODULE;
56 +++ b/include/linux/spi/74x164.h
58 +#ifndef LINUX_SPI_74X164_H
59 +#define LINUX_SPI_74X164_H
61 +struct gen_74x164_chip_platform_data {
62 + /* number assigned to the first GPIO */
64 + /* number of chained registers */
65 + unsigned num_registers;
66 + /* address of a buffer containing initial data */