Commit df61b366af26 ("pinctrl: core: Use delayed work for hogs") caused a regression at least with sh-pfc that is also a GPIO controller as noted by Geert Uytterhoeven <geert@linux-m68k.org>. As the original pinctrl_register() has issues calling pin controller driver functions early before the controller has finished registering, we can't just revert commit df61b366af26. That would break the drivers using GENERIC_PINCTRL_GROUPS or GENERIC_PINMUX_FUNCTIONS. So let's fix the issue with the following steps as a single patch: 1. Revert the late_init parts of commit df61b366af26. The late_init clearly won't work and we have to just give up on fixing pinctrl_register() for GENERIC_PINCTRL_GROUPS and GENERIC_PINMUX_FUNCTIONS. 2. Split pinctrl_register() into two parts By splitting pinctrl_register() into pinctrl_init_controller() and pinctrl_create_and_start() we have better control over when it's safe to call pinctrl_create(). 3. Introduce a new pinctrl_register_and_init() function As suggested by Linus Walleij <linus.walleij@linaro.org>, we can just introduce a new function for the controllers that need pinctrl_create() called later. 4. Convert the four known problem cases to use new function Let's convert pinctrl-imx, pinctrl-single, sh-pfc and ti-iodelay to use the new function to fix the issues. The rest of the drivers can be converted later. Let's also update Documentation/pinctrl.txt accordingly because of the known issues with pinctrl_register().
Showing the changes to include/linux/pinctrl (1 of 8 files). Show all
Unified · Split
| @@ -141,12 +141,27 @@ struct pinctrl_desc { · 140 unmodified lines | ||
| 141 | 141 | }; |
| 142 | 142 | |
| 143 | 143 | /* External interface to pin controller */ |
| 144 | + | |
| 145 | +extern int pinctrl_register_and_init(struct pinctrl_desc *pctldesc, | |
| 146 | + struct device *dev, void *driver_data, | |
| 147 | + struct pinctrl_dev **pctldev); | |
| 148 | + | |
| 149 | +/* Please use pinctrl_register_and_init() instead */ | |
| 144 | 150 | extern struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc, |
| 145 | 151 | struct device *dev, void *driver_data); |
| 152 | + | |
| 146 | 153 | extern void pinctrl_unregister(struct pinctrl_dev *pctldev); |
| 154 | + | |
| 155 | +extern int devm_pinctrl_register_and_init(struct device *dev, | |
| 156 | + struct pinctrl_desc *pctldesc, | |
| 157 | + void *driver_data, | |
| 158 | + struct pinctrl_dev **pctldev); | |
| 159 | + | |
| 160 | +/* Please use devm_pinctrl_register_and_init() instead */ | |
| 147 | 161 | extern struct pinctrl_dev *devm_pinctrl_register(struct device *dev, |
| 148 | 162 | struct pinctrl_desc *pctldesc, |
| 149 | 163 | void *driver_data); |
| 164 | + | |
| 150 | 165 | extern void devm_pinctrl_unregister(struct device *dev, |
| 151 | 166 | struct pinctrl_dev *pctldev); |
| 152 | 167 | |