Merge tag 'arm-soc/for-4.2/dts-fixes' of http://github.com/broadcom/stblinux into next/dt (63cb275e) · Commits · 戴 / test

Merge "This pull request contains a single change" from Florian Fainelli: - fix the NAND controller node on bcm63138, the original change was a mis-merge that did not properly parent it to the "ubus" node * tag 'arm-soc/for-4.2/dts-fixes' of http://github.com/broadcom/stblinux: ARM: dts: BCM63xx: re-parent NAND controller node

arch/arm/boot/dts/bcm63138.dtsi

+11 −11

Original line number	Diff line number	Diff line
		@@ -120,17 +120,6 @@
		reg = <0x4800e0 0x10>;
		#reset-cells = <2>;
		};

		nand: nand@2000 {
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand";
		reg = <0x2000 0x600>, <0xf0 0x10>;
		reg-names = "nand", "nand-int-base";
		status = "disabled";
		interrupts = <GIC_SPI 38 0>;
		interrupt-names = "nand";
		};
		};

		/* Legacy UBUS base */
		@@ -163,6 +152,17 @@
		status = "disabled";
		};

		nand: nand@2000 {
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand";
		reg = <0x2000 0x600>, <0xf0 0x10>;
		reg-names = "nand", "nand-int-base";
		status = "disabled";
		interrupts = <GIC_SPI 38 0>;
		interrupt-names = "nand";
		};

		bootlut: bootlut@8000 {
		compatible = "brcm,bcm63138-bootlut";
		reg = <0x8000 0x50>;

Admin message