05cb6aa69f
This solution is more upstream compatible as it only requires specifying of_match_table in the parser code and doesn't depend on linux,part-probe which is solution made generic by a LEDE downstream patch that can't be upstreamed. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
110 lines
2.5 KiB
Diff
110 lines
2.5 KiB
Diff
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Fri, 29 Dec 2017 20:26:51 +0100
|
|
Subject: [PATCH] Revert "ARM: dts: BCM5301X: convert to iProc QSPI"
|
|
|
|
This reverts commit 1c8f4065072387d3b6ee7adcf0dbe3c7ba80c268.
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
---
|
|
|
|
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
|
|
@@ -337,6 +337,20 @@
|
|
};
|
|
};
|
|
|
|
+ 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>;
|
|
};
|
|
@@ -425,42 +439,6 @@
|
|
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";
|
|
- };
|
|
- };
|
|
-
|
|
thermal-zones {
|
|
cpu_thermal: cpu-thermal {
|
|
polling-delay-passive = <0>;
|
|
--- a/arch/arm/boot/dts/bcm953012k.dts
|
|
+++ b/arch/arm/boot/dts/bcm953012k.dts
|
|
@@ -80,32 +80,6 @@
|
|
};
|
|
};
|
|
|
|
-&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 {
|
|
status = "okay";
|
|
};
|