Unverified Commit 01c65733 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt-6.1-1' of... 

Merge tag 'mvebu-dt-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/dt

mvebu dt for 6.1 (part 1)

Add definitions for PCIe legacy INTx interrupts for dts using
pci-mvebu.c controller driver.

Add gpio-ranges for pin muxing for Armada 38x

Add audio support for Armada 38x

Turris-omnia (Armada 385 based) fix a pin name

lsxl (kirkwood based)
 - Fix fix serial line
 - Remove first ethernet port

* tag 'mvebu-dt-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu: (22 commits)
  ARM: dts: turris-omnia: Add label for wan port
  ARM: dts: turris-omnia: Define S/PDIF audio card
  ARM: mvebu: Add spdif-pins mpp pins for Armada 38x
  ARM: mvebu: add audio support to Armada 385 DB
  ARM: mvebu: add audio I2S controller to Armada 38x Device Tree
  ARM: dts: armada-38x: Add gpio-ranges for pin muxing
  ARM: dts: dove: Add definitions for PCIe error interrupts
  ARM: dts: kirkwood: Add definitions for PCIe error interrupts
  ARM: dts: armada-39x.dtsi: Add definitions for PCIe legacy INTx interrupts
  ARM: dts: armada-380.dtsi: Add definitions for PCIe legacy INTx interrupts
  ARM: dts: armada-375.dtsi: Add definitions for PCIe legacy INTx interrupts
  ARM: dts: armada-xp-mv78460.dtsi: Add definitions for PCIe legacy INTx interrupts
  ARM: dts: armada-xp-mv78260.dtsi: Add definitions for PCIe legacy INTx interrupts
  ARM: dts: armada-xp-mv78230.dtsi: Add definitions for PCIe legacy INTx interrupts
  ARM: dts: armada-xp-98dx3236.dtsi: Add definitions for PCIe legacy INTx interrupts
  ARM: dts: armada-370.dtsi: Add definitions for PCIe legacy INTx interrupts
  ARM: dts: dove: Add definitions for PCIe legacy INTx interrupts
  ARM: dts: kirkwood: Add definitions for PCIe legacy INTx interrupts
  ARM: dts: kirkwood: lsxl: remove first ethernet port
  ARM: dts: kirkwood: lsxl: fix serial line
  ...

Link: https://lore.kernel.org/r/87edw2xfle.fsf@BL-laptop


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 79a90599 649acf24

arch/arm/boot/dts/armada-370.dtsi

+24 −4
Original line number Diff line number Diff line
@@ -60,16 +60,26 @@ pcie0: pcie@1,0 { 
				reg = <0x0800 0 0 0 0>;

				#address-cells = <3>;

				#size-cells = <2>;

				interrupt-names = "intx";

				interrupts-extended = <&mpic 58>;

				#interrupt-cells = <1>;

                                ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0

                                          0x81000000 0 0 0x81000000 0x1 0 1 0>;

				bus-range = <0x00 0xff>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &mpic 58>;

				interrupt-map-mask = <0 0 0 7>;

				interrupt-map = <0 0 0 1 &pcie0_intc 0>,

						<0 0 0 2 &pcie0_intc 1>,

						<0 0 0 3 &pcie0_intc 2>,

						<0 0 0 4 &pcie0_intc 3>;

				marvell,pcie-port = <0>;

				marvell,pcie-lane = <0>;

				clocks = <&gateclk 5>;

				status = "disabled";



				pcie0_intc: interrupt-controller {

					interrupt-controller;

					#interrupt-cells = <1>;

				};

			};



			pcie2: pcie@2,0 {
@@ -78,16 +88,26 @@ pcie2: pcie@2,0 { 
				reg = <0x1000 0 0 0 0>;

				#address-cells = <3>;

				#size-cells = <2>;

				interrupt-names = "intx";

				interrupts-extended = <&mpic 62>;

				#interrupt-cells = <1>;

                                ranges = <0x82000000 0 0 0x82000000 0x2 0 1 0

                                          0x81000000 0 0 0x81000000 0x2 0 1 0>;

				bus-range = <0x00 0xff>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &mpic 62>;

				interrupt-map-mask = <0 0 0 7>;

				interrupt-map = <0 0 0 1 &pcie2_intc 0>,

						<0 0 0 2 &pcie2_intc 1>,

						<0 0 0 3 &pcie2_intc 2>,

						<0 0 0 4 &pcie2_intc 3>;

				marvell,pcie-port = <1>;

				marvell,pcie-lane = <0>;

				clocks = <&gateclk 9>;

				status = "disabled";



				pcie2_intc: interrupt-controller {

					interrupt-controller;

					#interrupt-cells = <1>;

				};

			};

		};

arch/arm/boot/dts/armada-375.dtsi

+24 −4
Original line number Diff line number Diff line
@@ -568,16 +568,26 @@ pcie0: pcie@1,0 { 
				reg = <0x0800 0 0 0 0>;

				#address-cells = <3>;

				#size-cells = <2>;

				interrupt-names = "intx";

				interrupts-extended = <&gic GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;

				#interrupt-cells = <1>;

				ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0

					  0x81000000 0 0 0x81000000 0x1 0 1 0>;

				bus-range = <0x00 0xff>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &gic GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-map-mask = <0 0 0 7>;

				interrupt-map = <0 0 0 1 &pcie0_intc 0>,

						<0 0 0 2 &pcie0_intc 1>,

						<0 0 0 3 &pcie0_intc 2>,

						<0 0 0 4 &pcie0_intc 3>;

				marvell,pcie-port = <0>;

				marvell,pcie-lane = <0>;

				clocks = <&gateclk 5>;

				status = "disabled";



				pcie0_intc: interrupt-controller {

					interrupt-controller;

					#interrupt-cells = <1>;

				};

			};



			pcie1: pcie@2,0 {
@@ -586,16 +596,26 @@ pcie1: pcie@2,0 { 
				reg = <0x1000 0 0 0 0>;

				#address-cells = <3>;

				#size-cells = <2>;

				interrupt-names = "intx";

				interrupts-extended = <&gic GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

				#interrupt-cells = <1>;

				ranges = <0x82000000 0 0 0x82000000 0x2 0 1 0

					  0x81000000 0 0 0x81000000 0x2 0 1 0>;

				bus-range = <0x00 0xff>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &gic GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-map-mask = <0 0 0 7>;

				interrupt-map = <0 0 0 1 &pcie1_intc 0>,

						<0 0 0 2 &pcie1_intc 1>,

						<0 0 0 3 &pcie1_intc 2>,

						<0 0 0 4 &pcie1_intc 3>;

				marvell,pcie-port = <0>;

				marvell,pcie-lane = <1>;

				clocks = <&gateclk 6>;

				status = "disabled";



				pcie1_intc: interrupt-controller {

					interrupt-controller;

					#interrupt-cells = <1>;

				};

			};



		};

arch/arm/boot/dts/armada-380.dtsi

+36 −6
Original line number Diff line number Diff line
@@ -64,16 +64,26 @@ pcie@1,0 { 
				reg = <0x0800 0 0 0 0>;

				#address-cells = <3>;

				#size-cells = <2>;

				interrupt-names = "intx";

				interrupts-extended = <&gic GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;

				#interrupt-cells = <1>;

				ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0

					  0x81000000 0 0 0x81000000 0x1 0 1 0>;

				bus-range = <0x00 0xff>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &gic GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-map-mask = <0 0 0 7>;

				interrupt-map = <0 0 0 1 &pcie1_intc 0>,

						<0 0 0 2 &pcie1_intc 1>,

						<0 0 0 3 &pcie1_intc 2>,

						<0 0 0 4 &pcie1_intc 3>;

				marvell,pcie-port = <0>;

				marvell,pcie-lane = <0>;

				clocks = <&gateclk 8>;

				status = "disabled";



				pcie1_intc: interrupt-controller {

					interrupt-controller;

					#interrupt-cells = <1>;

				};

			};



			/* x1 port */
@@ -83,16 +93,26 @@ pcie@2,0 { 
				reg = <0x1000 0 0 0 0>;

				#address-cells = <3>;

				#size-cells = <2>;

				interrupt-names = "intx";

				interrupts-extended = <&gic GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

				#interrupt-cells = <1>;

				ranges = <0x82000000 0 0 0x82000000 0x2 0 1 0

					  0x81000000 0 0 0x81000000 0x2 0 1 0>;

				bus-range = <0x00 0xff>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &gic GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-map-mask = <0 0 0 7>;

				interrupt-map = <0 0 0 1 &pcie2_intc 0>,

						<0 0 0 2 &pcie2_intc 1>,

						<0 0 0 3 &pcie2_intc 2>,

						<0 0 0 4 &pcie2_intc 3>;

				marvell,pcie-port = <1>;

				marvell,pcie-lane = <0>;

				clocks = <&gateclk 5>;

				status = "disabled";



				pcie2_intc: interrupt-controller {

					interrupt-controller;

					#interrupt-cells = <1>;

				};

			};



			/* x1 port */
@@ -102,16 +122,26 @@ pcie@3,0 { 
				reg = <0x1800 0 0 0 0>;

				#address-cells = <3>;

				#size-cells = <2>;

				interrupt-names = "intx";

				interrupts-extended = <&gic GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;

				#interrupt-cells = <1>;

				ranges = <0x82000000 0 0 0x82000000 0x3 0 1 0

					  0x81000000 0 0 0x81000000 0x3 0 1 0>;

				bus-range = <0x00 0xff>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &gic GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-map-mask = <0 0 0 7>;

				interrupt-map = <0 0 0 1 &pcie3_intc 0>,

						<0 0 0 2 &pcie3_intc 1>,

						<0 0 0 3 &pcie3_intc 2>,

						<0 0 0 4 &pcie3_intc 3>;

				marvell,pcie-port = <2>;

				marvell,pcie-lane = <0>;

				clocks = <&gateclk 6>;

				status = "disabled";



				pcie3_intc: interrupt-controller {

					interrupt-controller;

					#interrupt-cells = <1>;

				};

			};

		};

	};

arch/arm/boot/dts/armada-385-turris-omnia.dts

+30 −2
Original line number Diff line number Diff line
@@ -105,6 +105,33 @@ sfp: sfp { 
		 */

		status = "disabled";

	};



	sound {

		compatible = "simple-audio-card";

		simple-audio-card,name = "SPDIF";

		simple-audio-card,format = "i2s";



		simple-audio-card,cpu {

			sound-dai = <&audio_controller 1>;

		};



		simple-audio-card,codec {

			sound-dai = <&spdif_out>;

		};

	};



	spdif_out: spdif-out {

		#sound-dai-cells = <0>;

		compatible = "linux,spdif-dit";

	};

};



&audio_controller {

	/* Pin header U16, GPIO51 in SPDIFO mode */

	pinctrl-0 = <&spdif_pins>;

	pinctrl-names = "default";

	spdif-mode;

	status = "okay";

};



&bm {
@@ -166,6 +193,7 @@ &eth2 { 
	buffer-manager = <&bm>;

	bm,pool-long = <2>;

	bm,pool-short = <3>;

	label = "wan";

};



&i2c0 {
@@ -476,7 +504,7 @@ spi0cs0_pins: spi0cs0-pins { 
		marvell,function = "spi0";

	};



	spi0cs1_pins: spi0cs1-pins {

	spi0cs2_pins: spi0cs2-pins {

		marvell,pins = "mpp26";

		marvell,function = "spi0";

	};
@@ -511,7 +539,7 @@ partition@100000 { 
		};

	};



	/* MISO, MOSI, SCLK and CS1 are routed to pin header CN11 */

	/* MISO, MOSI, SCLK and CS2 are routed to pin header CN11 */

};



&uart0 {

arch/arm/boot/dts/armada-388-db.dts

+69 −0
Original line number Diff line number Diff line
@@ -36,6 +36,11 @@ internal-regs { 
			i2c@11000 {

				status = "okay";

				clock-frequency = <100000>;

				audio_codec: audio-codec@4a {

					#sound-dai-cells = <0>;

					compatible = "cirrus,cs42l51";

					reg = <0x4a>;

				};

			};



			i2c@11100 {
@@ -99,6 +104,12 @@ sdhci@d8000 { 
				no-1-8-v;

			};



			audio-controller@e8000 {

				pinctrl-0 = <&i2s_pins>;

				pinctrl-names = "default";

				status = "disabled";

			};



			usb3@f0000 {

				status = "okay";

			};
@@ -128,6 +139,64 @@ pcie@2,0 { 
			};

		};

	};



	sound {

		compatible = "simple-audio-card";

		simple-audio-card,name = "Armada 385 DB Audio";

		simple-audio-card,mclk-fs = <256>;

		simple-audio-card,widgets =

			"Headphone", "Out Jack",

			"Line", "In Jack";

		simple-audio-card,routing =

			"Out Jack", "HPL",

			"Out Jack", "HPR",

			"AIN1L", "In Jack",

			"AIN1R", "In Jack";

		status = "disabled";



		simple-audio-card,dai-link@0 {

			format = "i2s";

			cpu {

				sound-dai = <&audio_controller 0>;

			};



			codec {

				sound-dai = <&audio_codec>;

			};

		};



		simple-audio-card,dai-link@1 {

			format = "i2s";

			cpu {

				sound-dai = <&audio_controller 1>;

			};



			codec {

				sound-dai = <&spdif_out>;

			};

		};



		simple-audio-card,dai-link@2 {

			format = "i2s";

			cpu {

				sound-dai = <&audio_controller 1>;

			};



			codec {

				sound-dai = <&spdif_in>;

			};

		};

	};



	spdif_out: spdif-out {

		#sound-dai-cells = <0>;

		compatible = "linux,spdif-dit";

	};



	spdif_in: spdif-in {

		#sound-dai-cells = <0>;

		compatible = "linux,spdif-dir";

	};

};



&spi0 {