averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-05-26 11:40:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2021-06-15 08:08:14 -07:00
parent 83107b24c3 0b5194dec8
commit 406b968552
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/boot/dts/keystone-k2g-evm.dts
+3 -8
View File
@@ -544,20 +544,15 @@
};
};
&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
View File
@@ -242,7 +242,7 @@
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 @@
<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 @@
#power-domain-cells = <1>;
};
k2g_clks: clocks {
k2g_clks: clock-controller {
compatible = "ti,k2g-sci-clk";
#clock-cells = <2>;
};