Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp6180011rwd; Mon, 19 Jun 2023 03:41:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7mQ5Q7CogYoiTxXx81DUR3UIB/KDxGKqT1ZYISHbkVd0OKKNvFQTbGg6CQR75/m0Mnbpmf X-Received: by 2002:a17:902:e84d:b0:1ac:85b0:1bd8 with SMTP id t13-20020a170902e84d00b001ac85b01bd8mr13657388plg.34.1687171272198; Mon, 19 Jun 2023 03:41:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687171272; cv=none; d=google.com; s=arc-20160816; b=tvcma396if6lTxkd4fXzRjTvx62TTP6qf1RHhNREPJFc2DxKVKxW/pw3vXN7GFdJ+y g1j9MOgFxc3C7uZPB0TeV7d1NiCaEyt71gX6ZZPqPCFcqzErZREPqOmMwUVPjHc5Aimy wpVFFpF7gntTADXEuBVubFwNrHH4O43OPnT5++UZLCVpzHYnT39VZQ1lhDZLepIWglPj wCUkviVl34kbnB1UVU5/v1wg6CxMxPDIGP0u/+Zhc2MsQzr6upmuLx6nEQihwGdINuHR v0Q6SHGNMn+uRosK484/1rGK6WKhFI0B7YwhQ3bqnI/C3dOzKdZJUWCQthD/aOBurQLK rpTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=x1Mg+GqbsgQa2pgjMhmmHruQZvei6T7y1G8NSUMoRFg=; b=xScounGp91OebwUz2nmsSgAKZKwLjdICGY5tdSPicjnnbM/XzF2a6yEIwt3/6SuqnK iyAcwhqcGrNGCWXyKBhDj7GWTuX3UAVhtaamwRarZ9ak2kqV7s66TEEPPKIpRun1zWx7 W4YZaRnxj6JXH/zSeE0T50olF1P9OLFaI/rmGeOryDiME11D6bW3I5ljtBHc3jBPHX8S 5aZtbno5dzmH1/2zUG9QcArKNzYDUb6EgKq5wozXDUNRxUdHx72Jecovo6Pnrp4oibi1 WCfLdHQL0DRkXeDu5Uqe+2HPaWtckZ2i2WT9hk5RevwYUvp71zqA3SDt5N7TO0YlGAcn k18Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZektIom2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lb13-20020a170902fa4d00b001b02e8d8976si6495704plb.300.2023.06.19.03.41.00; Mon, 19 Jun 2023 03:41:12 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZektIom2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229846AbjFSKgN (ORCPT + 99 others); Mon, 19 Jun 2023 06:36:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231245AbjFSKfj (ORCPT ); Mon, 19 Jun 2023 06:35:39 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B7B3173D; Mon, 19 Jun 2023 03:35:32 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B0CAE60B6D; Mon, 19 Jun 2023 10:35:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1FC56C433C9; Mon, 19 Jun 2023 10:35:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687170931; bh=5dt6l3lx8FHqgt+yEGvI0hRPuTRkjicnDuM52S/ToEU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ZektIom2LsRtOyxwQz8sOmWcQciXT8JR4ZjkunidMtKtQvHPoKihYbDXYj7jb8/vU hPNrYAL0YBaU3WLs0kYtWu+mwxs/owBgjD3NNWW8lgIWnbFSRFYNXZ9drkrNS/EGqV g1XzT83U7UMZ7vH1hzwvYbcih25AMOhSnfOWGTQueLHP2klGaqI81AUmvZlhb7A3ld 11BHHDw733l04et6x9BJwan0nQ0019Z1TQJ81ni18nKLyKxWGtxvG20zPDonFh5MGF 0P/gCyZ2aDF9HXTlpWTWffoh0r3YT5XW/jGQg1Evijre2cX8IagbSdg53Z2EQXJ3je N36FmOjONZjXA== Date: Mon, 19 Jun 2023 11:35:24 +0100 From: Lee Jones To: Jakob Hauser Cc: Sebastian Reichel , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Beomho Seo , Chanwoo Choi , Stephan Gerhold , Raymond Hackley , Pavel Machek , Axel Lin , ChiYuan Huang , Linus Walleij , Henrik Grimler , Christophe Jaillet , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht Subject: Re: [GIT PULL] Immutable branch between MFD and Power due for the v6.5 merge window Message-ID: <20230619103524.GA1472962@google.com> References: <20230609064753.GL3635807@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sebastian, On Fri, 16 Jun 2023, Jakob Hauser wrote: > 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". Did you take this pull-request? If so, would you like to apply the missing patch or would you like me to take it via MFD (without a subsequent PR)? > 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 -- Lee Jones [李琼斯]