Skip to content

Commit bab8f1f

Browse files
committed
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/[email protected] Signed-off-by: Olof Johansson <[email protected]>
2 parents 6f4ecbe + f246677 commit bab8f1f

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

arch/arm/boot/dts/stih410-b2260.dts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,6 @@
178178
phy-mode = "rgmii";
179179
pinctrl-0 = <&pinctrl_rgmii1 &pinctrl_rgmii1_mdio_1>;
180180

181-
snps,phy-bus-name = "stmmac";
182-
snps,phy-bus-id = <0>;
183-
snps,phy-addr = <0>;
184181
snps,reset-gpio = <&pio0 7 0>;
185182
snps,reset-active-low;
186183
snps,reset-delays-us = <0 10000 1000000>;

arch/arm/boot/dts/stihxxx-b2120.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
/* DAC */
4747
format = "i2s";
4848
mclk-fs = <256>;
49-
frame-inversion = <1>;
49+
frame-inversion;
5050
cpu {
5151
sound-dai = <&sti_uni_player2>;
5252
};

0 commit comments

Comments
 (0)