Commit bbc7c1db authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'omap-for-v4.14/fixes-not-urgent-dt-signed' of...

Merge tag 'omap-for-v4.14/fixes-not-urgent-dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

Pull "non-urgent dts fixes for omaps for v4.14" from Tony Lindgren:

Two non-urgent dts fixes for dra7 Ethernet quirk. These are sent
separately from the rest of the dts changes to avoid merge conflicts
as these depend on earlier fixes sent during v4.13-rc cycle.

* tag 'omap-for-v4.14/fixes-not-urgent-dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: dra72-evm-revc: workaround incorrect DP83867 RX_CTRL pin strap
  ARM: dts: dra71-evm: workaround incorrect DP83867 RX_CTRL pin strap
parents f7c18977 83f51f06
...@@ -191,6 +191,7 @@ dp83867_0: ethernet-phy@2 { ...@@ -191,6 +191,7 @@ dp83867_0: ethernet-phy@2 {
ti,tx-internal-delay = <DP83867_RGMIIDCTL_250_PS>; ti,tx-internal-delay = <DP83867_RGMIIDCTL_250_PS>;
ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>; ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;
ti,min-output-impedance; ti,min-output-impedance;
ti,dp83867-rxctrl-strap-quirk;
}; };
dp83867_1: ethernet-phy@3 { dp83867_1: ethernet-phy@3 {
...@@ -199,6 +200,7 @@ dp83867_1: ethernet-phy@3 { ...@@ -199,6 +200,7 @@ dp83867_1: ethernet-phy@3 {
ti,tx-internal-delay = <DP83867_RGMIIDCTL_250_PS>; ti,tx-internal-delay = <DP83867_RGMIIDCTL_250_PS>;
ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>; ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;
ti,min-output-impedance; ti,min-output-impedance;
ti,dp83867-rxctrl-strap-quirk;
}; };
}; };
......
...@@ -70,6 +70,7 @@ dp83867_0: ethernet-phy@2 { ...@@ -70,6 +70,7 @@ dp83867_0: ethernet-phy@2 {
ti,min-output-impedance; ti,min-output-impedance;
interrupt-parent = <&gpio6>; interrupt-parent = <&gpio6>;
interrupts = <16 IRQ_TYPE_EDGE_FALLING>; interrupts = <16 IRQ_TYPE_EDGE_FALLING>;
ti,dp83867-rxctrl-strap-quirk;
}; };
dp83867_1: ethernet-phy@3 { dp83867_1: ethernet-phy@3 {
...@@ -80,5 +81,6 @@ dp83867_1: ethernet-phy@3 { ...@@ -80,5 +81,6 @@ dp83867_1: ethernet-phy@3 {
ti,min-output-impedance; ti,min-output-impedance;
interrupt-parent = <&gpio6>; interrupt-parent = <&gpio6>;
interrupts = <16 IRQ_TYPE_EDGE_FALLING>; interrupts = <16 IRQ_TYPE_EDGE_FALLING>;
ti,dp83867-rxctrl-strap-quirk;
}; };
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment