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;
Message-ID: <faff027d-2a6a-22ca-2487-2ae05223fabd@rocketmail.com>
Date:   Fri, 16 Jun 2023 22:02:41 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.11.0
Subject: Re: [GIT PULL] Immutable branch between MFD and Power due for the
 v6.5 merge window
To:     Lee Jones <lee@kernel.org>
Cc:     Sebastian Reichel <sre@kernel.org>,
        Liam Girdwood <lgirdwood@gmail.com>,
        Mark Brown <broonie@kernel.org>,
        Rob Herring <robh+dt@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Beomho Seo <beomho.seo@samsung.com>,
        Chanwoo Choi <cw00.choi@samsung.com>,
        Stephan Gerhold <stephan@gerhold.net>,
        Raymond Hackley <raymondhackley@protonmail.com>,
        Pavel Machek <pavel@ucw.cz>, Axel Lin <axel.lin@ingics.com>,
        ChiYuan Huang <cy_huang@richtek.com>,
        Linus Walleij <linus.walleij@linaro.org>,
        Henrik Grimler <henrik@grimler.se>,
        Christophe Jaillet <christophe.jaillet@wanadoo.fr>,
        linux-pm@vger.kernel.org, devicetree@vger.kernel.org,
        linux-kernel@vger.kernel.org, phone-devel@vger.kernel.org,
        ~postmarketos/upstreaming@lists.sr.ht
References: <cover.1684182964.git.jahau.ref@rocketmail.com>
 <cover.1684182964.git.jahau@rocketmail.com>
 <20230609064753.GL3635807@google.com>
Content-Language: en-US
From:   Jakob Hauser <jahau@rocketmail.com>
In-Reply-To: <20230609064753.GL3635807@google.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

Hi Lee,

On 09.06.23 08:47, Lee Jones wrote:
> Enjoy!
> 
> The following changes since commit ac9a78681b921877518763ba0e89202254349d1b:
> 
>    Linux 6.4-rc1 (2023-05-07 13:34:35 -0700)
> 
> are available in the Git repository at:
> 
>    git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-power-v6.5
> 
> for you to fetch changes up to b54185c1e3b02c91e4a190ac5c346ea7bfb0de93:
> 
>    dt-bindings: Add rt5033 MFD, Regulator and Charger (2023-06-08 18:18:13 +0100)
> 
> ----------------------------------------------------------------
> Immutable branch between MFD and Power due for the v6.5 merge window
> 
> ----------------------------------------------------------------
> Jakob Hauser (8):
>        mfd: rt5033: Fix chip revision readout
>        mfd: rt5033: Fix STAT_MASK, HZ_MASK and AICR defines
>        mfd: rt5033: Apply preparatory changes before adding rt5033-charger driver
>        power: supply: rt5033_charger: Add RT5033 charger device driver
>        power: supply: rt5033_battery: Move struct rt5033_battery to battery driver
>        power: supply: rt5033_battery: Adopt status property from charger
>        dt-bindings: power: supply: rt5033-battery: Apply unevaluatedProperties
>        dt-bindings: Add rt5033 MFD, Regulator and Charger
> 
> Stephan Gerhold (1):
>        mfd: rt5033: Drop rt5033-battery sub-device
> 
>   .../devicetree/bindings/mfd/richtek,rt5033.yaml    | 138 ++++++
>   .../power/supply/richtek,rt5033-battery.yaml       |   2 +-
>   .../power/supply/richtek,rt5033-charger.yaml       |  65 +++
>   drivers/mfd/rt5033.c                               |   8 +-
>   drivers/power/supply/Kconfig                       |   8 +
>   drivers/power/supply/Makefile                      |   1 +
>   drivers/power/supply/rt5033_battery.c              |  38 +-
>   drivers/power/supply/rt5033_charger.c              | 472 +++++++++++++++++++++
>   include/linux/mfd/rt5033-private.h                 |  64 ++-
>   include/linux/mfd/rt5033.h                         |  24 --
>   10 files changed, 762 insertions(+), 58 deletions(-)
>   create mode 100644 Documentation/devicetree/bindings/mfd/richtek,rt5033.yaml
>   create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt5033-charger.yaml
>   create mode 100644 drivers/power/supply/rt5033_charger.c
> 

I just realized that there is one patch missing in the immutable branch 
"ib-mfd-power-v6.5" [1]. Unfortunately I haven't noticed earlier. The 
immutable branch holds 9 patches, the patchset has 10 patches [2]. The 
missing patch is No. 6 "power: supply: rt5033_charger: Add cable 
detection and USB OTG supply".

As this patch No. 6 affects only the file 
drivers/power/supply/rt5033_charger.c and is the last patch on that 
file, it's no problem to add this patch on top of the other patches.

Could you submit another pull request for the v6.5 merge window to add 
this patch?

[1] 
https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/log/?h=ib-mfd-power-6.5
[2] 
https://lore.kernel.org/linux-pm/cover.1684182964.git.jahau@rocketmail.com/T/#t

Kind regards,
Jakob