Unverified Commit f1a43af7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-fixes-6.17-1' of... 

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

mvebu fixes for 6.17 (part 1)

Fix SATA ports on various boards: Macchiatobin, CN913x-solidrun.
Fix audio on Armada 370 DB and OpenRD.
Disable eMMC high-speed modes on the CN9132 CEX-7 module.
Disable runtime reconfiguration for PCIe lanes on the CN9132 CEX-7 module.

* tag 'mvebu-fixes-6.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  arm64: dts: marvell: cn9132-clearfog: fix multi-lane pci x2 and x4 ports
  arm64: dts: marvell: cn9132-clearfog: disable eMMC high-speed modes
  arm64: dts: marvell: cn913x-solidrun: fix sata ports status
  ARM: dts: kirkwood: Fix sound DAI cells for OpenRD clients
  ARM64: dts: mcbin: fix SATA ports on Macchiatobin
  ARM: dts: armada-370-db: Fix stereo audio input routing on Armada 370

Link: https://lore.kernel.org/r/87ikhnn1pl.fsf@BLaptop.bootlin.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 875691ce 794a0666

arch/arm/boot/dts/marvell/armada-370-db.dts

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ sound { 
			"Out Jack", "HPL",

			"Out Jack", "HPR",

			"AIN1L", "In Jack",

			"AIN1L", "In Jack";

			"AIN1R", "In Jack";

		status = "okay";



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

arch/arm/boot/dts/marvell/kirkwood-openrd-client.dts

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ sound { 
		simple-audio-card,mclk-fs = <256>;



		simple-audio-card,cpu {

			sound-dai = <&audio0 0>;

			sound-dai = <&audio0>;

		};



		simple-audio-card,codec {

arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -345,11 +345,13 @@ &cp1_sata0 { 
	/* CPS Lane 1 - U32 */

	sata-port@0 {

		phys = <&cp1_comphy1 0>;

		status = "okay";

	};



	/* CPS Lane 3 - U31 */

	sata-port@1 {

		phys = <&cp1_comphy3 1>;

		status = "okay";

	};

};

arch/arm64/boot/dts/marvell/cn9130-cf.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -152,11 +152,12 @@ expander0_pins: cp0-expander0-pins { 


/* SRDS #0 - SATA on M.2 connector */

&cp0_sata0 {

	phys = <&cp0_comphy0 1>;

	status = "okay";



	/* only port 1 is available */

	/delete-node/ sata-port@0;

	sata-port@1 {

		phys = <&cp0_comphy0 1>;

		status = "okay";

	};

};



/* microSD */

arch/arm64/boot/dts/marvell/cn9131-cf-solidwan.dts

+4 −2
Original line number Diff line number Diff line
@@ -563,11 +563,13 @@ &cp1_rtc { 


/* SRDS #1 - SATA on M.2 (J44) */

&cp1_sata0 {

	phys = <&cp1_comphy1 0>;

	status = "okay";



	/* only port 0 is available */

	/delete-node/ sata-port@1;

	sata-port@0 {

		phys = <&cp1_comphy1 0>;

		status = "okay";

	};

};



&cp1_syscon0 {