Commit 406b9685 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'keystone_dts_for_5.13' of... 

Merge tag 'keystone_dts_for_5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into arm/dt

ARM: DTS: Keystone K2G cleanup for v5.13

  - Rename message manager node
  - Rename the TI-SCI node and clock
  - assign clock to McAsp

* tag 'keystone_dts_for_5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: keystone: k2g-evm: Move audio oscillator assigned clock to mcasp
  ARM: dts: keystone: k2g: Rename the TI-SCI clocks node name
  ARM: dts: keystone: k2g: Rename the TI-SCI node
  ARM: dts: keystone: k2g: Rename message-manager node

Link: https://lore.kernel.org/r/1623564020-9958-1-git-send-email-santosh.shilimkar@oracle.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 83107b24 0b5194de

arch/arm/boot/dts/keystone-k2g-evm.dts

+3 −8
Original line number Diff line number Diff line
@@ -544,20 +544,15 @@ dpi_out: endpoint { 
	};

};



&k2g_clks {

	/* on the board 22.5792MHz is connected to AUDOSC_IN */

	assigned-clocks = <&k2g_clks 0x4c 2>;

	assigned-clock-rates = <22579200>;

};



&mcasp2 {

	#sound-dai-cells = <0>;



	pinctrl-names = "default";

	pinctrl-0 = <&mcasp2_pins>;



	assigned-clocks = <&k2g_clks 0x6 1>;

	assigned-clock-parents = <&k2g_clks 0x6 2>;

	assigned-clocks = <&k2g_clks 0x4c 2>, <&k2g_clks 0x6 1>;

	assigned-clock-parents = <0>, <&k2g_clks 0x6 2>;

	assigned-clock-rates = <22579200>, <0>;



	status = "okay";

arch/arm/boot/dts/keystone-k2g.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ dsp0: dsp@10800000 { 
			status = "disabled";

		};



		msgmgr: msgmgr@2a00000 {

		msgmgr: mailbox@2a00000 {

			compatible = "ti,k2g-message-manager";

			#mbox-cells = <2>;

			reg-names = "queue_proxy_region",
@@ -254,7 +254,7 @@ msgmgr: msgmgr@2a00000 { 
				     <GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH>;

		};



		pmmc: pmmc@2921c00 {

		pmmc: system-controller@2921c00 {

			compatible = "ti,k2g-sci";

			/*

			 * In case of rare platforms that does not use k2g as
@@ -272,7 +272,7 @@ k2g_pds: power-controller { 
				#power-domain-cells = <1>;

			};



			k2g_clks: clocks {

			k2g_clks: clock-controller {

				compatible = "ti,k2g-sci-clk";

				#clock-cells = <2>;

			};