Re: [PATCH] ARM: dt: tegra: harmony: add regulators

[Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>]

On 08/20/2012 11:22 AM, Laxman Dewangan wrote:
> On Saturday 18 August 2012 01:25 AM, Stephen Warren wrote:
>> On 08/17/2012 01:27 PM, Stephen Warren wrote:
>>> On 08/17/2012 12:59 AM, Laxman Dewangan wrote:
>>>> Harmony uses a TPS6586x regulator. Instantiate this, and hook up a
>>>> couple of fixed GPIO-controlled regulators too.
>>>>
>>>> Based on Ventana regulator patch by Stephen Warren<swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>>>> and converted to Harmony.
>>> Thanks, applied to Tegra's for-3.7/dt branch.
>> Oh hang on, this adds regulators to DT, but doesn't do anything to
>> remove the board-file registration of Harmony's regulators from
>> board-dt-tegra20.c, which end up conflicting, and preventing the PCIe
>> driver from being registered.
>>
>> So, this patch really wants to remove the legacy code to, but doing so
>> will be problematic; to avoid runtime git bisect failures, we'd need to
>> merge the regulator tree in first, or wait until next kernel release or
>> something... Thoughts?
> 
> Why not just remove the regulator registration from board files along
> with the dt entry (in one patch). That will resolve the issue of bisect.

The problem there is that will prevent any regulators from being
registered at all, until the patch is merged with the regulator tree.
That will also prevent PCIe working on Harmony. Those both work right
now, so that's a bisection breakage.

I suppose the solution here is to merge the regulator tree into the
Tegra branch before the Harmony regulator patch. Mark, can we do that?