diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-04-25 12:14:43 +0900 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2016-05-24 11:15:00 +0200 |
| commit | 621a93e14068787fe07dd31079da9fdf0b312dea (patch) | |
| tree | 019faa7be3592b161fb33855d05e06ef7833b129 /arch | |
| parent | a6b9587bad47749118229da32c7cc3c25a16d962 (diff) | |
| download | talos-obmc-uboot-621a93e14068787fe07dd31079da9fdf0b312dea.tar.gz talos-obmc-uboot-621a93e14068787fe07dd31079da9fdf0b312dea.zip | |
ARM: dts: zynq: describe SLCR as simple-mfd rather than simple-bus
Commit 9f56917ab88a ("dm: core: make simple-bus compatible to
simple-mfd") made possible to import the following commit:
Linux commit: bc5ba9b98435bf76d92e0954da1784695aa449f1
The SLCR (System-Level Control Registers) block is an MFD (Multi
Function Device) rather than a bus.
"simple-mfd" seems a more suitable compatible string than "simple-bus".
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch')
| -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 { |
