Messages in this thread | | | Date | Mon, 25 Feb 2019 12:36:15 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the sound tree with the arm-soc tree |
| |
Hi Takashi,
Today's linux-next merge of the sound tree got conflicts in:
arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
between commits:
5eef17ee764d ("arm64: tegra: p2972: Sort nodes properly") be4f0dd347ad ("arm64: tegra: p2597: Sort nodes by unit-address")
from the arm-soc tree and commit:
11ce4308307c ("arm64: tegra: custom name for hda sound card")
from the sound tree.
I fixed it up (see below - in tegra194-p2972-0000.dts. the line added just needed to be moved up a few lines) 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/nvidia/tegra194-p2972-0000.dts index 34a7044927fd,39c616737232..000000000000 --- a/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts +++ b/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts diff --cc arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi index 8780b5b3d2b9,6096dfb7e17a..000000000000 --- a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi @@@ -1317,15 -1303,6 +1317,16 @@@ clock-frequency = <100000>; }; + sata@70020000 { + status = "okay"; + phys = <&{/padctl@7009f000/pads/sata/lanes/sata-0}>; + }; + + hda@70030000 { ++ nvidia,model = "jetson-tx1-hda"; + status = "okay"; + }; + usb@70090000 { phys = <&{/padctl@7009f000/pads/usb2/lanes/usb2-0}>, <&{/padctl@7009f000/pads/usb2/lanes/usb2-1}>, [unhandled content-type:application/pgp-signature] | |