Commit 6b1124c4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ti-k3-dt-fixes-for-v6.11' of... 

Merge tag 'ti-k3-dt-fixes-for-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into arm/fixes

Devicetree fixes for TI K3 platforms for v6.11

Critical fixes for the following:
* j784s4: Fix for McASP DMA map
* J722s/AM62p: GPIO ranges fixes
* k3-am62-verdin-dahlia: sleep-moci fixes for deep-sleep (revert)

* tag 'ti-k3-dt-fixes-for-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
  arm64: dts: ti: k3-j784s4-main: Correct McASP DMAs
  arm64: dts: ti: k3-j722s: Fix gpio-range for main_pmx0
  arm64: dts: ti: k3-am62p: Fix gpio-range for main_pmx0
  arm64: dts: ti: k3-am62p: Add gpio-ranges for mcu_gpio0
  arm64: dts: ti: k3-am62-verdin-dahlia: Keep CTRL_SLEEP_MOCI# regulator on
  arm64: dts: ti: k3-j784s4-evm: Consolidate serdes0 references
  arm64: dts: ti: k3-j784s4-evm: Assign only lanes 0 and 1 to PCIe1
parents cddaac04 402d3360

arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi

+0 −22
Original line number Diff line number Diff line
@@ -43,15 +43,6 @@ simple-audio-card,cpu { 
			sound-dai = <&mcasp0>;

		};

	};



	reg_usb_hub: regulator-usb-hub {

		compatible = "regulator-fixed";

		enable-active-high;

		/* Verdin CTRL_SLEEP_MOCI# (SODIMM 256) */

		gpio = <&main_gpio0 31 GPIO_ACTIVE_HIGH>;

		regulator-boot-on;

		regulator-name = "HUB_PWR_EN";

	};

};



/* Verdin ETHs */
@@ -193,11 +184,6 @@ &ospi0 { 
	status = "okay";

};



/* Do not force CTRL_SLEEP_MOCI# always enabled */

&reg_force_sleep_moci {

	status = "disabled";

};



/* Verdin SD_1 */

&sdhci1 {

	status = "okay";
@@ -218,15 +204,7 @@ &usbss1 { 
};



&usb1 {

	#address-cells = <1>;

	#size-cells = <0>;

	status = "okay";



	usb-hub@1 {

		compatible = "usb424,2744";

		reg = <1>;

		vdd-supply = <&reg_usb_hub>;

	};

};



/* Verdin CTRL_WAKE1_MICO# */

arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi

+0 −6
Original line number Diff line number Diff line
@@ -138,12 +138,6 @@ reg_1v8_eth: regulator-1v8-eth { 
		vin-supply = <&reg_1v8>;

	};



	/*

	 * By default we enable CTRL_SLEEP_MOCI#, this is required to have

	 * peripherals on the carrier board powered.

	 * If more granularity or power saving is required this can be disabled

	 * in the carrier board device tree files.

	 */

	reg_force_sleep_moci: regulator-force-sleep-moci {

		compatible = "regulator-fixed";

		enable-active-high;

arch/arm64/boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ mcu_gpio0: gpio@4201000 { 
		power-domains = <&k3_pds 79 TI_SCI_PD_EXCLUSIVE>;

		clocks = <&k3_clks 79 0>;

		clock-names = "gpio";

		gpio-ranges = <&mcu_pmx0 0 0 21>, <&mcu_pmx0 21 23 1>,

			      <&mcu_pmx0 22 32 2>;

	};



	mcu_rti0: watchdog@4880000 {

arch/arm64/boot/dts/ti/k3-am62p-main.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ &inta_main_dmss { 
&main_pmx0 {

	pinctrl-single,gpio-range =

		<&main_pmx0_range 0 32 PIN_GPIO_RANGE_IOPAD>,

		<&main_pmx0_range 33 92 PIN_GPIO_RANGE_IOPAD>,

		<&main_pmx0_range 33 38 PIN_GPIO_RANGE_IOPAD>,

		<&main_pmx0_range 72 22 PIN_GPIO_RANGE_IOPAD>,

		<&main_pmx0_range 137 5 PIN_GPIO_RANGE_IOPAD>,

		<&main_pmx0_range 143 3 PIN_GPIO_RANGE_IOPAD>,

		<&main_pmx0_range 149 2 PIN_GPIO_RANGE_IOPAD>;

arch/arm64/boot/dts/ti/k3-j722s-main.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -193,7 +193,8 @@ &inta_main_dmss { 
&main_pmx0 {

	pinctrl-single,gpio-range =

		<&main_pmx0_range 0 32 PIN_GPIO_RANGE_IOPAD>,

		<&main_pmx0_range 33 55 PIN_GPIO_RANGE_IOPAD>,

		<&main_pmx0_range 33 38 PIN_GPIO_RANGE_IOPAD>,

		<&main_pmx0_range 72 17 PIN_GPIO_RANGE_IOPAD>,

		<&main_pmx0_range 101 25 PIN_GPIO_RANGE_IOPAD>,

		<&main_pmx0_range 137 5 PIN_GPIO_RANGE_IOPAD>,

		<&main_pmx0_range 143 3 PIN_GPIO_RANGE_IOPAD>,