Re: [PATCH 13/13] MIPS: jz4740: Remove custom GPIO code

Paul Cercueil
2017-01-19T11:24:54Z

Le 2017-01-18 08:27, Thierry Reding a Ã©crit :

> On Wed, Jan 18, 2017 at 12:14:21AM +0100, Paul Cercueil wrote:
>
>> All the drivers for the various hardware elements of the jz4740 SoC
>> have been modified to use the pinctrl framework for their pin
>> configuration needs. As such, this platform code is now unused and can
>> be deleted. Signed-off-by: Paul Cercueil <paul@crapouillou.net> ---
>> arch/mips/include/asm/mach-jz4740/gpio.h | 371 ----------------------
>> arch/mips/jz4740/Makefile | 2 - arch/mips/jz4740/gpio.c | 519
>> ------------------------------- 3 files changed, 892 deletions(-)
>> delete mode 100644 arch/mips/jz4740/gpio.c
>
> Have you considered how this could best be merged? It's probably
> easiest
> to take all of this through the MIPS tree because we have an addition
> of
> the pinctrl that would be a replacement for the GPIO code, while at the
> same time a bunch of drivers rely on the JZ4740 GPIO code for
> successful
> compilation.
>
> That's slightly complicated by the number of drivers, so needs a lot of
> coordination, but it's not the worst I've seen.
>
> Maybe one other solution that would make the transition easier would be
> to stub out the GPIO functions if the pinctrl driver is enabled, and do
> the removal of the mach-jz4740/gpio.h after all drivers have been
> merged
> through their corresponding subsystem trees. That way all drivers
> should
> remain compilable and functional at runtime, while still having the
> possibility to merge through the subsystem trees.
>
> That said, the whole series is fairly simple, so merging everything
> through the MIPS tree sounds like the easiest way to go.
>
> Thierry

I think it would make sense to merge it through the MIPS tree, yes,
considering that the patches for the drivers in the other subsystems are
quite small, and that they just remove code (well, except the pinctrl
driver itself). Besides, the files modified are not touched very often
so the chances of breakage are pretty low.

-Paul