Pull gpio fixes from Bartosz Golaszewski: - fix kerneldocs for gpio-timberdale and gpio-nomadik - clear the "requested" flag in error path in gpiod_request_commit() - call of_xlate() if provided when setting up shared GPIOs - handle pins shared by child firmware nodes of consumer devices - fix return value check in gpio-qixis-fpga - fix suspend on gpio-mxc - fix gpio-microchip DT bindings * tag 'gpio-fixes-for-v7.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: dt-bindings: gpio: fix microchip #interrupt-cells gpio: shared: shorten the critical section in gpiochip_setup_shared() gpio: mxc: map Both Edge pad wakeup to Rising Edge gpio: qixis-fpga: Fix error handling for devm_regmap_init_mmio() gpio: shared: handle pins shared by child nodes of devices gpio: shared: call gpio_chip::of_xlate() if set gpiolib: clear requested flag if line is invalid gpio: nomadik: repair some kernel-doc comments gpio: timberdale: repair kernel-doc comments gpio: Fix resource leaks on errors in gpiochip_add_data_with_key()
Showing the changes to include (2 of 8 files). Show all
Unified · Split
| @@ -114,8 +114,7 @@ struct nmk_gpio_chip { · 113 unmodified lines | |||
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | /** | 116 | /** |
| 117 | * enum prcm_gpiocr_reg_index | 117 | * enum prcm_gpiocr_reg_index - Used to reference a PRCM GPIOCR register address. |
| 118 | * Used to reference an PRCM GPIOCR register address. | ||
| 119 | */ | 118 | */ |
| 120 | enum prcm_gpiocr_reg_index { | 119 | enum prcm_gpiocr_reg_index { |
| 121 | PRCM_IDX_GPIOCR1, | 120 | PRCM_IDX_GPIOCR1, |
| @@ -123,8 +122,7 @@ enum prcm_gpiocr_reg_index { · 1 unmodified line | |||
| 123 | PRCM_IDX_GPIOCR3 | 122 | PRCM_IDX_GPIOCR3 |
| 124 | }; | 123 | }; |
| 125 | /** | 124 | /** |
| 126 | * enum prcm_gpiocr_altcx_index | 125 | * enum prcm_gpiocr_altcx_index - Used to reference an Other alternate-C function. |
| 127 | * Used to reference an Other alternate-C function. | ||
| 128 | */ | 126 | */ |
| 129 | enum prcm_gpiocr_altcx_index { | 127 | enum prcm_gpiocr_altcx_index { |
| 130 | PRCM_IDX_GPIOCR_ALTC1, | 128 | PRCM_IDX_GPIOCR_ALTC1, |
| @@ -135,7 +133,7 @@ enum prcm_gpiocr_altcx_index { · 4 unmodified lines | |||
| 135 | }; | 133 | }; |
| 136 | 134 | ||
| 137 | /** | 135 | /** |
| 138 | * struct prcm_gpio_altcx - Other alternate-C function | 136 | * struct prcm_gpiocr_altcx - Other alternate-C function |
| 139 | * @used: other alternate-C function availability | 137 | * @used: other alternate-C function availability |
| 140 | * @reg_index: PRCM GPIOCR register index used to control the function | 138 | * @reg_index: PRCM GPIOCR register index used to control the function |
| 141 | * @control_bit: PRCM GPIOCR bit used to control the function | 139 | * @control_bit: PRCM GPIOCR bit used to control the function |
| @@ -147,7 +145,7 @@ struct prcm_gpiocr_altcx { · 5 unmodified lines | |||
| 147 | } __packed; | 145 | } __packed; |
| 148 | 146 | ||
| 149 | /** | 147 | /** |
| 150 | * struct prcm_gpio_altcx_pin_desc - Other alternate-C pin | 148 | * struct prcm_gpiocr_altcx_pin_desc - Other alternate-C pin |
| 151 | * @pin: The pin number | 149 | * @pin: The pin number |
| 152 | * @altcx: array of other alternate-C[1-4] functions | 150 | * @altcx: array of other alternate-C[1-4] functions |
| 153 | */ | 151 | */ |
| @@ -193,7 +191,7 @@ struct nmk_pingroup { · 39 unmodified lines | |||
| 193 | * numbering. | 191 | * numbering. |
| 194 | * @npins: The number of entries in @pins. | 192 | * @npins: The number of entries in @pins. |
| 195 | * @functions: The functions supported on this SoC. | 193 | * @functions: The functions supported on this SoC. |
| 196 | * @nfunction: The number of entries in @functions. | 194 | * @nfunctions: The number of entries in @functions. |
| 197 | * @groups: An array describing all pin groups the pin SoC supports. | 195 | * @groups: An array describing all pin groups the pin SoC supports. |
| 198 | * @ngroups: The number of entries in @groups. | 196 | * @ngroups: The number of entries in @groups. |
| 199 | * @altcx_pins: The pins that support Other alternate-C function on this SoC | 197 | * @altcx_pins: The pins that support Other alternate-C function on this SoC |
| @@ -9,10 +9,10 @@ · 8 unmodified lines | |||
| 9 | 9 | ||
| 10 | /** | 10 | /** |
| 11 | * struct timbgpio_platform_data - Platform data of the Timberdale GPIO driver | 11 | * struct timbgpio_platform_data - Platform data of the Timberdale GPIO driver |
| 12 | * @gpio_base The number of the first GPIO pin, set to -1 for | 12 | * @gpio_base: The number of the first GPIO pin, set to -1 for |
| 13 | * dynamic number allocation. | 13 | * dynamic number allocation. |
| 14 | * @nr_pins Number of pins that is supported by the hardware (1-32) | 14 | * @nr_pins: Number of pins that is supported by the hardware (1-32) |
| 15 | * @irq_base If IRQ is supported by the hardware, this is the base | 15 | * @irq_base: If IRQ is supported by the hardware, this is the base |
| 16 | * number of IRQ:s. One IRQ per pin will be used. Set to | 16 | * number of IRQ:s. One IRQ per pin will be used. Set to |
| 17 | * -1 if IRQ:s is not supported. | 17 | * -1 if IRQ:s is not supported. |
| 18 | */ | 18 | */ |