diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-24 08:20:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-24 08:20:43 -0400 |
| commit | ec8fb48ce98987065493b27422200897cf0909f8 (patch) | |
| tree | e56d70ee24a04ee26fe75ac2af46c22705da61ed /arch/arm/dts/zynq-7000.dtsi | |
| parent | c98dc5a13399414fb651a80d05fa682236c4444e (diff) | |
| parent | ad5b5801264e573bfbf17a20b04c546985c5bfc1 (diff) | |
| download | talos-obmc-uboot-ec8fb48ce98987065493b27422200897cf0909f8.tar.gz talos-obmc-uboot-ec8fb48ce98987065493b27422200897cf0909f8.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/arm/dts/zynq-7000.dtsi')
| -rw-r--r-- | arch/arm/dts/zynq-7000.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/dts/zynq-7000.dtsi b/arch/arm/dts/zynq-7000.dtsi index a327557c19..b618a3f484 100644 --- a/arch/arm/dts/zynq-7000.dtsi +++ b/arch/arm/dts/zynq-7000.dtsi @@ -251,7 +251,7 @@ slcr: slcr@f8000000 { #address-cells = <1>; #size-cells = <1>; - compatible = "xlnx,zynq-slcr", "syscon", "simple-bus"; + compatible = "xlnx,zynq-slcr", "syscon", "simple-mfd"; reg = <0xF8000000 0x1000>; ranges; clkc: clkc@100 { |
