| From 7ddb83fcea8c4a18f20e964a641285b6d504a93f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 12 May 2021 15:07:09 +0200 |
| Subject: ARM: dts: BCM5301X: Fixup SPI binding |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Rafał Miłecki <rafal@milecki.pl> |
| |
| [ Upstream commit d5aede3e6dd1b8ca574600a1ecafe1e580c53f2f ] |
| |
| 1. Reorder interrupts |
| 2. Fix typo: s/spi_lr_overhead/spi_lr_overread/ |
| 3. Rename node: s/spi-nor@0/flash@0/ |
| |
| This fixes: |
| arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dt.yaml: spi@18029200: interrupt-names: 'oneOf' conditional failed, one must be fixed: |
| ['spi_lr_fullness_reached', 'spi_lr_session_aborted', 'spi_lr_impatient', 'spi_lr_session_done', 'spi_lr_overhead', 'mspi_done', 'mspi_halted'] is too long |
| Additional items are not allowed ('spi_lr_session_aborted', 'spi_lr_impatient', 'spi_lr_session_done', 'spi_lr_overhead', 'mspi_done', 'mspi_halted' were unexpected) |
| 'mspi_done' was expected |
| 'spi_l1_intr' was expected |
| 'mspi_halted' was expected |
| 'spi_lr_fullness_reached' was expected |
| 'spi_lr_session_aborted' was expected |
| 'spi_lr_impatient' was expected |
| 'spi_lr_session_done' was expected |
| 'spi_lr_overread' was expected |
| From schema: Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml |
| arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dt.yaml: spi-nor@0: $nodename:0: 'spi-nor@0' does not match '^flash(@.*)?$' |
| From schema: Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml |
| |
| Signed-off-by: Rafał Miłecki <rafal@milecki.pl> |
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm/boot/dts/bcm5301x.dtsi | 18 +++++++++--------- |
| 1 file changed, 9 insertions(+), 9 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi |
| index 7db72a2f1020..86872e12c355 100644 |
| --- a/arch/arm/boot/dts/bcm5301x.dtsi |
| +++ b/arch/arm/boot/dts/bcm5301x.dtsi |
| @@ -520,27 +520,27 @@ |
| <0x1811b408 0x004>, |
| <0x180293a0 0x01c>; |
| reg-names = "mspi", "bspi", "intr_regs", "intr_status_reg"; |
| - interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>, |
| + interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>, |
| + <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>, |
| + <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", |
| + <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>; |
| + interrupt-names = "mspi_done", |
| + "mspi_halted", |
| + "spi_lr_fullness_reached", |
| "spi_lr_session_aborted", |
| "spi_lr_impatient", |
| "spi_lr_session_done", |
| - "spi_lr_overhead", |
| - "mspi_done", |
| - "mspi_halted"; |
| + "spi_lr_overread"; |
| clocks = <&iprocmed>; |
| clock-names = "iprocmed"; |
| num-cs = <2>; |
| #address-cells = <1>; |
| #size-cells = <0>; |
| |
| - spi_nor: spi-nor@0 { |
| + spi_nor: flash@0 { |
| compatible = "jedec,spi-nor"; |
| reg = <0>; |
| spi-max-frequency = <20000000>; |
| -- |
| 2.30.2 |
| |