iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Do not register clock inputs in clock provider

Browse Source 
* Add g12a support in the axg audio clock controller
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE9OFZrhjz9W1fG7cb5vwPHDfy2oUFAly4QzIACgkQ5vwPHDfy
 2oVHlBAAslMgdZ8eqw1L/2Jd57eLhxY17bfayp5jZDCID7yLH4Uk7bJ9Qh4aRy3B
 vWbaWBN3hqFGlYILtS2kPbr8g5+GNzW+f1cLls22cWrYcBWJYOVkZhn3+axJXMaQ
 d6krC86a52U54jhB4L6uq/I4QCh7hTi/MKSD+t7Sfz3aH2Ju0sNO0WnESrc28znR
 +oCg0mJKWXmw9BPEbYxKegBhOjyJrd3Ty+I+cbj/pSgvrVVJMYi/uAMNlfSrJn/j
 aPs3JcdkLd3GMRRTW3q8ZnrI8dYgEda0z44korSTBiRV+A2T576CAc/39DFq7FDK
 s30HMnH3HHsaw2Ra652XBqkhf9qNzto4QDbI2T60Po7MyQsbD9NouTMVVRGT/4rF
 ucH4Tkm7hGiRxatMvcqyU45Imz3p3aGvtmf3R4585zgj7yNrkRIqs+YhDmh2lcDL
 wq+ImchQbsVacFVw9PDQ7F/OdH1snfDvfmWBp7qj+gUxHhgAVipxO9v9pACds7/u
 TGEooiHlxgLZRWcpSA3n/5IlnUrigzTfuUnv+5cVTkqq9b6RJeDAtX5N7oIWdv7D
 Zjelie1VI1dW3WAF1NFcNmj4ML/p4AEajuwfd76MpFijNKspWSkzB1QMYKV6e11g
 67t6SmRC8Yat+hRsVbNtS6YYHWneaiQqAaLdHxh/29mZ9eMe7lA=
 =aXh+
 -----END PGP SIGNATURE-----

Merge tag 'meson-clk-5.2-2' of https://github.com/BayLibre/clk-meson into clk-meson

Pull more Amlogic Meson clk driver udpates from Jerome Brunet:

 - Do not register clock inputs in clock provider
 - Add g12a support in the axg audio clock controller

* tag 'meson-clk-5.2-2' of https://github.com/BayLibre/clk-meson:
  clk: meson: axg-audio: add g12a support
  clk: meson: axg-audio: don't register inputs in the onecell data
  clk: meson: axg_audio: replace prefix axg by aud
  dt-bindings: clk: axg-audio: add g12a support
This commit is contained in:
Stephen Boyd 2019-04-18 13:30:05 -07:00
commit 6e4fcc34e6
4 changed files with 711 additions and 507 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/devicetree/bindings/clock/amlogic,axg-audio-clkc.txt
View File

@ -6,7 +6,8 @@ devices.
Required Properties:
- compatible : should be "amlogic,axg-audio-clkc" for the A113X and A113D
- compatible : should be "amlogic,axg-audio-clkc" for the A113X and A113D,
"amlogic,g12a-audio-clkc" for G12A.
- reg : physical base address of the clock controller and length of
memory mapped region.
- clocks : a list of phandle + clock-specifier pairs for the clocks listed

1169
drivers/clk/meson/axg-audio.c
View File

File diff suppressed because it is too large Load Diff

36
drivers/clk/meson/axg-audio.h
View File

@ -20,6 +20,8 @@
#define AUDIO_MCLK_D_CTRL 0x010
#define AUDIO_MCLK_E_CTRL 0x014
#define AUDIO_MCLK_F_CTRL 0x018
#define AUDIO_MST_PAD_CTRL0 0x01c
#define AUDIO_MST_PAD_CTRL1 0x020
#define AUDIO_MST_A_SCLK_CTRL0 0x040
#define AUDIO_MST_A_SCLK_CTRL1 0x044
#define AUDIO_MST_B_SCLK_CTRL0 0x048
@ -45,41 +47,13 @@
#define AUDIO_CLK_LOCKER_CTRL 0x0A8
#define AUDIO_CLK_PDMIN_CTRL0 0x0AC
#define AUDIO_CLK_PDMIN_CTRL1 0x0B0
#define AUDIO_CLK_SPDIFOUT_B_CTRL 0x0B4
/*
* CLKID index values
* These indices are entirely contrived and do not map onto the hardware.
*/
#define AUD_CLKID_PCLK 0
#define AUD_CLKID_MST0 1
#define AUD_CLKID_MST1 2
#define AUD_CLKID_MST2 3
#define AUD_CLKID_MST3 4
#define AUD_CLKID_MST4 5
#define AUD_CLKID_MST5 6
#define AUD_CLKID_MST6 7
#define AUD_CLKID_MST7 8
#define AUD_CLKID_SLV_SCLK0 9
#define AUD_CLKID_SLV_SCLK1 10
#define AUD_CLKID_SLV_SCLK2 11
#define AUD_CLKID_SLV_SCLK3 12
#define AUD_CLKID_SLV_SCLK4 13
#define AUD_CLKID_SLV_SCLK5 14
#define AUD_CLKID_SLV_SCLK6 15
#define AUD_CLKID_SLV_SCLK7 16
#define AUD_CLKID_SLV_SCLK8 17
#define AUD_CLKID_SLV_SCLK9 18
#define AUD_CLKID_SLV_LRCLK0 19
#define AUD_CLKID_SLV_LRCLK1 20
#define AUD_CLKID_SLV_LRCLK2 21
#define AUD_CLKID_SLV_LRCLK3 22
#define AUD_CLKID_SLV_LRCLK4 23
#define AUD_CLKID_SLV_LRCLK5 24
#define AUD_CLKID_SLV_LRCLK6 25
#define AUD_CLKID_SLV_LRCLK7 26
#define AUD_CLKID_SLV_LRCLK8 27
#define AUD_CLKID_SLV_LRCLK9 28
#define AUD_CLKID_MST_A_MCLK_SEL 59
#define AUD_CLKID_MST_B_MCLK_SEL 60
#define AUD_CLKID_MST_C_MCLK_SEL 61
@ -138,10 +112,12 @@
#define AUD_CLKID_TDMOUT_A_SCLK_POST_EN 148
#define AUD_CLKID_TDMOUT_B_SCLK_POST_EN 149
#define AUD_CLKID_TDMOUT_C_SCLK_POST_EN 150
#define AUD_CLKID_SPDIFOUT_B_CLK_SEL 153
#define AUD_CLKID_SPDIFOUT_B_CLK_DIV 154
/* include the CLKIDs which are part of the DT bindings */
#include <dt-bindings/clock/axg-audio-clkc.h>
#define NR_CLKS 151
#define NR_CLKS 163
#endif /*__AXG_AUDIO_CLKC_H */

10
include/dt-bindings/clock/axg-audio-clkc.h
View File

@ -70,5 +70,15 @@
#define AUD_CLKID_TDMOUT_A_LRCLK 134
#define AUD_CLKID_TDMOUT_B_LRCLK 135
#define AUD_CLKID_TDMOUT_C_LRCLK 136
#define AUD_CLKID_SPDIFOUT_B 151
#define AUD_CLKID_SPDIFOUT_B_CLK 152
#define AUD_CLKID_TDM_MCLK_PAD0 155
#define AUD_CLKID_TDM_MCLK_PAD1 156
#define AUD_CLKID_TDM_LRCLK_PAD0 157
#define AUD_CLKID_TDM_LRCLK_PAD1 158
#define AUD_CLKID_TDM_LRCLK_PAD2 159
#define AUD_CLKID_TDM_SCLK_PAD0 160
#define AUD_CLKID_TDM_SCLK_PAD1 161
#define AUD_CLKID_TDM_SCLK_PAD2 162
#endif /* __AXG_AUDIO_CLKC_BINDINGS_H */