From: Stephen Rothwell <sfr@canb.auug.org.au> To: Greg KH <greg@kroah.com>, Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>, ARM <linux-arm-kernel@lists.infradead.org> Cc: Bjorn Andersson <bjorn.andersson@linaro.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Matthias Kaehlcke <mka@chromium.org> Subject: linux-next: manual merge of the usb tree with the arm-soc tree Date: Thu, 17 Jun 2021 14:43:46 +1000 [thread overview] Message-ID: <20210617144346.564be887@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 2738 bytes --] Hi all, Today's linux-next merge of the usb tree got conflicts in: arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts between commit: 39441f73d91a ("arm64: dts: qcom: sc7180: lazor: Simplify disabling of charger thermal zone") from the arm-soc tree and commit: 1da8116eb0c5 ("arm64: dts: qcom: sc7180-trogdor: Add nodes for onboard USB hub") from the usb tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts index 30e3e769d2b4,bae85f6b2bfa..000000000000 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts @@@ -14,17 -14,15 +14,6 @@@ compatible = "google,lazor-rev0", "qcom,sc7180"; }; - &pp3300_hub { - /* pp3300_l7c is used to power the USB hub */ - /delete-property/regulator-always-on; - /delete-property/regulator-boot-on; - }; - - &pp3300_l7c { - regulator-always-on; - regulator-boot-on; -/* - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is - * not supported by the PM6150 ADC driver. Disable the charger thermal zone - * to avoid using bogus temperature values. - */ -&charger_thermal { - status = "disabled"; --}; -- &sn65dsi86_out { /* * Lane 0 was incorrectly mapped on the cable, but we've now decided diff --cc arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts index c2ef06367baf,343ed457efb2..000000000000 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts @@@ -14,13 -14,20 +14,10 @@@ compatible = "google,lazor-rev1", "google,lazor-rev2", "qcom,sc7180"; }; - &pp3300_hub { - /* pp3300_l7c is used to power the USB hub */ - /delete-property/regulator-always-on; - /delete-property/regulator-boot-on; -/* - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is - * not supported by the PM6150 ADC driver. Disable the charger thermal zone - * to avoid using bogus temperature values. - */ -&charger_thermal { - status = "disabled"; -}; - - + &usb_hub_2_0 { + vdd-supply = <&pp3300_l7c>; }; - &pp3300_l7c { - regulator-always-on; - regulator-boot-on; + &usb_hub_3_0 { + vdd-supply = <&pp3300_l7c>; }; [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: Greg KH <greg@kroah.com>, Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>, ARM <linux-arm-kernel@lists.infradead.org> Cc: Bjorn Andersson <bjorn.andersson@linaro.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Matthias Kaehlcke <mka@chromium.org> Subject: linux-next: manual merge of the usb tree with the arm-soc tree Date: Thu, 17 Jun 2021 14:43:46 +1000 [thread overview] Message-ID: <20210617144346.564be887@canb.auug.org.au> (raw) [-- Attachment #1.1: Type: text/plain, Size: 2738 bytes --] Hi all, Today's linux-next merge of the usb tree got conflicts in: arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts between commit: 39441f73d91a ("arm64: dts: qcom: sc7180: lazor: Simplify disabling of charger thermal zone") from the arm-soc tree and commit: 1da8116eb0c5 ("arm64: dts: qcom: sc7180-trogdor: Add nodes for onboard USB hub") from the usb tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts index 30e3e769d2b4,bae85f6b2bfa..000000000000 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts @@@ -14,17 -14,15 +14,6 @@@ compatible = "google,lazor-rev0", "qcom,sc7180"; }; - &pp3300_hub { - /* pp3300_l7c is used to power the USB hub */ - /delete-property/regulator-always-on; - /delete-property/regulator-boot-on; - }; - - &pp3300_l7c { - regulator-always-on; - regulator-boot-on; -/* - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is - * not supported by the PM6150 ADC driver. Disable the charger thermal zone - * to avoid using bogus temperature values. - */ -&charger_thermal { - status = "disabled"; --}; -- &sn65dsi86_out { /* * Lane 0 was incorrectly mapped on the cable, but we've now decided diff --cc arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts index c2ef06367baf,343ed457efb2..000000000000 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts @@@ -14,13 -14,20 +14,10 @@@ compatible = "google,lazor-rev1", "google,lazor-rev2", "qcom,sc7180"; }; - &pp3300_hub { - /* pp3300_l7c is used to power the USB hub */ - /delete-property/regulator-always-on; - /delete-property/regulator-boot-on; -/* - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is - * not supported by the PM6150 ADC driver. Disable the charger thermal zone - * to avoid using bogus temperature values. - */ -&charger_thermal { - status = "disabled"; -}; - - + &usb_hub_2_0 { + vdd-supply = <&pp3300_l7c>; }; - &pp3300_l7c { - regulator-always-on; - regulator-boot-on; + &usb_hub_3_0 { + vdd-supply = <&pp3300_l7c>; }; [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 176 bytes --] _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2021-06-17 4:43 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-17 4:43 Stephen Rothwell [this message] 2021-06-17 4:43 ` linux-next: manual merge of the usb tree with the arm-soc tree Stephen Rothwell 2021-06-17 16:34 ` Matthias Kaehlcke 2021-06-17 16:34 ` Matthias Kaehlcke 2021-06-17 17:30 ` Bjorn Andersson 2021-06-17 17:30 ` Bjorn Andersson 2021-06-18 6:35 ` Greg KH 2021-06-18 6:35 ` Greg KH -- strict thread matches above, loose matches on Subject: below -- 2014-07-24 6:28 Stephen Rothwell 2014-07-24 6:28 ` Stephen Rothwell 2014-07-24 6:28 ` Stephen Rothwell 2014-07-24 6:33 ` Stephen Rothwell 2014-07-24 6:33 ` Stephen Rothwell 2014-07-24 6:33 ` Stephen Rothwell 2014-07-24 6:42 ` Greg KH 2014-07-24 6:42 ` Greg KH 2014-07-24 15:39 ` Olof Johansson 2014-07-24 15:39 ` Olof Johansson 2014-07-24 15:39 ` Olof Johansson 2014-03-03 7:13 Stephen Rothwell 2014-03-03 7:13 ` Stephen Rothwell 2014-03-03 7:13 ` Stephen Rothwell 2011-10-04 5:50 Stephen Rothwell 2011-10-04 15:26 ` Greg KH 2011-10-05 8:52 ` Felipe Balbi 2011-10-05 10:51 ` Stephen Rothwell 2011-10-05 10:53 ` Felipe Balbi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210617144346.564be887@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=arnd@arndb.de \ --cc=bjorn.andersson@linaro.org \ --cc=greg@kroah.com \ --cc=gregkh@linuxfoundation.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=mka@chromium.org \ --cc=olof@lixom.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.