diff options
| author | Olof Johansson <olof@lixom.net> | 2021-06-15 18:08:14 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2021-06-15 18:08:16 +0300 |
| commit | 406b968552c6bad8d8c8488e910459652732cc07 (patch) | |
| tree | 5a78e6b26b40b47a7c0d3a29b90196cb50c77424 /arch/arm/boot | |
| parent | 83107b24c351391dd0a492fc9940d05c14cab0d0 (diff) | |
| parent | 0b5194dec85b9f3971900129f9a3584a6cb5918d (diff) | |
| download | linux-406b968552c6bad8d8c8488e910459652732cc07.tar.xz | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/keystone-k2g-evm.dts | 11 | ||||
| -rw-r--r-- | arch/arm/boot/dts/keystone-k2g.dtsi | 6 |
2 files changed, 6 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/keystone-k2g-evm.dts b/arch/arm/boot/dts/keystone-k2g-evm.dts index 14e26a4fd62a..d800f26b6275 100644 --- a/arch/arm/boot/dts/keystone-k2g-evm.dts +++ b/arch/arm/boot/dts/keystone-k2g-evm.dts @@ -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"; diff --git a/arch/arm/boot/dts/keystone-k2g.dtsi b/arch/arm/boot/dts/keystone-k2g.dtsi index 05a75019275e..37198294f4b2 100644 --- a/arch/arm/boot/dts/keystone-k2g.dtsi +++ b/arch/arm/boot/dts/keystone-k2g.dtsi @@ -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>; }; |