From: Ray Jui Date: Mon, 21 Sep 2015 22:12:50 +0000 (-0700) Subject: ARM: dts: fix Cygnus nand device node X-Git-Tag: firefly_0821_release~176^2~728^2~56^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=08668d9de98193936a082f36c105fc3de168b69b;p=firefly-linux-kernel-4.4.55.git ARM: dts: fix Cygnus nand device node The third compatible string "brcm,brcmnand" in bcm-cygnus.dtsi nand node is incorrect, redundant and should be removed. "brcm,brcmnand" is meant to be used by STB based Broadcom SoCs. All iProc based SoCs should use "brcm,nand-iproc". Signed-off-by: Ray Jui Signed-off-by: Florian Fainelli --- diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi index 24e058c73700..b5f9f34183fe 100644 --- a/arch/arm/boot/dts/bcm-cygnus.dtsi +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi @@ -234,8 +234,7 @@ }; nand: nand@18046000 { - compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", - "brcm,brcmnand"; + compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; reg = <0x18046000 0x600>, <0xf8105408 0x600>, <0x18046f00 0x20>; reg-names = "nand", "iproc-idm", "iproc-ext";