diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-24 11:59:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-24 11:59:02 -0400 |
| commit | 2ee490a0245b65826a8ce8e42e34c9bf805d3656 (patch) | |
| tree | c53f7d3513bd284b181d3aaa61534a0d62751884 /arch/arm/dts | |
| parent | ec8fb48ce98987065493b27422200897cf0909f8 (diff) | |
| parent | 0a71cd77290ca317ecf6f15984a91abbee741e09 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
drivers/net/zynq_gem.c
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/am4372.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/dts/dra7.dtsi | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/dts/am4372.dtsi b/arch/arm/dts/am4372.dtsi index c95d1d3b35..3ffa8e016e 100644 --- a/arch/arm/dts/am4372.dtsi +++ b/arch/arm/dts/am4372.dtsi @@ -547,6 +547,7 @@ active_slave = <0>; cpts_clock_mult = <0x80000000>; cpts_clock_shift = <29>; + syscon = <&scm_conf>; ranges; davinci_mdio: mdio@4a101000 { diff --git a/arch/arm/dts/dra7.dtsi b/arch/arm/dts/dra7.dtsi index e7fecf7656..0f242e6489 100644 --- a/arch/arm/dts/dra7.dtsi +++ b/arch/arm/dts/dra7.dtsi @@ -1411,7 +1411,7 @@ ti,irqs-safe-map = <0>; }; - mac: ethernet@4a100000 { + mac: ethernet@48484000 { compatible = "ti,cpsw"; ti,hwmods = "gmac"; clocks = <&dpll_gmac_ck>, <&gmac_gmii_ref_clk_div>; @@ -1426,6 +1426,7 @@ active_slave = <0>; cpts_clock_mult = <0x80000000>; cpts_clock_shift = <29>; + syscon = <&scm_conf>; reg = <0x48484000 0x1000 0x48485200 0x2E00>; #address-cells = <1>; |