From: Masahiro Yamada Date: Mon, 25 Apr 2016 03:14:43 +0000 (+0900) Subject: ARM: dts: zynq: describe SLCR as simple-mfd rather than simple-bus X-Git-Tag: v2016.07-rc1~175^2~27 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=621a93e14068787fe07dd31079da9fdf0b312dea;p=oweals%2Fu-boot.git 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 Signed-off-by: Michal Simek --- 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 {