Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Feedback-ID: i0ad843c9:Fastmail
Subject: Re: [PATCH 1/6] dt-bindings: pinctrl: Add compatibles for Allwinner
 D1/D1s
From:   Samuel Holland <samuel@sholland.org>
To:     Linus Walleij <linus.walleij@linaro.org>
Cc:     Chen-Yu Tsai <wens@csie.org>,
        Jernej Skrabec <jernej.skrabec@gmail.com>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Maxime Ripard <mripard@kernel.org>, Ondrej Jirman <x@xff.cz>,
        Rob Herring <robh+dt@kernel.org>, devicetree@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev,
        Andre Przywara <andre.przywara@arm.com>
References: <20220626021148.56740-1-samuel@sholland.org>
 <20220626021148.56740-2-samuel@sholland.org>
 <CACRpkdY65q12sjDwH0UOOAa8GkBO--EDTsKrnEwn8NoTYTgtPQ@mail.gmail.com>
 <879fb3b2-4bcb-82d6-e186-e845d62c9843@sholland.org>
Message-ID: <3418c509-c54a-484a-cb2e-c4705bc829a6@sholland.org>
Date:   Tue, 12 Jul 2022 21:56:35 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.6.0
MIME-Version: 1.0
In-Reply-To: <879fb3b2-4bcb-82d6-e186-e845d62c9843@sholland.org>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 7/12/22 5:14 AM, Samuel Holland wrote:
> Hi Linus,
> 
> On 7/11/22 3:58 AM, Linus Walleij wrote:
>> On Sun, Jun 26, 2022 at 4:11 AM Samuel Holland <samuel@sholland.org> wrote:
>>
>>> D1 contains a pin controller similar to previous SoCs, but with some
>>> register layout changes. It includes 6 interrupt-capable pin banks.
>>>
>>> D1s is a low pin count version of the D1 SoC, with some pins omitted.
>>> The remaining pins have the same function assignments as D1.
>>>
>>> Signed-off-by: Samuel Holland <samuel@sholland.org>
>>
>> All 6 patches applied to the pinctrl tree, the last patch 6/6
>> required some fuzzing so please check the result!

I do not see anything in patch 6 that would have required a 3-way merge, so I
don't understand what the issue was here.

> Somehow the version of patch 6 applied to the pinctrl tree did not include the
> new driver source file. It only applied changes to existing files (including the
> Makefile reference to the new file).
> 
> I also needed to make some minor changes to patch 6 to resolve comments from Andre.
> 
> Is it okay if I send a v2 of just patch 6? Or do I need to send a follow-up
> based on what was already applied?

I sent a v2 of the whole series:

https://lore.kernel.org/linux-gpio/20220713025233.27248-1-samuel@sholland.org/

Please let me know if you want something different.

Regards,
Samuel