Skip to content

Commit

Permalink
Merge tag 'lpc18xx_dts_for_4.9' of https://github.com/manabian/linux-lpc
Browse files Browse the repository at this point in the history
 into next/dt

Merge "Device Tree additions for LPC18xx platform" from Joachim Eastwood:

Small fix for the compatible string for the NXP SE97 I2C chip on the
Hitex Eval board from Guenter and a couple of additional DT properties
for the DWMAC that is need for correct operation.

* tag 'lpc18xx_dts_for_4.9' of https://github.com/manabian/linux-lpc:
  ARM: dts: lpc18xx: configure dwmac properly
  ARM: dts: lpc4350-hitex-eval: fix binding for SE97 i2c device
  • Loading branch information
Arnd Bergmann committed Sep 13, 2016
2 parents 92467a5 + 3ed6d3c commit 94c6a37
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/lpc18xx.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,10 @@
clock-names = "stmmaceth";
resets = <&rgu 22>;
reset-names = "stmmaceth";
rx-fifo-depth = <256>;
tx-fifo-depth = <256>;
snps,pbl = <4>; /* 32 (8x mode) */
snps,force_thresh_dma_mode;
status = "disabled";
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/lpc4350-hitex-eval.dts
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@

/* NXP SE97BTP with temperature sensor + eeprom */
sensor@18 {
compatible = "nxp,jc42";
compatible = "nxp,se97", "jedec,jc-42.4-temp";
reg = <0x18>;
};

Expand Down

0 comments on commit 94c6a37

Please sign in to comment.