1 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
2 Date: Fri, 29 Dec 2017 20:26:51 +0100
3 Subject: [PATCH] Revert "ARM: dts: BCM5301X: convert to iProc QSPI"
5 This reverts commit 1c8f4065072387d3b6ee7adcf0dbe3c7ba80c268.
7 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
10 --- a/arch/arm/boot/dts/bcm5301x.dtsi
11 +++ b/arch/arm/boot/dts/bcm5301x.dtsi
17 + reg = <0x00029000 0x1000>;
18 + #address-cells = <1>;
21 + spi_nor: spi-nor@0 {
22 + compatible = "jedec,spi-nor";
24 + spi-max-frequency = <20000000>;
25 + linux,part-probe = "ofpart", "bcm47xxpart";
26 + status = "disabled";
30 gmac0: ethernet@24000 {
31 reg = <0x24000 0x800>;
38 - compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi";
39 - reg = <0x18029200 0x184>,
43 - reg-names = "mspi", "bspi", "intr_regs", "intr_status_reg";
44 - interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
45 - <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
46 - <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
47 - <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
48 - <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,
49 - <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
50 - <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
51 - interrupt-names = "spi_lr_fullness_reached",
52 - "spi_lr_session_aborted",
54 - "spi_lr_session_done",
58 - clocks = <&iprocmed>;
59 - clock-names = "iprocmed";
61 - #address-cells = <1>;
64 - spi_nor: spi-nor@0 {
65 - compatible = "jedec,spi-nor";
67 - spi-max-frequency = <20000000>;
68 - linux,part-probe = "ofpart", "bcm47xxpart";
69 - status = "disabled";
74 cpu_thermal: cpu-thermal {
75 polling-delay-passive = <0>;
76 --- a/arch/arm/boot/dts/bcm953012k.dts
77 +++ b/arch/arm/boot/dts/bcm953012k.dts
84 - spi-max-frequency = <62500000>;
85 - m25p,default-addr-width = <3>;
87 - #address-cells = <1>;
92 - reg = <0x00000000 0x000d0000>;
96 - reg = <0x000d0000 0x00030000>;
100 - reg = <0x00100000 0x00600000>;
104 - reg = <0x00700000 0x00900000>;