Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c8f4065 authored by Jon Mason's avatar Jon Mason Committed by Florian Fainelli
Browse files

ARM: dts: BCM5301X: convert to iProc QSPI 



The iproc-qspi driver is the SPI driver that should be used going
forward.  Modify the SPI DT entry to use this driver, and add an entry
in the bcm953012k DTS file to enable the SPI.

Tested on the bcm953012k board.

Signed-off-by: default avatarJon Mason <jon.mason@broadcom.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent df299205

arch/arm/boot/dts/bcm5301x.dtsi

+36 −14
Original line number Diff line number Diff line
@@ -298,20 +298,6 @@ 
			};

		};



		spi@29000 {

			reg = <0x00029000 0x1000>;

			#address-cells = <1>;

			#size-cells = <0>;



			spi_nor: spi-nor@0 {

				compatible = "jedec,spi-nor";

				reg = <0>;

				spi-max-frequency = <20000000>;

				linux,part-probe = "ofpart", "bcm47xxpart";

				status = "disabled";

			};

		};



		gmac0: ethernet@24000 {

			reg = <0x24000 0x800>;

		};
@@ -375,4 +361,40 @@ 


		brcm,nand-has-wp;

	};



	spi@18029200 {

		compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";

		reg = <0x18029200 0x184>,

		      <0x18029000 0x124>,

		      <0x1811b408 0x004>,

		      <0x180293a0 0x01c>;

		reg-names = "mspi", "bspi", "intr_regs", "intr_status_reg";

		interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "spi_lr_fullness_reached",

				  "spi_lr_session_aborted",

				  "spi_lr_impatient",

				  "spi_lr_session_done",

				  "spi_lr_overhead",

				  "mspi_done",

				  "mspi_halted";

		clocks = <&iprocmed>;

		clock-names = "iprocmed";

		num-cs = <2>;

		#address-cells = <1>;

		#size-cells = <0>;



		spi_nor: spi-nor@0 {

			compatible = "jedec,spi-nor";

			reg = <0>;

			spi-max-frequency = <20000000>;

			linux,part-probe = "ofpart", "bcm47xxpart";

			status = "disabled";

		};

	};

};

arch/arm/boot/dts/bcm953012k.dts

+26 −0
Original line number Diff line number Diff line
@@ -84,6 +84,32 @@ 
	};

};



&spi_nor {

	status = "okay";

	spi-max-frequency = <62500000>;

	m25p,default-addr-width = <3>;



	#address-cells = <1>;

	#size-cells = <1>;



	partition@0 {

		label = "boot";

		reg = <0x00000000 0x000d0000>;

	};

	partition@d000 {

		label = "env";

		reg = <0x000d0000 0x00030000>;

	};

	partition@100000 {

		label = "system";

		reg = <0x00100000 0x00600000>;

	};

	partition@700000 {

		label = "rootfs";

		reg = <0x00700000 0x00900000>;

	};

};



&uart0 {

	clock-frequency = <62499840>;

};