SH pin control and GPIO rework

Quoted 40 lines · Laurent Pinchart

Quoted 29 lines · On Sunday 30 December 2012 09:12:02 Simon Horman wrote:

[ CC: linux-arm-kernel, Olof Johansson, Arnd Bergmann ]

Quoted 10 lines · Laurent Pinchart

Hi everybody,

Here's the fourth version of the SH pin control and GPIO rework patches. The patches have been rebased on top of v3.8-rc1 but are otherwise unchanged.

The series starts with the same additional platform-specific fixes as v3 (patches 4 to 7), I would appreciate if someone could review them carefully.

Quoted 6 lines

You can get the series from my git tree at

git://linuxtv.org/pinchartl/fbdev.git pinmux

I would like to push this set to v3.9 independently of the later rework and OF-related sets. Simon, can you take it in your tree ?

Sure.

One inconvenience of my tree is that it goes via the arm-soc tree and as such things need to be split out into branches. I believe in the case of this series the patches will need to be split across soc, board and pfc branches. The branches may be based on each other.

Do you think the following scheme might work:

Quoted 9 lines

Patches 1 - 7: sh-soc
Patches 8 - 21: pfc, based on sh-soc
Patches 22 - 29: soc (ARM SoC), based on pfc Patches 30 - 42: sh-soc2, based on pfc
Patches 43 - 50: pfc2, based on a merge of soc and sh-soc2 Patches 51 - 54: soc2 (ARM SoC), based on pfc2 Patches 55 - 66: pfc3, based on soc2
Patches 67 - 78: sh-soc3, based on pfc3
Patches 79 - 81: pfc4, based on sh-soc3

Quoted 4 lines

That looks good to me. Alternatively you could base pfc3 on top of a merge of soc and sh-soc2, and base pfc4 on top of a merge of soc2 and sh-soc3, but you might get conflicts in Kconfig and Makefile (they should be trivial to solve though).

Thanks, I have used the modified scheme that you describe above and all seems well. In detail, I have done the following:

Patches 1 - 7: sh-soc based on v3.8-rc1
Patches 8 - 21: pfc, based on sh-soc
Patches 22 - 29: soc (ARM SoC), based on pfc
Patches 30 - 42: sh-soc2, based on pfc
Patches 43 - 50 and 55 - 66: pfc2, based on a merge of soc and sh-soc2 Patches 51 - 54: soc2 (ARM SoC), based on pfc2
Patches 67 - 78: sh-soc3, based on pfc2
Patches 79 - 81: pfc4, based on a merge of soc2 and sh-soc-3

Assuming that nothing nasty crops I plan to push the result to the renesas tree later today.