1 --- a/drivers/gpio/gpio-74x164.c
2 +++ b/drivers/gpio/gpio-74x164.c
3 @@ -109,10 +109,14 @@ static int gen_74x164_probe(struct spi_d
5 struct gen_74x164_chip *chip;
6 struct gen_74x164_chip_platform_data *pdata;
7 + struct device_node *np;
10 - if (!spi->dev.of_node) {
11 - dev_err(&spi->dev, "No device tree data available.\n");
12 + pdata = spi->dev.platform_data;
13 + np = spi->dev.of_node;
15 + if (!np && !pdata) {
16 + dev_err(&spi->dev, "No configuration data available.\n");
20 @@ -129,7 +133,6 @@ static int gen_74x164_probe(struct spi_d
24 - pdata = spi->dev.platform_data;
25 if (pdata && pdata->base)
26 chip->gpio_chip.base = pdata->base;
28 @@ -146,12 +149,19 @@ static int gen_74x164_probe(struct spi_d
29 chip->gpio_chip.get = gen_74x164_get_value;
30 chip->gpio_chip.set = gen_74x164_set_value;
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");
37 + if (of_property_read_u32(spi->dev.of_node, "registers-number", &chip->registers)) {
38 + dev_err(&spi->dev, "Missing registers-number property in the DT.\n");
43 + chip->registers = pdata->num_registers;
46 + if (!chip->registers)
47 + chip->registers = 1;
49 chip->gpio_chip.ngpio = GEN_74X164_NUMBER_GPIOS * chip->registers;
50 chip->buffer = devm_kzalloc(&spi->dev, chip->registers, GFP_KERNEL);
52 @@ -159,6 +169,9 @@ static int gen_74x164_probe(struct spi_d
56 + if (pdata && pdata->init_data)
57 + memcpy(chip->buffer, pdata->init_data, chip->registers);
59 chip->gpio_chip.can_sleep = 1;
60 chip->gpio_chip.dev = &spi->dev;
61 chip->gpio_chip.owner = THIS_MODULE;
62 --- a/include/linux/spi/74x164.h
63 +++ b/include/linux/spi/74x164.h
65 struct gen_74x164_chip_platform_data {
66 /* number assigned to the first GPIO */
68 + /* number of chained registers */
69 + unsigned num_registers;
70 + /* address of a buffer containing initial data */