| Message ID | 1431524980-13599-8-git-send-email-thierry.reding@gmail.com |
|---|---|
| State | New |
| Headers | show |
On Wednesday 13 May 2015 15:49:39 Thierry Reding wrote: > ARM: tegra: Devicetree changes for v4.2-rc1 > > Contains a couple of fixes and additions to device tree files. The most > notable change is a fix for a misapplied patch that was only exposed by > a recent change in the regulator subsystem that caused USB to break on > Tegra124 recently. It sounds like I should merge commit a4b6916cb35 ("ARM: tegra: Correct which USB controller has the UTMI pad registers") into the 4.1 fixes branch as well. Please confirm. > Other than that there are a more or less random assortment of additions > to enable various features on a couple of boards. > Pulled into next/dt, thanks! Arnd
On Wed, May 13, 2015 at 06:09:20PM +0200, Arnd Bergmann wrote: > On Wednesday 13 May 2015 15:49:39 Thierry Reding wrote: > > ARM: tegra: Devicetree changes for v4.2-rc1 > > > > Contains a couple of fixes and additions to device tree files. The most > > notable change is a fix for a misapplied patch that was only exposed by > > a recent change in the regulator subsystem that caused USB to break on > > Tegra124 recently. > > It sounds like I should merge commit a4b6916cb35 ("ARM: tegra: Correct > which USB controller has the UTMI pad registers") into the 4.1 fixes > branch as well. Please confirm. I think you already did. I sent out a pull request for that not very long ago and I must have forgotten to drop this patch from the Tegra tree after it got applied to arm-soc. The merge commit for this in the fixes branch is here: https://git.kernel.org/cgit/linux/kernel/git/arm/arm-soc.git/commit/?h=fixes&id=155171274d1dd9d9e5a012bd912c592402aa31d2 Hopefully git will be able to merge these together without conflicts. Sorry about the dupe. Thierry
On Friday 15 May 2015 12:43:34 Thierry Reding wrote: > On Wed, May 13, 2015 at 06:09:20PM +0200, Arnd Bergmann wrote: > > On Wednesday 13 May 2015 15:49:39 Thierry Reding wrote: > > > ARM: tegra: Devicetree changes for v4.2-rc1 > > > > > > Contains a couple of fixes and additions to device tree files. The most > > > notable change is a fix for a misapplied patch that was only exposed by > > > a recent change in the regulator subsystem that caused USB to break on > > > Tegra124 recently. > > > > It sounds like I should merge commit a4b6916cb35 ("ARM: tegra: Correct > > which USB controller has the UTMI pad registers") into the 4.1 fixes > > branch as well. Please confirm. > > I think you already did. I sent out a pull request for that not very > long ago and I must have forgotten to drop this patch from the Tegra > tree after it got applied to arm-soc. The merge commit for this in > the fixes branch is here: > > https://git.kernel.org/cgit/linux/kernel/git/arm/arm-soc.git/commit/?h=fixes&id=155171274d1dd9d9e5a012bd912c592402aa31d2 > > Hopefully git will be able to merge these together without conflicts. > Sorry about the dupe. > Everything is fine. Since both branches have the same commit ID, git can figure out how to do the merges. It would only be annoying to get the same patch with two different commit IDs. Ideally, your pull request would mention this kind of situation, so I don't need to ask or research myself about it. Arnd
Hi ARM SoC maintainers, The following changes since commit b787f68c36d49bb1d9236f403813641efa74a031: Linux 4.1-rc1 (2015-04-26 17:59:10 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-4.2-dt for you to fetch changes up to 869bd180b8e6a81525acab21a5ee4428685bda2a: ARM: tegra: Fix hda2codec_2x clock and reset names (2015-05-05 14:09:02 +0200) Thanks, Thierry ---------------------------------------------------------------- ARM: tegra: Devicetree changes for v4.2-rc1 Contains a couple of fixes and additions to device tree files. The most notable change is a fix for a misapplied patch that was only exposed by a recent change in the regulator subsystem that caused USB to break on Tegra124 recently. Other than that there are a more or less random assortment of additions to enable various features on a couple of boards. ---------------------------------------------------------------- Marcel Ziswiler (3): ARM: tegra: Cardhu device-tree comment spelling fix ARM: tegra: Add Tegra30 HDA support ARM: tegra: Fix hda2codec_2x clock and reset names Thierry Reding (5): ARM: tegra: cardhu: Add power and volume keys ARM: tegra: Add missing HDMI +5V regulator ARM: tegra: jetson-tk1: Enable HDA support ARM: tegra: venice2: Mark eMMC as non-removable ARM: tegra: venice2: Set min-/max-microvolt for VDD_LED supply Tomeu Vizoso (1): ARM: tegra: Correct which USB controller has the UTMI pad registers arch/arm/boot/dts/tegra124-jetson-tk1.dts | 4 ++++ arch/arm/boot/dts/tegra124-venice2.dts | 3 +++ arch/arm/boot/dts/tegra124.dtsi | 12 ++++++------ arch/arm/boot/dts/tegra20-seaboard.dts | 12 ++++++++++++ arch/arm/boot/dts/tegra30-cardhu.dtsi | 30 +++++++++++++++++++++++++++++- arch/arm/boot/dts/tegra30.dtsi | 15 +++++++++++++++ 6 files changed, 69 insertions(+), 7 deletions(-)