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

Commit 8cb5a052 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Greg Kroah-Hartman
Browse files

ARM: dts: BCM5301X: Fixup SPI binding 



[ 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: default avatarRafał Miłecki <rafal@milecki.pl>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7d307d04

arch/arm/boot/dts/bcm5301x.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -451,27 +451,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>;