.. | .. |
---|
1 | | -// SPDX-License-Identifier: GPL-2.0 |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-only |
---|
2 | 2 | /* |
---|
3 | 3 | * GPIO support for Cirrus Logic Madera codecs |
---|
4 | 4 | * |
---|
5 | 5 | * Copyright (C) 2015-2018 Cirrus Logic |
---|
6 | | - * |
---|
7 | | - * This program is free software; you can redistribute it and/or modify |
---|
8 | | - * it under the terms of the GNU General Public License as published by the |
---|
9 | | - * Free Software Foundation; version 2. |
---|
10 | 6 | */ |
---|
11 | 7 | |
---|
12 | 8 | #include <linux/gpio/driver.h> |
---|
.. | .. |
---|
38 | 34 | if (ret < 0) |
---|
39 | 35 | return ret; |
---|
40 | 36 | |
---|
41 | | - return !!(val & MADERA_GP1_DIR_MASK); |
---|
| 37 | + if (val & MADERA_GP1_DIR_MASK) |
---|
| 38 | + return GPIO_LINE_DIRECTION_IN; |
---|
| 39 | + |
---|
| 40 | + return GPIO_LINE_DIRECTION_OUT; |
---|
42 | 41 | } |
---|
43 | 42 | |
---|
44 | 43 | static int madera_gpio_direction_in(struct gpio_chip *chip, unsigned int offset) |
---|
.. | .. |
---|
107 | 106 | MADERA_GPIO1_CTRL_1 + reg_offset, ret); |
---|
108 | 107 | } |
---|
109 | 108 | |
---|
110 | | -static struct gpio_chip madera_gpio_chip = { |
---|
| 109 | +static const struct gpio_chip madera_gpio_chip = { |
---|
111 | 110 | .label = "madera", |
---|
112 | 111 | .owner = THIS_MODULE, |
---|
113 | 112 | .request = gpiochip_generic_request, |
---|
.. | .. |
---|
124 | 123 | static int madera_gpio_probe(struct platform_device *pdev) |
---|
125 | 124 | { |
---|
126 | 125 | struct madera *madera = dev_get_drvdata(pdev->dev.parent); |
---|
127 | | - struct madera_pdata *pdata = dev_get_platdata(madera->dev); |
---|
| 126 | + struct madera_pdata *pdata = &madera->pdata; |
---|
128 | 127 | struct madera_gpio *madera_gpio; |
---|
129 | 128 | int ret; |
---|
130 | 129 | |
---|
.. | .. |
---|
140 | 139 | madera_gpio->gpio_chip.parent = pdev->dev.parent; |
---|
141 | 140 | |
---|
142 | 141 | switch (madera->type) { |
---|
| 142 | + case CS47L15: |
---|
| 143 | + madera_gpio->gpio_chip.ngpio = CS47L15_NUM_GPIOS; |
---|
| 144 | + break; |
---|
143 | 145 | case CS47L35: |
---|
144 | 146 | madera_gpio->gpio_chip.ngpio = CS47L35_NUM_GPIOS; |
---|
145 | 147 | break; |
---|
.. | .. |
---|
151 | 153 | case CS47L91: |
---|
152 | 154 | madera_gpio->gpio_chip.ngpio = CS47L90_NUM_GPIOS; |
---|
153 | 155 | break; |
---|
| 156 | + case CS42L92: |
---|
| 157 | + case CS47L92: |
---|
| 158 | + case CS47L93: |
---|
| 159 | + madera_gpio->gpio_chip.ngpio = CS47L92_NUM_GPIOS; |
---|
| 160 | + break; |
---|
154 | 161 | default: |
---|
155 | 162 | dev_err(&pdev->dev, "Unknown chip variant %d\n", madera->type); |
---|
156 | 163 | return -EINVAL; |
---|
157 | 164 | } |
---|
158 | 165 | |
---|
159 | 166 | /* We want to be usable on systems that don't use devicetree or acpi */ |
---|
160 | | - if (pdata && pdata->gpio_base) |
---|
| 167 | + if (pdata->gpio_base) |
---|
161 | 168 | madera_gpio->gpio_chip.base = pdata->gpio_base; |
---|
162 | 169 | else |
---|
163 | 170 | madera_gpio->gpio_chip.base = -1; |
---|