Commit bab8f1ff authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sti-dt-for-5.7-round1' of...

Merge tag 'sti-dt-for-5.7-round1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into arm/fixes

STi dt fixes:
-------------
  - remove deprecated Synopsys PHY dt properties
  - fix sound frame-inversion property

* tag 'sti-dt-for-5.7-round1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti:
  ARM: dts: sti: fixup sound frame-inversion for stihxxx-b2120.dtsi
  ARM: dts: sti: Remove deprecated snps PHY properties for stih410-b2260

Link: https://lore.kernel.org/r/afe20a6d-061b-a93c-2e60-206b0e8d0f81@st.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6f4ecbe2 f2466777
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -178,9 +178,6 @@
			phy-mode = "rgmii";
			pinctrl-0 = <&pinctrl_rgmii1 &pinctrl_rgmii1_mdio_1>;

			snps,phy-bus-name = "stmmac";
			snps,phy-bus-id = <0>;
			snps,phy-addr = <0>;
			snps,reset-gpio = <&pio0 7 0>;
			snps,reset-active-low;
			snps,reset-delays-us = <0 10000 1000000>;
+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@
			/* DAC */
			format = "i2s";
			mclk-fs = <256>;
			frame-inversion = <1>;
			frame-inversion;
			cpu {
				sound-dai = <&sti_uni_player2>;
			};