diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2018-07-17 10:03:42 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2018-07-17 10:03:42 +0200 |
| commit | 08948b75939f72bd013699963cc7187f25197653 (patch) | |
| tree | 5fea43325a7cc2d94620ebeacab31c9c505af281 /arch/arm/boot/dts/am3517.dtsi | |
| parent | Merge branch 'i2c/precise-locking-names_immutable' into i2c/for-4.19 (diff) | |
| parent | Linux 4.18-rc5 (diff) | |
| download | linux-08948b75939f72bd013699963cc7187f25197653.tar.xz linux-08948b75939f72bd013699963cc7187f25197653.zip | |
Merge tag 'v4.18-rc5' into i2c/for-4.19
Linux 4.18-rc5
Diffstat (limited to 'arch/arm/boot/dts/am3517.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/am3517.dtsi | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/am3517.dtsi b/arch/arm/boot/dts/am3517.dtsi index ca294914bbb1..23ea381d363f 100644 --- a/arch/arm/boot/dts/am3517.dtsi +++ b/arch/arm/boot/dts/am3517.dtsi @@ -39,6 +39,8 @@ ti,davinci-ctrl-ram-size = <0x2000>; ti,davinci-rmii-en = /bits/ 8 <1>; local-mac-address = [ 00 00 00 00 00 00 ]; + clocks = <&emac_ick>; + clock-names = "ick"; }; davinci_mdio: ethernet@5c030000 { @@ -49,6 +51,8 @@ bus_freq = <1000000>; #address-cells = <1>; #size-cells = <0>; + clocks = <&emac_fck>; + clock-names = "fck"; }; uart4: serial@4809e000 { @@ -87,6 +91,11 @@ }; }; +/* Table Table 5-79 of the TRM shows 480ab000 is reserved */ +&usb_otg_hs { + status = "disabled"; +}; + &iva { status = "disabled"; }; |