Skip to contentSkip to conversation

Add BLK_CTRL support for i.MX8MP

PATCH Superseded Abel Vesa 4 participants 48 messages Aug 14, 2020 – Sep 7, 2020

Subsystems (5)

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Abel Vesa

author
#0 lore raw

v2 cover Add BLK_CTRL support for i.MX8MP

The BLK_CTRL according to HW design is basically the wrapper of the entire function specific group of IPs and holds GPRs that usually cannot be placed into one specific IP from that group. Some of these GPRs are used to control some clocks, other some resets, others some very specific function that does not fit into clocks or resets. Since the clocks are registered using the i.MX clock subsystem API, the driver is placed into the clock subsystem, but it also registers the resets. For the other functionalities that other GPRs might have, the syscon is used.

Changes since v1:
* implemented the runtime pm in blk_ctrl as discussed with Philipp Zabel on
v1 thread
* changed the blk-ctl to clock-controller in the dts and doc
* fixed the yaml doc
* removed the power-domains properties since the power-domains driver
is not yet upstream for i.MX8MP.

Abel Vesa (17):
dt-bindings: clocks: imx8mp: Rename audiomix ids clocks to
audio_blk_ctrl
dt-bindings: reset: imx8mp: Add audio blk_ctrl reset IDs
dt-bindings: clock: imx8mp: Add ids for the audio shared gate
dt-bindings: clock: imx8mp: Add media blk_ctrl clock IDs
dt-bindings: reset: imx8mp: Add media blk_ctrl reset IDs
dt-bindings: clock: imx8mp: Add hdmi blk_ctrl clock IDs
dt-bindings: reset: imx8mp: Add hdmi blk_ctrl reset IDs
clk: imx8mp: Add audio shared gate
arm64: dts: Remove imx-hdmimix-reset header file
Documentation: bindings: clk: Add bindings for i.MX BLK_CTRL
clk: imx: Add blk_ctrl combo driver
clk: imx8mp: Add audio blk_ctrl clocks and resets
clk: imx8mp: Add hdmi blk_ctrl clocks and resets
clk: imx8mp: Add media blk_ctrl clocks and resets
arm64: dts: imx8mp: Add audio_blk_ctrl node
arm64: dts: imx8mp: Add media_blk_ctrl node
arm64: dts: imx8mp: Add hdmi_blk_ctrl node

 .../bindings/clock/fsl,imx-blk-ctrl.yaml           |  60 ++++
 arch/arm64/boot/dts/freescale/imx8mp.dtsi          |  41 +++
 drivers/clk/imx/Makefile                           |   2 +-
 drivers/clk/imx/clk-blk-ctrl.c                     | 339 +++++++++++++++++++++
 drivers/clk/imx/clk-blk-ctrl.h                     |  81 +++++
 drivers/clk/imx/clk-imx8mp.c                       | 281 ++++++++++++++++-
 include/dt-bindings/clock/imx8mp-clock.h           | 200 ++++++++----
 include/dt-bindings/reset/imx8mp-reset.h           |  45 +++
 8 files changed, 986 insertions(+), 63 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/fsl,imx-blk-ctrl.yaml
 create mode 100644 drivers/clk/imx/clk-blk-ctrl.c
 create mode 100644 drivers/clk/imx/clk-blk-ctrl.h
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH v2 1/17 dt-bindings: clocks: imx8mp: Rename audiomix ids clocks to audio_blk_ctrl

In the reference manual the actual name is Audio BLK_CTRL.
Lets make it more obvious here by renaming from audiomix to audio_blk_ctrl.

---
 include/dt-bindings/clock/imx8mp-clock.h | 120 +++++++++++++++----------------
 1 file changed, 60 insertions(+), 60 deletions(-)
include/dt-bindings/clock/imx8mp-clock.h +60 -60
index 7a23f28..6008f32 100644
@@ -324,66 +324,66 @@
 
 #define IMX8MP_CLK_END				313
 
-#define IMX8MP_CLK_AUDIOMIX_SAI1_IPG		0
-#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1		1
-#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK2		2
-#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK3		3
-#define IMX8MP_CLK_AUDIOMIX_SAI2_IPG		4
-#define IMX8MP_CLK_AUDIOMIX_SAI2_MCLK1		5
-#define IMX8MP_CLK_AUDIOMIX_SAI2_MCLK2		6
-#define IMX8MP_CLK_AUDIOMIX_SAI2_MCLK3		7
-#define IMX8MP_CLK_AUDIOMIX_SAI3_IPG		8
-#define IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1		9
-#define IMX8MP_CLK_AUDIOMIX_SAI3_MCLK2		10
-#define IMX8MP_CLK_AUDIOMIX_SAI3_MCLK3		11
-#define IMX8MP_CLK_AUDIOMIX_SAI5_IPG		12
-#define IMX8MP_CLK_AUDIOMIX_SAI5_MCLK1		13
-#define IMX8MP_CLK_AUDIOMIX_SAI5_MCLK2		14
-#define IMX8MP_CLK_AUDIOMIX_SAI5_MCLK3		15
-#define IMX8MP_CLK_AUDIOMIX_SAI6_IPG		16
-#define IMX8MP_CLK_AUDIOMIX_SAI6_MCLK1		17
-#define IMX8MP_CLK_AUDIOMIX_SAI6_MCLK2		18
-#define IMX8MP_CLK_AUDIOMIX_SAI6_MCLK3		19
-#define IMX8MP_CLK_AUDIOMIX_SAI7_IPG		20
-#define IMX8MP_CLK_AUDIOMIX_SAI7_MCLK1		21
-#define IMX8MP_CLK_AUDIOMIX_SAI7_MCLK2		22
-#define IMX8MP_CLK_AUDIOMIX_SAI7_MCLK3		23
-#define IMX8MP_CLK_AUDIOMIX_ASRC_IPG		24
-#define IMX8MP_CLK_AUDIOMIX_PDM_IPG		25
-#define IMX8MP_CLK_AUDIOMIX_SDMA2_ROOT		26
-#define IMX8MP_CLK_AUDIOMIX_SDMA3_ROOT		27
-#define IMX8MP_CLK_AUDIOMIX_SPBA2_ROOT		28
-#define IMX8MP_CLK_AUDIOMIX_DSP_ROOT		29
-#define IMX8MP_CLK_AUDIOMIX_DSPDBG_ROOT		30
-#define IMX8MP_CLK_AUDIOMIX_EARC_IPG		31
-#define IMX8MP_CLK_AUDIOMIX_OCRAMA_IPG		32
-#define IMX8MP_CLK_AUDIOMIX_AUD2HTX_IPG		33
-#define IMX8MP_CLK_AUDIOMIX_EDMA_ROOT		34
-#define IMX8MP_CLK_AUDIOMIX_AUDPLL_ROOT		35
-#define IMX8MP_CLK_AUDIOMIX_MU2_ROOT		36
-#define IMX8MP_CLK_AUDIOMIX_MU3_ROOT		37
-#define IMX8MP_CLK_AUDIOMIX_EARC_PHY		38
-#define IMX8MP_CLK_AUDIOMIX_PDM_ROOT		39
-#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1_SEL	40
-#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK2_SEL	41
-#define IMX8MP_CLK_AUDIOMIX_SAI2_MCLK1_SEL	42
-#define IMX8MP_CLK_AUDIOMIX_SAI2_MCLK2_SEL	43
-#define IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1_SEL	44
-#define IMX8MP_CLK_AUDIOMIX_SAI3_MCLK2_SEL	45
-#define IMX8MP_CLK_AUDIOMIX_SAI4_MCLK1_SEL	46
-#define IMX8MP_CLK_AUDIOMIX_SAI4_MCLK2_SEL	47
-#define IMX8MP_CLK_AUDIOMIX_SAI5_MCLK1_SEL	48
-#define IMX8MP_CLK_AUDIOMIX_SAI5_MCLK2_SEL	49
-#define IMX8MP_CLK_AUDIOMIX_SAI6_MCLK1_SEL	50
-#define IMX8MP_CLK_AUDIOMIX_SAI6_MCLK2_SEL	51
-#define IMX8MP_CLK_AUDIOMIX_SAI7_MCLK1_SEL	52
-#define IMX8MP_CLK_AUDIOMIX_SAI7_MCLK2_SEL	53
-#define IMX8MP_CLK_AUDIOMIX_PDM_SEL		54
-#define IMX8MP_CLK_AUDIOMIX_SAI_PLL_REF_SEL	55
-#define IMX8MP_CLK_AUDIOMIX_SAI_PLL		56
-#define IMX8MP_CLK_AUDIOMIX_SAI_PLL_BYPASS	57
-#define IMX8MP_CLK_AUDIOMIX_SAI_PLL_OUT		58
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_IPG		0
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK1		1
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK2		2
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK3		3
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_IPG		4
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK1		5
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK2		6
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK3		7
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_IPG		8
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK1		9
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK2		10
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK3		11
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_IPG		12
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK1		13
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK2		14
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK3		15
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_IPG		16
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK1		17
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK2		18
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK3		19
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_IPG		20
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK1		21
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK2		22
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK3		23
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_ASRC_IPG		24
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_PDM_IPG		25
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SDMA2_ROOT		26
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SDMA3_ROOT		27
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SPBA2_ROOT		28
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_DSP_ROOT		29
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_DSPDBG_ROOT		30
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_EARC_IPG		31
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_OCRAMA_IPG		32
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_AUD2HTX_IPG		33
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_EDMA_ROOT		34
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_AUDPLL_ROOT		35
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_MU2_ROOT		36
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_MU3_ROOT		37
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_EARC_PHY		38
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_PDM_ROOT		39
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK1_SEL	40
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK2_SEL	41
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK1_SEL	42
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK2_SEL	43
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK1_SEL	44
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK2_SEL	45
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI4_MCLK1_SEL	46
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI4_MCLK2_SEL	47
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK1_SEL	48
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK2_SEL	49
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK1_SEL	50
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK2_SEL	51
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK1_SEL	52
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK2_SEL	53
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_PDM_SEL		54
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL_REF_SEL	55
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL		56
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL_BYPASS	57
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL_OUT		58
 
-#define IMX8MP_CLK_AUDIOMIX_END			59
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_END			59
 
 #endif
Signature · 1 line
2.7.4
Reviewed-by on v2 1/17
#2 lore raw

Re: [PATCH v2 01/17] dt-bindings: clocks: imx8mp: Rename audiomix ids clocks to audio_blk_ctrl

Quoted 5 lines · Abel Vesa

In the reference manual the actual name is Audio BLK_CTRL.
Lets make it more obvious here by renaming from audiomix to audio_blk_ctrl.

As there's still no users of the old definitions, it's okay for me to change it now.

Regards
Aisheng

Quoted 138 lines
---
 include/dt-bindings/clock/imx8mp-clock.h | 120 +++++++++++++++----------------
 1 file changed, 60 insertions(+), 60 deletions(-)
include/dt-bindings/clock/imx8mp-clock.h +60 -61
index 7a23f28..6008f32 100644
@@ -324,66 +324,66 @@
 
 #define IMX8MP_CLK_END                         313
 
-#define IMX8MP_CLK_AUDIOMIX_SAI1_IPG           0
-#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1         1
-#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK2         2
-#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK3         3
-#define IMX8MP_CLK_AUDIOMIX_SAI2_IPG           4
-#define IMX8MP_CLK_AUDIOMIX_SAI2_MCLK1         5
-#define IMX8MP_CLK_AUDIOMIX_SAI2_MCLK2         6
-#define IMX8MP_CLK_AUDIOMIX_SAI2_MCLK3         7
-#define IMX8MP_CLK_AUDIOMIX_SAI3_IPG           8
-#define IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1         9
-#define IMX8MP_CLK_AUDIOMIX_SAI3_MCLK2         10
-#define IMX8MP_CLK_AUDIOMIX_SAI3_MCLK3         11
-#define IMX8MP_CLK_AUDIOMIX_SAI5_IPG           12
-#define IMX8MP_CLK_AUDIOMIX_SAI5_MCLK1         13
-#define IMX8MP_CLK_AUDIOMIX_SAI5_MCLK2         14
-#define IMX8MP_CLK_AUDIOMIX_SAI5_MCLK3         15
-#define IMX8MP_CLK_AUDIOMIX_SAI6_IPG           16
-#define IMX8MP_CLK_AUDIOMIX_SAI6_MCLK1         17
-#define IMX8MP_CLK_AUDIOMIX_SAI6_MCLK2         18
-#define IMX8MP_CLK_AUDIOMIX_SAI6_MCLK3         19
-#define IMX8MP_CLK_AUDIOMIX_SAI7_IPG           20
-#define IMX8MP_CLK_AUDIOMIX_SAI7_MCLK1         21
-#define IMX8MP_CLK_AUDIOMIX_SAI7_MCLK2         22
-#define IMX8MP_CLK_AUDIOMIX_SAI7_MCLK3         23
-#define IMX8MP_CLK_AUDIOMIX_ASRC_IPG           24
-#define IMX8MP_CLK_AUDIOMIX_PDM_IPG            25
-#define IMX8MP_CLK_AUDIOMIX_SDMA2_ROOT         26
-#define IMX8MP_CLK_AUDIOMIX_SDMA3_ROOT         27
-#define IMX8MP_CLK_AUDIOMIX_SPBA2_ROOT         28
-#define IMX8MP_CLK_AUDIOMIX_DSP_ROOT           29
-#define IMX8MP_CLK_AUDIOMIX_DSPDBG_ROOT                30
-#define IMX8MP_CLK_AUDIOMIX_EARC_IPG           31
-#define IMX8MP_CLK_AUDIOMIX_OCRAMA_IPG         32
-#define IMX8MP_CLK_AUDIOMIX_AUD2HTX_IPG                33
-#define IMX8MP_CLK_AUDIOMIX_EDMA_ROOT          34
-#define IMX8MP_CLK_AUDIOMIX_AUDPLL_ROOT                35
-#define IMX8MP_CLK_AUDIOMIX_MU2_ROOT           36
-#define IMX8MP_CLK_AUDIOMIX_MU3_ROOT           37
-#define IMX8MP_CLK_AUDIOMIX_EARC_PHY           38
-#define IMX8MP_CLK_AUDIOMIX_PDM_ROOT           39
-#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1_SEL     40
-#define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK2_SEL     41
-#define IMX8MP_CLK_AUDIOMIX_SAI2_MCLK1_SEL     42
-#define IMX8MP_CLK_AUDIOMIX_SAI2_MCLK2_SEL     43
-#define IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1_SEL     44
-#define IMX8MP_CLK_AUDIOMIX_SAI3_MCLK2_SEL     45
-#define IMX8MP_CLK_AUDIOMIX_SAI4_MCLK1_SEL     46
-#define IMX8MP_CLK_AUDIOMIX_SAI4_MCLK2_SEL     47
-#define IMX8MP_CLK_AUDIOMIX_SAI5_MCLK1_SEL     48
-#define IMX8MP_CLK_AUDIOMIX_SAI5_MCLK2_SEL     49
-#define IMX8MP_CLK_AUDIOMIX_SAI6_MCLK1_SEL     50
-#define IMX8MP_CLK_AUDIOMIX_SAI6_MCLK2_SEL     51
-#define IMX8MP_CLK_AUDIOMIX_SAI7_MCLK1_SEL     52
-#define IMX8MP_CLK_AUDIOMIX_SAI7_MCLK2_SEL     53
-#define IMX8MP_CLK_AUDIOMIX_PDM_SEL            54
-#define IMX8MP_CLK_AUDIOMIX_SAI_PLL_REF_SEL    55
-#define IMX8MP_CLK_AUDIOMIX_SAI_PLL            56
-#define IMX8MP_CLK_AUDIOMIX_SAI_PLL_BYPASS     57
-#define IMX8MP_CLK_AUDIOMIX_SAI_PLL_OUT                58
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_IPG             0
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK1           1
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK2           2
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK3           3
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_IPG             4
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK1           5
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK2           6
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK3           7
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_IPG             8
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK1           9
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK2           10
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK3           11
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_IPG             12
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK1           13
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK2           14
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK3           15
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_IPG             16
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK1           17
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK2           18
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK3           19
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_IPG             20
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK1           21
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK2           22
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK3           23
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_ASRC_IPG             24
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_PDM_IPG              25
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SDMA2_ROOT           26
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SDMA3_ROOT           27
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SPBA2_ROOT           28
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_DSP_ROOT             29
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_DSPDBG_ROOT          30
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_EARC_IPG             31
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_OCRAMA_IPG           32
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_AUD2HTX_IPG          33
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_EDMA_ROOT            34
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_AUDPLL_ROOT          35
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_MU2_ROOT             36
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_MU3_ROOT             37
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_EARC_PHY             38
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_PDM_ROOT             39
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK1_SEL       40
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK2_SEL       41
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK1_SEL       42
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK2_SEL       43
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK1_SEL       44
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK2_SEL       45
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI4_MCLK1_SEL       46
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI4_MCLK2_SEL       47
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK1_SEL       48
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK2_SEL       49
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK1_SEL       50
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK2_SEL       51
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK1_SEL       52
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK2_SEL       53
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_PDM_SEL              54
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL_REF_SEL      55
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL              56
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL_BYPASS       57
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL_OUT          58
 
-#define IMX8MP_CLK_AUDIOMIX_END                        59
+#define IMX8MP_CLK_AUDIO_BLK_CTRL_END                  59
 
 #endif
--

2.7.4

maintainer Acked-by on v2 1/17
#3 lore raw

Re: [PATCH v2 01/17] dt-bindings: clocks: imx8mp: Rename audiomix ids clocks to audio_blk_ctrl

In reply to Abel Vesa
Quoted 8 lines · Abel Vesa

In the reference manual the actual name is Audio BLK_CTRL.
Lets make it more obvious here by renaming from audiomix to audio_blk_ctrl.

---
 include/dt-bindings/clock/imx8mp-clock.h | 120 +++++++++++++++----------------
 1 file changed, 60 insertions(+), 60 deletions(-)
author
#4 lore raw

PATCH v2 2/17 dt-bindings: reset: imx8mp: Add audio blk_ctrl reset IDs

In reply to Abel Vesa

These will be used by the imx8mp for blk-ctrl driver.

---
 include/dt-bindings/reset/imx8mp-reset.h | 5 +++++
 1 file changed, 5 insertions(+)
include/dt-bindings/reset/imx8mp-reset.h +5 -0
index 2e8c910..fca0c9bff 100644
@@ -47,4 +47,9 @@
 
 #define IMX8MP_RESET_NUM			38
 
+#define IMX8MP_AUDIO_BLK_CTRL_EARC_RESET	0
+#define IMX8MP_AUDIO_BLK_CTRL_EARC_PHY_RESET	1
+
+#define IMX8MP_AUDIO_BLK_CTRL_RESET_NUM		2
+
 #endif
Signature · 7 lines
2.7.4


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author
#7 lore raw

PATCH v2 3/17 dt-bindings: clock: imx8mp: Add ids for the audio shared gate

In reply to Abel Vesa

All these IDs are for one single HW gate (CCGR101) that is shared between these root clocks.

---
 include/dt-bindings/clock/imx8mp-clock.h | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
include/dt-bindings/clock/imx8mp-clock.h +11 -1
index 6008f32..78ebe8e 100644
@@ -322,7 +322,17 @@
 #define IMX8MP_CLK_HSIO_AXI			311
 #define IMX8MP_CLK_MEDIA_ISP			312
 
-#define IMX8MP_CLK_END				313
+#define IMX8MP_CLK_AUDIO_AHB_ROOT		313
+#define IMX8MP_CLK_AUDIO_AXI_ROOT		314
+#define IMX8MP_CLK_SAI1_ROOT			315
+#define IMX8MP_CLK_SAI2_ROOT			316
+#define IMX8MP_CLK_SAI3_ROOT			317
+#define IMX8MP_CLK_SAI5_ROOT			318
+#define IMX8MP_CLK_SAI6_ROOT			319
+#define IMX8MP_CLK_SAI7_ROOT			320
+#define IMX8MP_CLK_PDM_ROOT			321
+
+#define IMX8MP_CLK_END				322
 
 #define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_IPG		0
 #define IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK1		1
Signature · 1 line
2.7.4
author
#9 lore raw

PATCH v2 4/17 dt-bindings: clock: imx8mp: Add media blk_ctrl clock IDs

In reply to Abel Vesa

These will be used by the imx8mp for blk-ctrl driver.

---
 include/dt-bindings/clock/imx8mp-clock.h | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
include/dt-bindings/clock/imx8mp-clock.h +28 -0
index 78ebe8e..bb465a7 100644
@@ -396,4 +396,32 @@
 
 #define IMX8MP_CLK_AUDIO_BLK_CTRL_END			59
 
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_MIPI_DSI_PCLK		0
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_MIPI_DSI_CLKREF	1
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_MIPI_CSI_PCLK		2
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_MIPI_CSI_ACLK		3
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_LCDIF_PIXEL		4
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_LCDIF_APB		5
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_ISI_PROC		6
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_ISI_APB		7
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_BUS_BLK		8
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_MIPI_CSI2_PCLK	9
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_MIPI_CSI2_ACLK	10
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_LCDIF2_PIXEL		11
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_LCDIF2_APB		12
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_ISP1_COR		13
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_ISP1_AXI		14
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_ISP1_AHB		15
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_ISP0_COR		16
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_ISP0_AXI		17
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_ISP0_AHB		18
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_DWE_COR		19
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_DWE_AXI		20
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_DWE_AHB		21
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_MIPI_DSI2		22
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_LCDIF_AXI		23
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_LCDIF2_AXI		24
+
+#define IMX8MP_CLK_MEDIA_BLK_CTRL_END			25
+
 #endif
Signature · 1 line
2.7.4
author
#11 lore raw

PATCH v2 5/17 dt-bindings: reset: imx8mp: Add media blk_ctrl reset IDs

In reply to Abel Vesa

These will be used by the imx8mp for blk-ctrl driver.

---
 include/dt-bindings/reset/imx8mp-reset.h | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
include/dt-bindings/reset/imx8mp-reset.h +28 -0
index fca0c9bff..13e56dd 100644
@@ -52,4 +52,32 @@
 
 #define IMX8MP_AUDIO_BLK_CTRL_RESET_NUM		2
 
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_MIPI_DSI_PCLK	0
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_MIPI_DSI_CLKREF	1
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_MIPI_CSI_PCLK	2
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_MIPI_CSI_ACLK	3
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_LCDIF_PIXEL		4
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_LCDIF_APB		5
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_ISI_PROC		6
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_ISI_APB		7
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_BUS_BLK		8
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_MIPI_CSI2_PCLK	9
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_MIPI_CSI2_ACLK	10
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_LCDIF2_PIXEL	11
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_LCDIF2_APB		12
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_ISP1_COR		13
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_ISP1_AXI		14
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_ISP1_AHB		15
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_ISP0_COR		16
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_ISP0_AXI		17
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_ISP0_AHB		18
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_DWE_COR		19
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_DWE_AXI		20
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_DWE_AHB		21
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_MIPI_DSI2		22
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_LCDIF_AXI		23
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_LCDIF2_AXI		24
+
+#define IMX8MP_MEDIA_BLK_CTRL_RESET_NUM			25
+
 #endif
Signature · 1 line
2.7.4
author
#13 lore raw

PATCH v2 6/17 dt-bindings: clock: imx8mp: Add hdmi blk_ctrl clock IDs

In reply to Abel Vesa

These will be used by the imx8mp for blk-ctrl driver.

---
 include/dt-bindings/clock/imx8mp-clock.h | 40 ++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
include/dt-bindings/clock/imx8mp-clock.h +40 -0
index bb465a7..6b90831 100644
@@ -396,6 +396,46 @@
 
 #define IMX8MP_CLK_AUDIO_BLK_CTRL_END			59
 
+#define IMX8MP_CLK_HDMI_BLK_CTRL_GLOBAL_APB_CLK		0
+#define IMX8MP_CLK_HDMI_BLK_CTRL_GLOBAL_B_CLK		1
+#define IMX8MP_CLK_HDMI_BLK_CTRL_GLOBAL_REF266M_CLK	2
+#define IMX8MP_CLK_HDMI_BLK_CTRL_GLOBAL_XTAL24M_CLK	3
+#define IMX8MP_CLK_HDMI_BLK_CTRL_GLOBAL_XTAL32K_CLK	4
+#define IMX8MP_CLK_HDMI_BLK_CTRL_GLOBAL_TX_PIX_CLK	5
+#define IMX8MP_CLK_HDMI_BLK_CTRL_IRQS_STEER_CLK		6
+#define IMX8MP_CLK_HDMI_BLK_CTRL_NOC_HDMI_CLK		7
+#define IMX8MP_CLK_HDMI_BLK_CTRL_NOC_HDCP_CLK		8
+#define IMX8MP_CLK_HDMI_BLK_CTRL_LCDIF_APB_CLK		9
+#define IMX8MP_CLK_HDMI_BLK_CTRL_LCDIF_B_CLK		10
+#define IMX8MP_CLK_HDMI_BLK_CTRL_LCDIF_PDI_CLK		11
+#define IMX8MP_CLK_HDMI_BLK_CTRL_LCDIF_PIX_CLK		12
+#define IMX8MP_CLK_HDMI_BLK_CTRL_LCDIF_SPU_CLK		13
+#define IMX8MP_CLK_HDMI_BLK_CTRL_FDCC_REF_CLK		14
+#define IMX8MP_CLK_HDMI_BLK_CTRL_HRV_MWR_APB_CLK	15
+#define IMX8MP_CLK_HDMI_BLK_CTRL_HRV_MWR_B_CLK		16
+#define IMX8MP_CLK_HDMI_BLK_CTRL_HRV_MWR_CEA_CLK	17
+#define IMX8MP_CLK_HDMI_BLK_CTRL_VSFD_CEA_CLK		18
+#define IMX8MP_CLK_HDMI_BLK_CTRL_TX_HPI_CLK		19
+#define IMX8MP_CLK_HDMI_BLK_CTRL_TX_APB_CLK		20
+#define IMX8MP_CLK_HDMI_BLK_CTRL_TX_CEC_CLK		21
+#define IMX8MP_CLK_HDMI_BLK_CTRL_TX_ESM_CLK		22
+#define IMX8MP_CLK_HDMI_BLK_CTRL_TX_GPA_CLK		23
+#define IMX8MP_CLK_HDMI_BLK_CTRL_TX_PIXEL_CLK		24
+#define IMX8MP_CLK_HDMI_BLK_CTRL_TX_SFR_CLK		25
+#define IMX8MP_CLK_HDMI_BLK_CTRL_TX_SKP_CLK		26
+#define IMX8MP_CLK_HDMI_BLK_CTRL_TX_PREP_CLK		27
+#define IMX8MP_CLK_HDMI_BLK_CTRL_TX_PHY_APB_CLK		28
+#define IMX8MP_CLK_HDMI_BLK_CTRL_TX_PHY_INT_CLK		29
+#define IMX8MP_CLK_HDMI_BLK_CTRL_TX_SEC_MEM_CLK		30
+#define IMX8MP_CLK_HDMI_BLK_CTRL_TX_TRNG_SKP_CLK	31
+#define IMX8MP_CLK_HDMI_BLK_CTRL_TX_VID_LINK_PIX_CLK	32
+#define IMX8MP_CLK_HDMI_BLK_CTRL_TX_TRNG_APB_CLK	33
+#define IMX8MP_CLK_HDMI_BLK_CTRL_HTXPHY_CLK_SEL		34
+#define IMX8MP_CLK_HDMI_BLK_CTRL_LCDIF_CLK_SEL		35
+#define IMX8MP_CLK_HDMI_BLK_CTRL_TX_PIPE_CLK_SEL	36
+
+#define IMX8MP_CLK_HDMI_BLK_CTRL_END			37
+
 #define IMX8MP_CLK_MEDIA_BLK_CTRL_MIPI_DSI_PCLK		0
 #define IMX8MP_CLK_MEDIA_BLK_CTRL_MIPI_DSI_CLKREF	1
 #define IMX8MP_CLK_MEDIA_BLK_CTRL_MIPI_CSI_PCLK		2
Signature · 1 line
2.7.4
author
#14 lore raw

PATCH v2 7/17 dt-bindings: reset: imx8mp: Add hdmi blk_ctrl reset IDs

In reply to Abel Vesa

These will be used imx8mp for blk-ctrl driver.

---
 include/dt-bindings/reset/imx8mp-reset.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)
include/dt-bindings/reset/imx8mp-reset.h +12 -0
index 13e56dd..c1ca79c 100644
@@ -80,4 +80,16 @@
 
 #define IMX8MP_MEDIA_BLK_CTRL_RESET_NUM			25
 
+#define IMX8MP_HDMI_BLK_CTRL_HDMI_TX_RESET		0
+#define IMX8MP_HDMI_BLK_CTRL_HDMI_PHY_RESET		1
+#define IMX8MP_HDMI_BLK_CTRL_HDMI_PAI_RESET		2
+#define IMX8MP_HDMI_BLK_CTRL_HDMI_PVI_RESET		3
+#define IMX8MP_HDMI_BLK_CTRL_HDMI_TRNG_RESET		4
+#define IMX8MP_HDMI_BLK_CTRL_IRQ_STEER_RESET		5
+#define IMX8MP_HDMI_BLK_CTRL_HDMI_HDCP_RESET		6
+#define IMX8MP_HDMI_BLK_CTRL_LCDIF_RESET		7
+
+#define IMX8MP_HDMI_BLK_CTRL_RESET_NUM			8
+
+
 #endif
Signature · 1 line
2.7.4
author
#16 lore raw

PATCH v2 8/17 clk: imx8mp: Add audio shared gate

In reply to Abel Vesa

According to the RM, the CCGR101 is shared for the following root clocks:
- AUDIO_AHB_CLK_ROOT
- AUDIO_AXI_CLK_ROOT
- SAI2_CLK_ROOT
- SAI3_CLK_ROOT
- SAI5_CLK_ROOT
- SAI6_CLK_ROOT
- SAI7_CLK_ROOT
- PDM_CLK_ROOT

---
 drivers/clk/imx/clk-imx8mp.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/clk/imx/clk-imx8mp.c +11 -1
index ca74771..462c558 100644
@@ -17,6 +17,7 @@
 
 static u32 share_count_nand;
 static u32 share_count_media;
+static u32 share_count_audio;
 
 static const char * const pll_ref_sels[] = { "osc_24m", "dummy", "dummy", "dummy", };
 static const char * const audio_pll1_bypass_sels[] = {"audio_pll1", "audio_pll1_ref_sel", };
@@ -731,7 +732,16 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)
 	hws[IMX8MP_CLK_HDMI_ROOT] = imx_clk_hw_gate4("hdmi_root_clk", "hdmi_axi", ccm_base + 0x45f0, 0);
 	hws[IMX8MP_CLK_TSENSOR_ROOT] = imx_clk_hw_gate4("tsensor_root_clk", "ipg_root", ccm_base + 0x4620, 0);
 	hws[IMX8MP_CLK_VPU_ROOT] = imx_clk_hw_gate4("vpu_root_clk", "vpu_bus", ccm_base + 0x4630, 0);
-	hws[IMX8MP_CLK_AUDIO_ROOT] = imx_clk_hw_gate4("audio_root_clk", "ipg_root", ccm_base + 0x4650, 0);
+
+	hws[IMX8MP_CLK_AUDIO_AHB_ROOT] = imx_clk_hw_gate2_shared2("audio_ahb_root", "audio_ahb", ccm_base + 0x4650, 0, &share_count_audio);
+	hws[IMX8MP_CLK_AUDIO_AXI_ROOT] = imx_clk_hw_gate2_shared2("audio_axi_root", "audio_axi", ccm_base + 0x4650, 0, &share_count_audio);
+	hws[IMX8MP_CLK_SAI1_ROOT] = imx_clk_hw_gate2_shared2("sai1_root", "sai1", ccm_base + 0x4650, 0, &share_count_audio);
+	hws[IMX8MP_CLK_SAI2_ROOT] = imx_clk_hw_gate2_shared2("sai2_root", "sai2", ccm_base + 0x4650, 0, &share_count_audio);
+	hws[IMX8MP_CLK_SAI3_ROOT] = imx_clk_hw_gate2_shared2("sai3_root", "sai3", ccm_base + 0x4650, 0, &share_count_audio);
+	hws[IMX8MP_CLK_SAI5_ROOT] = imx_clk_hw_gate2_shared2("sai5_root", "sai5", ccm_base + 0x4650, 0, &share_count_audio);
+	hws[IMX8MP_CLK_SAI6_ROOT] = imx_clk_hw_gate2_shared2("sai6_root", "sai6", ccm_base + 0x4650, 0, &share_count_audio);
+	hws[IMX8MP_CLK_SAI7_ROOT] = imx_clk_hw_gate2_shared2("sai7_root", "sai7", ccm_base + 0x4650, 0, &share_count_audio);
+	hws[IMX8MP_CLK_PDM_ROOT] = imx_clk_hw_gate2_shared2("pdm_root", "pdm", ccm_base + 0x4650, 0, &share_count_audio);
 
 	hws[IMX8MP_CLK_ARM] = imx_clk_hw_cpu("arm", "arm_a53_core",
 					     hws[IMX8MP_CLK_A53_CORE]->clk,
Signature · 1 line
2.7.4
Reviewed-by on v2 8/17
#17 lore raw

Re: [PATCH v2 08/17] clk: imx8mp: Add audio shared gate

Quoted 11 lines · Abel Vesa

According to the RM, the CCGR101 is shared for the following root clocks:
- AUDIO_AHB_CLK_ROOT
- AUDIO_AXI_CLK_ROOT
- SAI2_CLK_ROOT
- SAI3_CLK_ROOT
- SAI5_CLK_ROOT
- SAI6_CLK_ROOT
- SAI7_CLK_ROOT
- PDM_CLK_ROOT

Quoted 1 line

Regards
Aisheng

author
#18 lore raw

PATCH v2 9/17 arm64: dts: Remove imx-hdmimix-reset header file

In reply to Abel Vesa

The hdmi BLK_CTRL ids have been moved to imx8mp-reset.h

---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -0
index 9de2aa1..daa1769 100644
@@ -4,6 +4,7 @@
  */
 
 #include <dt-bindings/clock/imx8mp-clock.h>
+#include <dt-bindings/reset/imx8mp-reset.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
Signature · 1 line
2.7.4
#19 lore raw

Re: [PATCH v2 09/17] arm64: dts: Remove imx-hdmimix-reset header file

Quoted 4 lines · Abel Vesa

The hdmi BLK_CTRL ids have been moved to imx8mp-reset.h

The change seems do not comply with the patch title?

Regards
Aisheng

Quoted 19 lines
---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -1
index 9de2aa1..daa1769 100644
@@ -4,6 +4,7 @@
  */
 
 #include <dt-bindings/clock/imx8mp-clock.h>
+#include <dt-bindings/reset/imx8mp-reset.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
--

2.7.4

author
#20 lore raw

Re: [PATCH v2 09/17] arm64: dts: Remove imx-hdmimix-reset header file

Quoted 8 lines · Dong Aisheng
Quoted 4 lines · Abel Vesa

The hdmi BLK_CTRL ids have been moved to imx8mp-reset.h

The change seems do not comply with the patch title?

Will fix it in the next version.

Quoted 22 lines

Regards
Aisheng

Quoted 19 lines
---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -1
index 9de2aa1..daa1769 100644
@@ -4,6 +4,7 @@
  */
 
 #include <dt-bindings/clock/imx8mp-clock.h>
+#include <dt-bindings/reset/imx8mp-reset.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
--

2.7.4

author
#21 lore raw

PATCH v2 10/17 Documentation: bindings: clk: Add bindings for i.MX BLK_CTRL

In reply to Abel Vesa

Document the i.MX BLK_CTRL with its devicetree properties.

---
 .../bindings/clock/fsl,imx-blk-ctrl.yaml           | 60 ++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/clock/fsl,imx-blk-ctrl.yaml
Documentation/devicetree/bindings/clock/fsl,imx-blk-ctrl.yaml new file +60 -0
new file mode 100644
index 00000000..b47590c
@@ -0,0 +1,60 @@
+# SPDX-License-Identifier: (GPL-2.0-only)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/fsl,imx-blk-ctrl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: NXP i.MX BLK_CTRL
+
+maintainers:
+  - Abel Vesa <[email protected]>
+
+description:
+  i.MX BLK_CTRL is a conglomerate of different GPRs that are
+  dedicated to a specific subsystem. Because it usually contains
+  clocks amongst other things, it needs access to the i.MX clocks
+  API. All the other functionalities it provides can work just fine
+  from the clock subsystem tree.
+
+properties:
+  compatible:
+    items:
+      - enum:
+         - fsl,imx8mp-audio-blk-ctrl
+         - fsl,imx8mp-hdmi-blk-ctrl
+         - fsl,imx8mp-media-blk-ctrl
+      - const: syscon
+
+  reg:
+    maxItems: 1
+
+  power-domains:
+    maxItems: 1
+
+  '#clock-cells':
+    const: 1
+
+  '#reset-cells':
+    const: 1
+
+required:
+  - compatible
+  - reg
+  - power-domains
+  - '#clock-cells'
+  - '#reset-cells'
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/clock/imx8mp-clock.h>
+
+    audio_blk_ctrl: clock-controller@30e20000 {
+       compatible = "fsl,imx8mp-audio-blk-ctrl", "syscon";
+       reg = <0x30e20000 0x10000>;
+       power-domains = <&audiomix_pd>;
+
+       #clock-cells = <1>;
+       #reset-cells = <1>;
+    };
Signature · 1 line
2.7.4
maintainer
#23 lore raw

Re: [PATCH v2 10/17] Documentation: bindings: clk: Add bindings for i.MX BLK_CTRL

In reply to Abel Vesa
Quoted 14 lines · Abel Vesa

Document the i.MX BLK_CTRL with its devicetree properties.

---
 .../bindings/clock/fsl,imx-blk-ctrl.yaml           | 60 ++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/clock/fsl,imx-blk-ctrl.yaml
Documentation/devicetree/bindings/clock/fsl,imx-blk-ctrl.yaml new file +0 -0
new file mode 100644
index 00000000..b47590c

Documentation/devicetree/bindings/clock/fsl,imx-blk-ctrl.yaml line 1

Quoted 1 line
Documentation/devicetree/bindings/clock/fsl,imx-blk-ctrl.yaml new file +1 -0
@@ -0,0 +1,60 @@
+# SPDX-License-Identifier: (GPL-2.0-only)

Dual license new bindings please:

(GPL-2.0-only OR BSD-2-Clause)

Quoted 62 lines
Documentation/devicetree/bindings/clock/fsl,imx-blk-ctrl.yaml new file +59 -0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/fsl,imx-blk-ctrl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: NXP i.MX BLK_CTRL
+
+maintainers:
+  - Abel Vesa <[email protected]>
+
+description:
+  i.MX BLK_CTRL is a conglomerate of different GPRs that are
+  dedicated to a specific subsystem. Because it usually contains
+  clocks amongst other things, it needs access to the i.MX clocks
+  API. All the other functionalities it provides can work just fine
+  from the clock subsystem tree.
+
+properties:
+  compatible:
+    items:
+      - enum:
+         - fsl,imx8mp-audio-blk-ctrl
+         - fsl,imx8mp-hdmi-blk-ctrl
+         - fsl,imx8mp-media-blk-ctrl
+      - const: syscon
+
+  reg:
+    maxItems: 1
+
+  power-domains:
+    maxItems: 1
+
+  '#clock-cells':
+    const: 1
+
+  '#reset-cells':
+    const: 1
+
+required:
+  - compatible
+  - reg
+  - power-domains
+  - '#clock-cells'
+  - '#reset-cells'
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/clock/imx8mp-clock.h>
+
+    audio_blk_ctrl: clock-controller@30e20000 {
+       compatible = "fsl,imx8mp-audio-blk-ctrl", "syscon";
+       reg = <0x30e20000 0x10000>;
+       power-domains = <&audiomix_pd>;
+
+       #clock-cells = <1>;
+       #reset-cells = <1>;
+    };
Signature · 1 line
2.7.4
author
#24 lore raw

PATCH v2 11/17 clk: imx: Add blk_ctrl combo driver

In reply to Abel Vesa

On i.MX8MP, there is a new type of IP which is called BLK_CTRL in RM and usually is comprised of some GPRs that are considered too generic to be part of any dedicated IP from that specific subsystem.

In general, some of the GPRs have some clock bits, some have reset bits, so in order to be able to use the imx clock API, this needs to be in a clock driver. From there it can use the reset controller API and leave the rest to the syscon.

This driver is intended to work with the following BLK_CTRL IPs found in i.MX8MP (but it might be reused by the future i.MX platforms that have this kind of IP in their design):
- Audio
- Media
- HDMI

---
 drivers/clk/imx/Makefile       |   2 +-
 drivers/clk/imx/clk-blk-ctrl.c | 327 +++++++++++++++++++++++++++++++++++++++++
 drivers/clk/imx/clk-blk-ctrl.h |  81 ++++++++++
 3 files changed, 409 insertions(+), 1 deletion(-)
 create mode 100644 drivers/clk/imx/clk-blk-ctrl.c
 create mode 100644 drivers/clk/imx/clk-blk-ctrl.h
drivers/clk/imx/Makefile +1 -1
index 928f874c..7afe1df 100644
@@ -27,7 +27,7 @@ obj-$(CONFIG_MXC_CLK_SCU) += \
 
 obj-$(CONFIG_CLK_IMX8MM) += clk-imx8mm.o
 obj-$(CONFIG_CLK_IMX8MN) += clk-imx8mn.o
-obj-$(CONFIG_CLK_IMX8MP) += clk-imx8mp.o
+obj-$(CONFIG_CLK_IMX8MP) += clk-imx8mp.o clk-blk-ctrl.o
 obj-$(CONFIG_CLK_IMX8MQ) += clk-imx8mq.o
 obj-$(CONFIG_CLK_IMX8QXP) += clk-imx8qxp.o clk-imx8qxp-lpcg.o
 
drivers/clk/imx/clk-blk-ctrl.c new file +327 -0

327 lines not on this page · raw message

drivers/clk/imx/clk-blk-ctrl.h new file +81 -0

81 lines not on this page · raw message

Signature · 1 line
2.7.4
#25 lore raw

Re: [PATCH v2 11/17] clk: imx: Add blk_ctrl combo driver

Quoted 10 lines · Abel Vesa

On i.MX8MP, there is a new type of IP which is called BLK_CTRL in RM and usually is comprised of some GPRs that are considered too generic to be part of any dedicated IP from that specific subsystem.

In general, some of the GPRs have some clock bits, some have reset bits, so in order to be able to use the imx clock API, this needs to be in a clock driver. From there it can use the reset controller API and leave the rest to the syscon.

Quoted 8 lines

This driver is intended to work with the following BLK_CTRL IPs found in i.MX8MP (but it might be reused by the future i.MX platforms that have this kind of IP in their design):
- Audio
- Media
- HDMI

The code mostly looks good to me.
Only a few minor comments.

Quoted 40 lines
---
 drivers/clk/imx/Makefile       |   2 +-
 drivers/clk/imx/clk-blk-ctrl.c | 327 +++++++++++++++++++++++++++++++++++++++++
 drivers/clk/imx/clk-blk-ctrl.h |  81 ++++++++++
 3 files changed, 409 insertions(+), 1 deletion(-)
 create mode 100644 drivers/clk/imx/clk-blk-ctrl.c
 create mode 100644 drivers/clk/imx/clk-blk-ctrl.h
drivers/clk/imx/Makefile +1 -1
index 928f874c..7afe1df 100644
@@ -27,7 +27,7 @@ obj-$(CONFIG_MXC_CLK_SCU) += \
 
 obj-$(CONFIG_CLK_IMX8MM) += clk-imx8mm.o
 obj-$(CONFIG_CLK_IMX8MN) += clk-imx8mn.o
-obj-$(CONFIG_CLK_IMX8MP) += clk-imx8mp.o
+obj-$(CONFIG_CLK_IMX8MP) += clk-imx8mp.o clk-blk-ctrl.o
 obj-$(CONFIG_CLK_IMX8MQ) += clk-imx8mq.o
 obj-$(CONFIG_CLK_IMX8QXP) += clk-imx8qxp.o clk-imx8qxp-lpcg.o
 
drivers/clk/imx/clk-blk-ctrl.c new file +13 -0
new file mode 100644
index 00000000..1672646
@@ -0,0 +1,327 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright 2020 NXP.
+ */
+
+#include <linux/clk.h>
+#include <linux/reset-controller.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>

drivers/clk/imx/clk-blk-ctrl.c line 23

Quoted 10 lines
drivers/clk/imx/clk-blk-ctrl.c new file +10 -0
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/types.h>
+
+#include "clk.h"
+#include "clk-blk-ctrl.h"
+
+struct reset_hw {

s/reset_hw/imx_reset_hw
It helps the reader to quickly understand it's not core structure

drivers/clk/imx/clk-blk-ctrl.c line 30

Quoted 7 lines
drivers/clk/imx/clk-blk-ctrl.c new file +7 -0
+       u32 offset;
+       u32 shift;
+       u32 mask;
+       bool asserted;
+};
+
+struct pm_safekeep_info {

imx_pm_safekeep_info

Quoted 15 lines
drivers/clk/imx/clk-blk-ctrl.c new file +15 -0
+       uint32_t *regs_values;
+       uint32_t *regs_offsets;
+       uint32_t regs_num;
+};
+
+struct imx_blk_ctrl_drvdata {
+       void __iomem *base;
+       struct reset_controller_dev rcdev;
+       struct reset_hw *rst_hws;
+       struct pm_safekeep_info pm_info;
+
+       spinlock_t lock;
+};
+
+static int imx_blk_ctrl_reset_set(struct reset_controller_dev *rcdev,

drivers/clk/imx/clk-blk-ctrl.c line 55

Quoted 10 lines
drivers/clk/imx/clk-blk-ctrl.c new file +10 -0
+                                 unsigned long id, bool assert)
+{
+       struct imx_blk_ctrl_drvdata *drvdata = container_of(rcdev,
+                       struct imx_blk_ctrl_drvdata, rcdev);
+       unsigned int offset = drvdata->rst_hws[id].offset;
+       unsigned int shift = drvdata->rst_hws[id].shift;
+       unsigned int mask = drvdata->rst_hws[id].mask;
+       void __iomem *reg_addr = drvdata->base + offset;
+       unsigned long flags;
+       unsigned int asserted_before = 0, asserted_after = 0;

swap above two lines from long to short

Quoted 15 lines
drivers/clk/imx/clk-blk-ctrl.c new file +15 -0
+       u32 reg;
+       int i;
+
+       spin_lock_irqsave(&drvdata->lock, flags);
+
+       for (i = 0; i < drvdata->rcdev.nr_resets; i++)
+               if (drvdata->rst_hws[i].asserted)
+                       asserted_before++;
+
+       if (asserted_before == 0 && assert)
+               pm_runtime_get(rcdev->dev);
+
+       if (assert) {
+               reg = readl(reg_addr);
+               writel(reg & ~(mask << shift), reg_addr);

drivers/clk/imx/clk-blk-ctrl.c line 80

Quoted 10 lines
drivers/clk/imx/clk-blk-ctrl.c new file +10 -0
+               drvdata->rst_hws[id].asserted = true;
+       } else {
+               reg = readl(reg_addr);
+               writel(reg | (mask << shift), reg_addr);
+               drvdata->rst_hws[id].asserted = false;
+       }
+
+       for (i = 0; i < drvdata->rcdev.nr_resets; i++)
+               if (drvdata->rst_hws[i].asserted)
+                       asserted_after++;

I guess the logic may be able to be simplified. For example, put assert ref count in the private structure. Then
call pm_runtime_get when ref count is 0 and assert is true. call pm_runtime_put when ref ount is 0 and assert is false. No need to go through twice for loop each time.

Quoted 22 lines
drivers/clk/imx/clk-blk-ctrl.c new file +22 -0
+
+       if (asserted_before == 1 && asserted_after == 0)
+               pm_runtime_put(rcdev->dev);
+
+       spin_unlock_irqrestore(&drvdata->lock, flags);
+
+       return 0;
+}
+
+static int imx_blk_ctrl_reset_assert(struct reset_controller_dev *rcdev,
+                                          unsigned long id)
+{
+       return imx_blk_ctrl_reset_set(rcdev, id, true);
+}
+
+static int imx_blk_ctrl_reset_deassert(struct reset_controller_dev *rcdev,
+                                            unsigned long id)
+{
+       return imx_blk_ctrl_reset_set(rcdev, id, false);
+}
+
+static const struct reset_control_ops imx_blk_ctrl_reset_ops = {

drivers/clk/imx/clk-blk-ctrl.c line 112

Quoted 10 lines
drivers/clk/imx/clk-blk-ctrl.c new file +10 -0
+       .assert         = imx_blk_ctrl_reset_assert,
+       .deassert       = imx_blk_ctrl_reset_deassert,
+};
+
+static int imx_blk_ctrl_register_reset_controller(struct device *dev)
+{
+       struct imx_blk_ctrl_drvdata *drvdata = dev_get_drvdata(dev);
+       const struct imx_blk_ctrl_dev_data *dev_data = of_device_get_match_data(dev);
+       struct reset_hw *hws;
+       int max = dev_data->resets_max;

sort from long to short

Quoted 50 lines
drivers/clk/imx/clk-blk-ctrl.c new file +50 -0
+       int i;
+
+       spin_lock_init(&drvdata->lock);
+
+       drvdata->rcdev.owner     = THIS_MODULE;
+       drvdata->rcdev.nr_resets = max;
+       drvdata->rcdev.ops       = &imx_blk_ctrl_reset_ops;
+       drvdata->rcdev.of_node   = dev->of_node;
+       drvdata->rcdev.dev       = dev;
+
+       drvdata->rst_hws = devm_kcalloc(dev, max, sizeof(struct reset_hw),
+                                       GFP_KERNEL);
+       hws = drvdata->rst_hws;
+
+       for (i = 0; i < dev_data->hws_num; i++) {
+               struct imx_blk_ctrl_hw *hw = &dev_data->hws[i];
+
+               if (hw->type != BLK_CTRL_RESET)
+                       continue;
+
+               hws[hw->id].offset = hw->offset;
+               hws[hw->id].shift = hw->shift;
+               hws[hw->id].mask = hw->mask;
+       }
+
+       return devm_reset_controller_register(dev, &drvdata->rcdev);
+}
+static struct clk_hw *imx_blk_ctrl_register_one_clock(struct device *dev,
+                                               struct imx_blk_ctrl_hw *hw)
+{
+       struct imx_blk_ctrl_drvdata *drvdata = dev_get_drvdata(dev);
+       void __iomem *base = drvdata->base;
+       struct clk_hw *clk_hw;
+
+       switch (hw->type) {
+       case BLK_CTRL_CLK_MUX:
+               clk_hw = imx_dev_clk_hw_mux_flags(dev, hw->name,
+                                                 base + hw->offset,
+                                                 hw->shift, hw->width,
+                                                 hw->parents,
+                                                 hw->parents_count,
+                                                 hw->flags);
+               break;
+       case BLK_CTRL_CLK_GATE:
+               clk_hw = imx_dev_clk_hw_gate(dev, hw->name, hw->parents,
+                                            base + hw->offset, hw->shift);
+               break;
+       case BLK_CTRL_CLK_SHARED_GATE:
+               clk_hw = imx_dev_clk_hw_gate_shared(dev, hw->name,
+                                                   hw->parents,

drivers/clk/imx/clk-blk-ctrl.c line 172

Quoted 10 lines
drivers/clk/imx/clk-blk-ctrl.c new file +10 -0
+                                                   base + hw->offset,
+                                                   hw->shift,
+                                                   hw->shared_count);
+               break;
+       case BLK_CTRL_CLK_PLL14XX:
+               clk_hw = imx_dev_clk_hw_pll14xx(dev, hw->name, hw->parents,
+                                               base + hw->offset, hw->pll_tbl);
+               break;
+       default:
+               clk_hw = NULL;

A better way may be assign clk_hw default to NULL.
Then instead, we can add a WARN here in case the clk hw data is insane.

Quoted 17 lines
drivers/clk/imx/clk-blk-ctrl.c new file +17 -0
+       };
+
+       return clk_hw;
+}
+
+static int imx_blk_ctrl_register_clock_controller(struct device *dev)
+{
+       const struct imx_blk_ctrl_dev_data *dev_data = of_device_get_match_data(dev);
+       struct clk_hw_onecell_data *clk_hw_data;
+       struct clk_hw **hws;
+       int i;
+
+       clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws,
+                               dev_data->hws_num), GFP_KERNEL);
+       if (WARN_ON(!clk_hw_data))
+               return -ENOMEM;
+

drivers/clk/imx/clk-blk-ctrl.c line 199

Quoted 10 lines
drivers/clk/imx/clk-blk-ctrl.c new file +10 -0
+       clk_hw_data->num = dev_data->clocks_max;
+       hws = clk_hw_data->hws;
+
+       for (i = 0; i < dev_data->hws_num; i++) {
+               struct imx_blk_ctrl_hw *hw = &dev_data->hws[i];
+               struct clk_hw *tmp = imx_blk_ctrl_register_one_clock(dev, hw);
+
+               if (!tmp)
+                       continue;
+               hws[hw->id] = tmp;

tmp could be a non NULL error pointer.
Maybe here could be simplied as:
hws[hw->id] = imx_blk_ctrl_register_one_clock(dev, hw);

Quoted 63 lines
drivers/clk/imx/clk-blk-ctrl.c new file +63 -0
+       }
+
+       imx_check_clk_hws(hws, dev_data->clocks_max);
+
+       return of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get,
+                                       clk_hw_data);
+}
+
+static int imx_blk_ctrl_init_runtime_pm_safekeeping(struct device *dev)
+{
+       const struct imx_blk_ctrl_dev_data *dev_data = of_device_get_match_data(dev);
+       struct imx_blk_ctrl_drvdata *drvdata = dev_get_drvdata(dev);
+       struct pm_safekeep_info *pm_info = &drvdata->pm_info;
+       u32 regs_num = dev_data->pm_runtime_saved_regs_num;
+       const u32 *regs_offsets = dev_data->pm_runtime_saved_regs;
+
+       if (!dev_data->pm_runtime_saved_regs_num)
+               return 0;
+
+       pm_info->regs_values = devm_kzalloc(dev,
+                                           sizeof(u32) * regs_num,
+                                           GFP_KERNEL);
+       if (WARN_ON(IS_ERR(pm_info->regs_values)))
+               return PTR_ERR(pm_info->regs_values);
+
+       pm_info->regs_offsets = kmemdup(regs_offsets,
+                                       regs_num * sizeof(u32), GFP_KERNEL);
+       if (WARN_ON(IS_ERR(pm_info->regs_offsets)))
+               return PTR_ERR(pm_info->regs_offsets);
+
+       pm_info->regs_num = regs_num;
+
+       return 0;
+}
+
+static int imx_blk_ctrl_probe(struct platform_device *pdev)
+{
+       struct imx_blk_ctrl_drvdata *drvdata;
+       struct device *dev = &pdev->dev;
+       int ret;
+
+       drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
+       if (WARN_ON(!drvdata))
+               return -ENOMEM;
+
+       drvdata->base = devm_platform_ioremap_resource(pdev, 0);
+       if (WARN_ON(IS_ERR(drvdata->base)))
+               return PTR_ERR(drvdata->base);
+
+       dev_set_drvdata(dev, drvdata);
+
+       ret = imx_blk_ctrl_init_runtime_pm_safekeeping(dev);
+       if (ret)
+               return ret;
+
+       pm_runtime_get_noresume(dev);
+       pm_runtime_set_active(dev);
+       pm_runtime_enable(dev);
+
+       ret = imx_blk_ctrl_register_clock_controller(dev);
+       if (ret) {
+               pm_runtime_put(dev);
+               return ret;

drivers/clk/imx/clk-blk-ctrl.c line 272

Quoted 10 lines
drivers/clk/imx/clk-blk-ctrl.c new file +10 -0
+       }
+
+       ret = imx_blk_ctrl_register_reset_controller(dev);
+
+       pm_runtime_put(dev);
+
+       return ret;
+}
+
+static void imx_blk_ctrl_read_write(struct device *dev, bool write)

__maybe_unused

Quoted 11 lines
drivers/clk/imx/clk-blk-ctrl.c new file +11 -0
+{
+       struct imx_blk_ctrl_drvdata *drvdata = dev_get_drvdata(dev);
+       struct pm_safekeep_info *pm_info = &drvdata->pm_info;
+       void __iomem *base = drvdata->base;
+       int i;
+
+       if (!pm_info->regs_num)
+               return;
+
+       for (i = 0; i < pm_info->regs_num; i++) {
+               u32 offset = pm_info->regs_offsets[i];

drivers/clk/imx/clk-blk-ctrl.c line 293

Quoted 10 lines
drivers/clk/imx/clk-blk-ctrl.c new file +10 -0
+
+               if (write)
+                       writel(pm_info->regs_values[i], base + offset);
+               else
+                       pm_info->regs_values[i] = readl(base + offset);
+       }
+
+}
+
+static int imx_blk_ctrl_runtime_suspend(struct device *dev)

__maybe_unused

drivers/clk/imx/clk-blk-ctrl.c line 300

Quoted 7 lines
drivers/clk/imx/clk-blk-ctrl.c new file +7 -0
+{
+       imx_blk_ctrl_read_write(dev, false);
+
+       return 0;
+}
+
+static int imx_blk_ctrl_runtime_resume(struct device *dev)

__maybe_unused

Quoted 102 lines
drivers/clk/imx/clk-blk-ctrl.c new file +27 -0
+{
+       imx_blk_ctrl_read_write(dev, true);
+
+       return 0;
+}
+
+static const struct dev_pm_ops imx_blk_ctrl_pm_ops = {
+       SET_RUNTIME_PM_OPS(imx_blk_ctrl_runtime_suspend,
+                          imx_blk_ctrl_runtime_resume, NULL)
+       SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
+                          pm_runtime_force_resume)
+};
+
+static const struct of_device_id imx_blk_ctrl_of_match[] = {
+       { /* Sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, imx_blk_ctrl_of_match);
+
+static struct platform_driver imx_blk_ctrl_driver = {
+       .probe = imx_blk_ctrl_probe,
+       .driver = {
+               .name = "imx-blk-ctrl",
+               .of_match_table = of_match_ptr(imx_blk_ctrl_of_match),
+               .pm = &imx_blk_ctrl_pm_ops,
+       },
+};
+module_platform_driver(imx_blk_ctrl_driver);
drivers/clk/imx/clk-blk-ctrl.h new file +69 -0
new file mode 100644
index 00000000..b3b7fc37
@@ -0,0 +1,81 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __MACH_IMX_CLK_BLK_CTRL_H
+#define __MACH_IMX_CLK_BLK_CTRL_H
+
+enum imx_blk_ctrl_hw_type {
+       BLK_CTRL_CLK_MUX,
+       BLK_CTRL_CLK_GATE,
+       BLK_CTRL_CLK_SHARED_GATE,
+       BLK_CTRL_CLK_PLL14XX,
+       BLK_CTRL_RESET,
+};
+
+struct imx_blk_ctrl_hw {
+       int type;
+       char *name;
+       u32 offset;
+       u32 shift;
+       u32 mask;
+       u32 width;
+       u32 flags;
+       u32 id;
+       void *parents;
+       u32 parents_count;
+       int *shared_count;
+       struct imx_pll14xx_clk *pll_tbl;
+};
+
+struct imx_blk_ctrl_dev_data {
+       struct imx_blk_ctrl_hw *hws;
+       u32 hws_num;
+
+       u32 clocks_max;
+       u32 resets_max;
+
+       u32 pm_runtime_saved_regs_num;
+       u32 pm_runtime_saved_regs[];
+};
+
+#define IMX_BLK_CTRL(_type, _name, _id, _offset, _shift, _width, _mask, _parents, _parents_count, _flags, sh_count, _pll_tbl) \
+       {                                               \
+               .type = _type,                          \
+               .name = _name,                          \
+               .id = _id,                              \
+               .offset = _offset,                      \
+               .shift = _shift,                        \
+               .width = _width,                        \
+               .mask = _mask,                          \
+               .parents = _parents,                    \
+               .parents_count = _parents_count,        \
+               .flags = _flags,                        \
+               .shared_count = sh_count,               \
+               .pll_tbl = _pll_tbl,                    \
+       }
+
+#define IMX_BLK_CTRL_CLK_MUX(_name, _id, _offset, _shift, _width, _parents) \
+       IMX_BLK_CTRL(BLK_CTRL_CLK_MUX, _name, _id, _offset, _shift, _width, 0, _parents, ARRAY_SIZE(_parents), 0, NULL, NULL)
+
+#define IMX_BLK_CTRL_CLK_MUX_FLAGS(_name, _id, _offset, _shift, _width, _parents, _flags) \
+       IMX_BLK_CTRL(BLK_CTRL_CLK_MUX, _name, _id, _offset, _shift, _width, 0, _parents, ARRAY_SIZE(_parents), _flags, NULL, NULL)
+
+#define IMX_BLK_CTRL_CLK_GATE(_name, _id, _offset, _shift, _parents) \
+       IMX_BLK_CTRL(BLK_CTRL_CLK_GATE, _name, _id, _offset, _shift, 1, 0, _parents, 1, 0, NULL, NULL)
+
+#define IMX_BLK_CTRL_CLK_SHARED_GATE(_name, _id, _offset, _shift, _parents, sh_count) \
+       IMX_BLK_CTRL(BLK_CTRL_CLK_SHARED_GATE, _name, _id, _offset, _shift, 1, 0, _parents, 1, 0, sh_count, NULL)
+
+#define IMX_BLK_CTRL_CLK_PLL14XX(_name, _id, _offset, _parents, _pll_tbl) \
+       IMX_BLK_CTRL(BLK_CTRL_CLK_PLL14XX, _name, _id, _offset, 0, 0, 0, _parents, 1, 0, NULL, _pll_tbl)
+

drivers/clk/imx/clk-blk-ctrl.h line 79

Quoted 10 lines
drivers/clk/imx/clk-blk-ctrl.h new file +10 -0
+#define IMX_BLK_CTRL_RESET(_id, _offset, _shift) \
+       IMX_BLK_CTRL(BLK_CTRL_RESET, NULL, _id, _offset, _shift, 0, 1, NULL, 0, 0, NULL, NULL)
+
+#define IMX_BLK_CTRL_RESET_MASK(_id, _offset, _shift, mask) \
+       IMX_BLK_CTRL(BLK_CTRL_RESET, NULL, _id, _offset, _shift, 0, mask, NULL, 0, 0, NULL, NULL)
+
+extern const struct imx_blk_ctrl_dev_data imx8mp_audio_blk_ctrl_dev_data __initconst;
+extern const struct imx_blk_ctrl_dev_data imx8mp_media_blk_ctrl_dev_data __initconst;
+extern const struct imx_blk_ctrl_dev_data imx8mp_hdmi_blk_ctrl_dev_data __initconst;
+

If no special reasons, i may prefer to put those data in either clk-blk-ctrl.c or separate clk-blk-ctrl-data.c because there seems to be no code level dependency on the CCM driver(clk-imx8mq.c) for clk_blk_ctrl drivers.
Then we can save those extern variables.

Regards
Aisheng

Quoted 5 lines
drivers/clk/imx/clk-blk-ctrl.h new file +2 -1
+#endif
+
--

2.7.4

author
#26 lore raw

Re: [PATCH v2 11/17] clk: imx: Add blk_ctrl combo driver

Quoted 77 lines · Dong Aisheng
Quoted 10 lines · Abel Vesa

On i.MX8MP, there is a new type of IP which is called BLK_CTRL in RM and usually is comprised of some GPRs that are considered too generic to be part of any dedicated IP from that specific subsystem.

In general, some of the GPRs have some clock bits, some have reset bits, so in order to be able to use the imx clock API, this needs to be in a clock driver. From there it can use the reset controller API and leave the rest to the syscon.

Quoted 8 lines

This driver is intended to work with the following BLK_CTRL IPs found in i.MX8MP (but it might be reused by the future i.MX platforms that have this kind of IP in their design):
- Audio
- Media
- HDMI

The code mostly looks good to me.
Only a few minor comments.

Quoted 40 lines
---
 drivers/clk/imx/Makefile       |   2 +-
 drivers/clk/imx/clk-blk-ctrl.c | 327 +++++++++++++++++++++++++++++++++++++++++
 drivers/clk/imx/clk-blk-ctrl.h |  81 ++++++++++
 3 files changed, 409 insertions(+), 1 deletion(-)
 create mode 100644 drivers/clk/imx/clk-blk-ctrl.c
 create mode 100644 drivers/clk/imx/clk-blk-ctrl.h
drivers/clk/imx/Makefile +1 -1
index 928f874c..7afe1df 100644
@@ -27,7 +27,7 @@ obj-$(CONFIG_MXC_CLK_SCU) += \
 
 obj-$(CONFIG_CLK_IMX8MM) += clk-imx8mm.o
 obj-$(CONFIG_CLK_IMX8MN) += clk-imx8mn.o
-obj-$(CONFIG_CLK_IMX8MP) += clk-imx8mp.o
+obj-$(CONFIG_CLK_IMX8MP) += clk-imx8mp.o clk-blk-ctrl.o
 obj-$(CONFIG_CLK_IMX8MQ) += clk-imx8mq.o
 obj-$(CONFIG_CLK_IMX8QXP) += clk-imx8qxp.o clk-imx8qxp-lpcg.o
 
drivers/clk/imx/clk-blk-ctrl.c new file +13 -0
new file mode 100644
index 00000000..1672646
@@ -0,0 +1,327 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright 2020 NXP.
+ */
+
+#include <linux/clk.h>
+#include <linux/reset-controller.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>

drivers/clk/imx/clk-blk-ctrl.c line 23

Quoted 10 lines
drivers/clk/imx/clk-blk-ctrl.c new file +10 -0
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/types.h>
+
+#include "clk.h"
+#include "clk-blk-ctrl.h"
+
+struct reset_hw {

s/reset_hw/imx_reset_hw
It helps the reader to quickly understand it's not core structure

Quoted 10 lines

drivers/clk/imx/clk-blk-ctrl.c line 30

Quoted 7 lines
drivers/clk/imx/clk-blk-ctrl.c new file +7 -0
+       u32 offset;
+       u32 shift;
+       u32 mask;
+       bool asserted;
+};
+
+struct pm_safekeep_info {

imx_pm_safekeep_info

Will do in the next version.

Quoted 19 lines
Quoted 19 lines
drivers/clk/imx/clk-blk-ctrl.c new file +19 -0
+       uint32_t *regs_values;
+       uint32_t *regs_offsets;
+       uint32_t regs_num;
+};
+
+struct imx_blk_ctrl_drvdata {
+       void __iomem *base;
+       struct reset_controller_dev rcdev;
+       struct reset_hw *rst_hws;
+       struct pm_safekeep_info pm_info;
+
+       spinlock_t lock;
+};
+
+static int imx_blk_ctrl_reset_set(struct reset_controller_dev *rcdev,
+                                 unsigned long id, bool assert)
+{
+       struct imx_blk_ctrl_drvdata *drvdata = container_of(rcdev,
+                       struct imx_blk_ctrl_drvdata, rcdev);
Quoted 8 lines

drivers/clk/imx/clk-blk-ctrl.c line 55

Quoted 6 lines
drivers/clk/imx/clk-blk-ctrl.c new file +6 -0
+       unsigned int offset = drvdata->rst_hws[id].offset;
+       unsigned int shift = drvdata->rst_hws[id].shift;
+       unsigned int mask = drvdata->rst_hws[id].mask;
+       void __iomem *reg_addr = drvdata->base + offset;
+       unsigned long flags;
+       unsigned int asserted_before = 0, asserted_after = 0;

swap above two lines from long to short

Will do.

Quoted 25 lines
Quoted 25 lines
drivers/clk/imx/clk-blk-ctrl.c new file +24 -0
+       u32 reg;
+       int i;
+
+       spin_lock_irqsave(&drvdata->lock, flags);
+
+       for (i = 0; i < drvdata->rcdev.nr_resets; i++)
+               if (drvdata->rst_hws[i].asserted)
+                       asserted_before++;
+
+       if (asserted_before == 0 && assert)
+               pm_runtime_get(rcdev->dev);
+
+       if (assert) {
+               reg = readl(reg_addr);
+               writel(reg & ~(mask << shift), reg_addr);
+               drvdata->rst_hws[id].asserted = true;
+       } else {
+               reg = readl(reg_addr);
+               writel(reg | (mask << shift), reg_addr);
+               drvdata->rst_hws[id].asserted = false;
+       }
+
+       for (i = 0; i < drvdata->rcdev.nr_resets; i++)
+               if (drvdata->rst_hws[i].asserted)
Quoted 9 lines

drivers/clk/imx/clk-blk-ctrl.c line 80

Quoted 1 line
drivers/clk/imx/clk-blk-ctrl.c new file +1 -0
+                       asserted_after++;

I guess the logic may be able to be simplified. For example, put assert ref count in the private structure. Then
call pm_runtime_get when ref count is 0 and assert is true. call pm_runtime_put when ref ount is 0 and assert is false. No need to go through twice for loop each time.

Not really. For example, nothing stops a user to assert the same reset twice before deasserting. The refcount will increase twice while decreasing once. So we need to keep track of all the assertions and deassertions for each bit.

If the assert is requested twice, the asserted member is already set so no change. Same logic goes for the deassertion.

In the end we need to know when the last asserted bit is deasserted in order to call the pm_runtime_put. Also when the there was no bit asserted and an assertion is happening in order to do the pm_runtime_get.

The alternative to the current implementation would be a mask, but the number of bits could be virtually unlimited for a BLK_CTL IP, therefore, the two loops and the asserted member seem a cleaner approach.

Quoted 26 lines
Quoted 26 lines
drivers/clk/imx/clk-blk-ctrl.c new file +26 -0
+
+       if (asserted_before == 1 && asserted_after == 0)
+               pm_runtime_put(rcdev->dev);
+
+       spin_unlock_irqrestore(&drvdata->lock, flags);
+
+       return 0;
+}
+
+static int imx_blk_ctrl_reset_assert(struct reset_controller_dev *rcdev,
+                                          unsigned long id)
+{
+       return imx_blk_ctrl_reset_set(rcdev, id, true);
+}
+
+static int imx_blk_ctrl_reset_deassert(struct reset_controller_dev *rcdev,
+                                            unsigned long id)
+{
+       return imx_blk_ctrl_reset_set(rcdev, id, false);
+}
+
+static const struct reset_control_ops imx_blk_ctrl_reset_ops = {
+       .assert         = imx_blk_ctrl_reset_assert,
+       .deassert       = imx_blk_ctrl_reset_deassert,
+};
+
Quoted 8 lines

drivers/clk/imx/clk-blk-ctrl.c line 112

Quoted 6 lines
drivers/clk/imx/clk-blk-ctrl.c new file +6 -0
+static int imx_blk_ctrl_register_reset_controller(struct device *dev)
+{
+       struct imx_blk_ctrl_drvdata *drvdata = dev_get_drvdata(dev);
+       const struct imx_blk_ctrl_dev_data *dev_data = of_device_get_match_data(dev);
+       struct reset_hw *hws;
+       int max = dev_data->resets_max;

sort from long to short

Will do.

Quoted 56 lines
Quoted 56 lines
drivers/clk/imx/clk-blk-ctrl.c new file +55 -0
+       int i;
+
+       spin_lock_init(&drvdata->lock);
+
+       drvdata->rcdev.owner     = THIS_MODULE;
+       drvdata->rcdev.nr_resets = max;
+       drvdata->rcdev.ops       = &imx_blk_ctrl_reset_ops;
+       drvdata->rcdev.of_node   = dev->of_node;
+       drvdata->rcdev.dev       = dev;
+
+       drvdata->rst_hws = devm_kcalloc(dev, max, sizeof(struct reset_hw),
+                                       GFP_KERNEL);
+       hws = drvdata->rst_hws;
+
+       for (i = 0; i < dev_data->hws_num; i++) {
+               struct imx_blk_ctrl_hw *hw = &dev_data->hws[i];
+
+               if (hw->type != BLK_CTRL_RESET)
+                       continue;
+
+               hws[hw->id].offset = hw->offset;
+               hws[hw->id].shift = hw->shift;
+               hws[hw->id].mask = hw->mask;
+       }
+
+       return devm_reset_controller_register(dev, &drvdata->rcdev);
+}
+static struct clk_hw *imx_blk_ctrl_register_one_clock(struct device *dev,
+                                               struct imx_blk_ctrl_hw *hw)
+{
+       struct imx_blk_ctrl_drvdata *drvdata = dev_get_drvdata(dev);
+       void __iomem *base = drvdata->base;
+       struct clk_hw *clk_hw;
+
+       switch (hw->type) {
+       case BLK_CTRL_CLK_MUX:
+               clk_hw = imx_dev_clk_hw_mux_flags(dev, hw->name,
+                                                 base + hw->offset,
+                                                 hw->shift, hw->width,
+                                                 hw->parents,
+                                                 hw->parents_count,
+                                                 hw->flags);
+               break;
+       case BLK_CTRL_CLK_GATE:
+               clk_hw = imx_dev_clk_hw_gate(dev, hw->name, hw->parents,
+                                            base + hw->offset, hw->shift);
+               break;
+       case BLK_CTRL_CLK_SHARED_GATE:
+               clk_hw = imx_dev_clk_hw_gate_shared(dev, hw->name,
+                                                   hw->parents,
+                                                   base + hw->offset,
+                                                   hw->shift,
+                                                   hw->shared_count);
+               break;
+       case BLK_CTRL_CLK_PLL14XX:
Quoted 9 lines

drivers/clk/imx/clk-blk-ctrl.c line 172

Quoted 5 lines
drivers/clk/imx/clk-blk-ctrl.c new file +5 -0
+               clk_hw = imx_dev_clk_hw_pll14xx(dev, hw->name, hw->parents,
+                                               base + hw->offset, hw->pll_tbl);
+               break;
+       default:
+               clk_hw = NULL;

A better way may be assign clk_hw default to NULL.
Then instead, we can add a WARN here in case the clk hw data is insane.

Will do.

Quoted 23 lines
Quoted 23 lines
drivers/clk/imx/clk-blk-ctrl.c new file +23 -0
+       };
+
+       return clk_hw;
+}
+
+static int imx_blk_ctrl_register_clock_controller(struct device *dev)
+{
+       const struct imx_blk_ctrl_dev_data *dev_data = of_device_get_match_data(dev);
+       struct clk_hw_onecell_data *clk_hw_data;
+       struct clk_hw **hws;
+       int i;
+
+       clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws,
+                               dev_data->hws_num), GFP_KERNEL);
+       if (WARN_ON(!clk_hw_data))
+               return -ENOMEM;
+
+       clk_hw_data->num = dev_data->clocks_max;
+       hws = clk_hw_data->hws;
+
+       for (i = 0; i < dev_data->hws_num; i++) {
+               struct imx_blk_ctrl_hw *hw = &dev_data->hws[i];
+               struct clk_hw *tmp = imx_blk_ctrl_register_one_clock(dev, hw);
Quoted 9 lines

drivers/clk/imx/clk-blk-ctrl.c line 199

Quoted 4 lines
drivers/clk/imx/clk-blk-ctrl.c new file +4 -0
+
+               if (!tmp)
+                       continue;
+               hws[hw->id] = tmp;

tmp could be a non NULL error pointer.
Maybe here could be simplied as:
hws[hw->id] = imx_blk_ctrl_register_one_clock(dev, hw);

Will do.

Quoted 67 lines
Quoted 67 lines
drivers/clk/imx/clk-blk-ctrl.c new file +67 -0
+       }
+
+       imx_check_clk_hws(hws, dev_data->clocks_max);
+
+       return of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get,
+                                       clk_hw_data);
+}
+
+static int imx_blk_ctrl_init_runtime_pm_safekeeping(struct device *dev)
+{
+       const struct imx_blk_ctrl_dev_data *dev_data = of_device_get_match_data(dev);
+       struct imx_blk_ctrl_drvdata *drvdata = dev_get_drvdata(dev);
+       struct pm_safekeep_info *pm_info = &drvdata->pm_info;
+       u32 regs_num = dev_data->pm_runtime_saved_regs_num;
+       const u32 *regs_offsets = dev_data->pm_runtime_saved_regs;
+
+       if (!dev_data->pm_runtime_saved_regs_num)
+               return 0;
+
+       pm_info->regs_values = devm_kzalloc(dev,
+                                           sizeof(u32) * regs_num,
+                                           GFP_KERNEL);
+       if (WARN_ON(IS_ERR(pm_info->regs_values)))
+               return PTR_ERR(pm_info->regs_values);
+
+       pm_info->regs_offsets = kmemdup(regs_offsets,
+                                       regs_num * sizeof(u32), GFP_KERNEL);
+       if (WARN_ON(IS_ERR(pm_info->regs_offsets)))
+               return PTR_ERR(pm_info->regs_offsets);
+
+       pm_info->regs_num = regs_num;
+
+       return 0;
+}
+
+static int imx_blk_ctrl_probe(struct platform_device *pdev)
+{
+       struct imx_blk_ctrl_drvdata *drvdata;
+       struct device *dev = &pdev->dev;
+       int ret;
+
+       drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
+       if (WARN_ON(!drvdata))
+               return -ENOMEM;
+
+       drvdata->base = devm_platform_ioremap_resource(pdev, 0);
+       if (WARN_ON(IS_ERR(drvdata->base)))
+               return PTR_ERR(drvdata->base);
+
+       dev_set_drvdata(dev, drvdata);
+
+       ret = imx_blk_ctrl_init_runtime_pm_safekeeping(dev);
+       if (ret)
+               return ret;
+
+       pm_runtime_get_noresume(dev);
+       pm_runtime_set_active(dev);
+       pm_runtime_enable(dev);
+
+       ret = imx_blk_ctrl_register_clock_controller(dev);
+       if (ret) {
+               pm_runtime_put(dev);
+               return ret;
+       }
+
+       ret = imx_blk_ctrl_register_reset_controller(dev);
+
Quoted 9 lines

drivers/clk/imx/clk-blk-ctrl.c line 272

Quoted 6 lines
drivers/clk/imx/clk-blk-ctrl.c new file +6 -0
+       pm_runtime_put(dev);
+
+       return ret;
+}
+
+static void imx_blk_ctrl_read_write(struct device *dev, bool write)

__maybe_unused

Will do.

Quoted 15 lines
Quoted 15 lines
drivers/clk/imx/clk-blk-ctrl.c new file +15 -0
+{
+       struct imx_blk_ctrl_drvdata *drvdata = dev_get_drvdata(dev);
+       struct pm_safekeep_info *pm_info = &drvdata->pm_info;
+       void __iomem *base = drvdata->base;
+       int i;
+
+       if (!pm_info->regs_num)
+               return;
+
+       for (i = 0; i < pm_info->regs_num; i++) {
+               u32 offset = pm_info->regs_offsets[i];
+
+               if (write)
+                       writel(pm_info->regs_values[i], base + offset);
+               else
Quoted 9 lines

drivers/clk/imx/clk-blk-ctrl.c line 293

Quoted 6 lines
drivers/clk/imx/clk-blk-ctrl.c new file +6 -0
+                       pm_info->regs_values[i] = readl(base + offset);
+       }
+
+}
+
+static int imx_blk_ctrl_runtime_suspend(struct device *dev)

__maybe_unused

Will do.

Quoted 10 lines

drivers/clk/imx/clk-blk-ctrl.c line 300

Quoted 7 lines
drivers/clk/imx/clk-blk-ctrl.c new file +7 -0
+{
+       imx_blk_ctrl_read_write(dev, false);
+
+       return 0;
+}
+
+static int imx_blk_ctrl_runtime_resume(struct device *dev)

__maybe_unused

Will do.

Quoted 110 lines
Quoted 110 lines
drivers/clk/imx/clk-blk-ctrl.c new file +27 -0
+{
+       imx_blk_ctrl_read_write(dev, true);
+
+       return 0;
+}
+
+static const struct dev_pm_ops imx_blk_ctrl_pm_ops = {
+       SET_RUNTIME_PM_OPS(imx_blk_ctrl_runtime_suspend,
+                          imx_blk_ctrl_runtime_resume, NULL)
+       SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
+                          pm_runtime_force_resume)
+};
+
+static const struct of_device_id imx_blk_ctrl_of_match[] = {
+       { /* Sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, imx_blk_ctrl_of_match);
+
+static struct platform_driver imx_blk_ctrl_driver = {
+       .probe = imx_blk_ctrl_probe,
+       .driver = {
+               .name = "imx-blk-ctrl",
+               .of_match_table = of_match_ptr(imx_blk_ctrl_of_match),
+               .pm = &imx_blk_ctrl_pm_ops,
+       },
+};
+module_platform_driver(imx_blk_ctrl_driver);
drivers/clk/imx/clk-blk-ctrl.h new file +77 -0
new file mode 100644
index 00000000..b3b7fc37
@@ -0,0 +1,81 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __MACH_IMX_CLK_BLK_CTRL_H
+#define __MACH_IMX_CLK_BLK_CTRL_H
+
+enum imx_blk_ctrl_hw_type {
+       BLK_CTRL_CLK_MUX,
+       BLK_CTRL_CLK_GATE,
+       BLK_CTRL_CLK_SHARED_GATE,
+       BLK_CTRL_CLK_PLL14XX,
+       BLK_CTRL_RESET,
+};
+
+struct imx_blk_ctrl_hw {
+       int type;
+       char *name;
+       u32 offset;
+       u32 shift;
+       u32 mask;
+       u32 width;
+       u32 flags;
+       u32 id;
+       void *parents;
+       u32 parents_count;
+       int *shared_count;
+       struct imx_pll14xx_clk *pll_tbl;
+};
+
+struct imx_blk_ctrl_dev_data {
+       struct imx_blk_ctrl_hw *hws;
+       u32 hws_num;
+
+       u32 clocks_max;
+       u32 resets_max;
+
+       u32 pm_runtime_saved_regs_num;
+       u32 pm_runtime_saved_regs[];
+};
+
+#define IMX_BLK_CTRL(_type, _name, _id, _offset, _shift, _width, _mask, _parents, _parents_count, _flags, sh_count, _pll_tbl) \
+       {                                               \
+               .type = _type,                          \
+               .name = _name,                          \
+               .id = _id,                              \
+               .offset = _offset,                      \
+               .shift = _shift,                        \
+               .width = _width,                        \
+               .mask = _mask,                          \
+               .parents = _parents,                    \
+               .parents_count = _parents_count,        \
+               .flags = _flags,                        \
+               .shared_count = sh_count,               \
+               .pll_tbl = _pll_tbl,                    \
+       }
+
+#define IMX_BLK_CTRL_CLK_MUX(_name, _id, _offset, _shift, _width, _parents) \
+       IMX_BLK_CTRL(BLK_CTRL_CLK_MUX, _name, _id, _offset, _shift, _width, 0, _parents, ARRAY_SIZE(_parents), 0, NULL, NULL)
+
+#define IMX_BLK_CTRL_CLK_MUX_FLAGS(_name, _id, _offset, _shift, _width, _parents, _flags) \
+       IMX_BLK_CTRL(BLK_CTRL_CLK_MUX, _name, _id, _offset, _shift, _width, 0, _parents, ARRAY_SIZE(_parents), _flags, NULL, NULL)
+
+#define IMX_BLK_CTRL_CLK_GATE(_name, _id, _offset, _shift, _parents) \
+       IMX_BLK_CTRL(BLK_CTRL_CLK_GATE, _name, _id, _offset, _shift, 1, 0, _parents, 1, 0, NULL, NULL)
+
+#define IMX_BLK_CTRL_CLK_SHARED_GATE(_name, _id, _offset, _shift, _parents, sh_count) \
+       IMX_BLK_CTRL(BLK_CTRL_CLK_SHARED_GATE, _name, _id, _offset, _shift, 1, 0, _parents, 1, 0, sh_count, NULL)
+
+#define IMX_BLK_CTRL_CLK_PLL14XX(_name, _id, _offset, _parents, _pll_tbl) \
+       IMX_BLK_CTRL(BLK_CTRL_CLK_PLL14XX, _name, _id, _offset, 0, 0, 0, _parents, 1, 0, NULL, _pll_tbl)
+
+#define IMX_BLK_CTRL_RESET(_id, _offset, _shift) \
+       IMX_BLK_CTRL(BLK_CTRL_RESET, NULL, _id, _offset, _shift, 0, 1, NULL, 0, 0, NULL, NULL)
+
+#define IMX_BLK_CTRL_RESET_MASK(_id, _offset, _shift, mask) \
+       IMX_BLK_CTRL(BLK_CTRL_RESET, NULL, _id, _offset, _shift, 0, mask, NULL, 0, 0, NULL, NULL)
+
+extern const struct imx_blk_ctrl_dev_data imx8mp_audio_blk_ctrl_dev_data __initconst;
+extern const struct imx_blk_ctrl_dev_data imx8mp_media_blk_ctrl_dev_data __initconst;
Quoted 9 lines

drivers/clk/imx/clk-blk-ctrl.h line 79

Quoted 2 lines
drivers/clk/imx/clk-blk-ctrl.h new file +2 -0
+extern const struct imx_blk_ctrl_dev_data imx8mp_hdmi_blk_ctrl_dev_data __initconst;
+

If no special reasons, i may prefer to put those data in either clk-blk-ctrl.c or separate clk-blk-ctrl-data.c because there seems to be no code level dependency on the CCM driver(clk-imx8mq.c) for clk_blk_ctrl drivers.
Then we can save those extern variables.

The rationale here is to have the SoC specific definitions in the SoC specific clock provider driver. Otherwise with every new SoC that will use the blk_ctl IPs we will increase the size of clk-blk-ctrl driver. Plus the kernel names of the clocks used by each blk_ctl IP as parents are also defined in the SoC specific clock provider driver.

I'll find a way, though, to move those so that they would not be shared between all the clock drivers that needs a blk_ctl implementation.

Quoted 8 lines

Regards
Aisheng

Quoted 5 lines
drivers/clk/imx/clk-blk-ctrl.h new file +2 -1
+#endif
+
--

2.7.4

#27 lore raw

Re: [PATCH v2 11/17] clk: imx: Add blk_ctrl combo driver

On Thu, Aug 20, 2020 at 4:31 AM Abel Vesa <[email protected]> wrote:
....

Quoted 12 lines
Quoted 11 lines

drivers/clk/imx/clk-blk-ctrl.h line 79

Quoted 4 lines
drivers/clk/imx/clk-blk-ctrl.h new file +4 -0
+extern const struct imx_blk_ctrl_dev_data imx8mp_audio_blk_ctrl_dev_data __initconst;
+extern const struct imx_blk_ctrl_dev_data imx8mp_media_blk_ctrl_dev_data __initconst;
+extern const struct imx_blk_ctrl_dev_data imx8mp_hdmi_blk_ctrl_dev_data __initconst;
+

If no special reasons, i may prefer to put those data in either clk-blk-ctrl.c or separate clk-blk-ctrl-data.c because there seems to be no code level dependency on the CCM driver(clk-imx8mq.c) for clk_blk_ctrl drivers.
Then we can save those extern variables.

Quoted 9 lines

The rationale here is to have the SoC specific definitions in the SoC specific clock provider driver. Otherwise with every new SoC that will use the blk_ctl IPs we will increase the size of clk-blk-ctrl driver. Plus the kernel names of the clocks used by each blk_ctl IP as parents are also defined in the SoC specific clock provider driver.

I'll find a way, though, to move those so that they would not be shared between all the clock drivers that needs a blk_ctl implementation.

Please refer to pinctrl-imx.c to see if we can do similar things for blk-ctrl.

Regards
Aisheng

Quoted 8 lines
Quoted 8 lines

Regards
Aisheng

Quoted 5 lines
drivers/clk/imx/clk-blk-ctrl.h new file +2 -1
+#endif
+
--

2.7.4

maintainer
#28 lore raw

Re: [PATCH v2 11/17] clk: imx: Add blk_ctrl combo driver

In reply to Abel Vesa
Quoted 100 lines · Abel Vesa

On i.MX8MP, there is a new type of IP which is called BLK_CTRL in RM and usually is comprised of some GPRs that are considered too generic to be part of any dedicated IP from that specific subsystem.

In general, some of the GPRs have some clock bits, some have reset bits, so in order to be able to use the imx clock API, this needs to be in a clock driver. From there it can use the reset controller API and leave the rest to the syscon.

This driver is intended to work with the following BLK_CTRL IPs found in i.MX8MP (but it might be reused by the future i.MX platforms that have this kind of IP in their design):
- Audio
- Media
- HDMI

---
 drivers/clk/imx/Makefile       |   2 +-
 drivers/clk/imx/clk-blk-ctrl.c | 327 +++++++++++++++++++++++++++++++++++++++++
 drivers/clk/imx/clk-blk-ctrl.h |  81 ++++++++++
 3 files changed, 409 insertions(+), 1 deletion(-)
 create mode 100644 drivers/clk/imx/clk-blk-ctrl.c
 create mode 100644 drivers/clk/imx/clk-blk-ctrl.h
drivers/clk/imx/Makefile +1 -1
index 928f874c..7afe1df 100644
@@ -27,7 +27,7 @@ obj-$(CONFIG_MXC_CLK_SCU) += \
 
 obj-$(CONFIG_CLK_IMX8MM) += clk-imx8mm.o
 obj-$(CONFIG_CLK_IMX8MN) += clk-imx8mn.o
-obj-$(CONFIG_CLK_IMX8MP) += clk-imx8mp.o
+obj-$(CONFIG_CLK_IMX8MP) += clk-imx8mp.o clk-blk-ctrl.o
 obj-$(CONFIG_CLK_IMX8MQ) += clk-imx8mq.o
 obj-$(CONFIG_CLK_IMX8QXP) += clk-imx8qxp.o clk-imx8qxp-lpcg.o
 
drivers/clk/imx/clk-blk-ctrl.c new file +56 -0
new file mode 100644
index 00000000..1672646
@@ -0,0 +1,327 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright 2020 NXP.
+ */
+
+#include <linux/clk.h>
+#include <linux/reset-controller.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/types.h>
+
+#include "clk.h"
+#include "clk-blk-ctrl.h"
+
+struct reset_hw {
+	u32 offset;
+	u32 shift;
+	u32 mask;
+	bool asserted;
+};
+
+struct pm_safekeep_info {
+	uint32_t *regs_values;
+	uint32_t *regs_offsets;
+	uint32_t regs_num;
+};
+
+struct imx_blk_ctrl_drvdata {
+	void __iomem *base;
+	struct reset_controller_dev rcdev;
+	struct reset_hw *rst_hws;
+	struct pm_safekeep_info pm_info;
+
+	spinlock_t lock;
+};
+
+static int imx_blk_ctrl_reset_set(struct reset_controller_dev *rcdev,
+				  unsigned long id, bool assert)
+{
+	struct imx_blk_ctrl_drvdata *drvdata = container_of(rcdev,
+			struct imx_blk_ctrl_drvdata, rcdev);
+	unsigned int offset = drvdata->rst_hws[id].offset;
+	unsigned int shift = drvdata->rst_hws[id].shift;
+	unsigned int mask = drvdata->rst_hws[id].mask;
+	void __iomem *reg_addr = drvdata->base + offset;
+	unsigned long flags;
+	unsigned int asserted_before = 0, asserted_after = 0;
+	u32 reg;

drivers/clk/imx/clk-blk-ctrl.c line 66

Quoted 10 lines
drivers/clk/imx/clk-blk-ctrl.c new file +10 -0
+	int i;
+
+	spin_lock_irqsave(&drvdata->lock, flags);
+
+	for (i = 0; i < drvdata->rcdev.nr_resets; i++)
+		if (drvdata->rst_hws[i].asserted)
+			asserted_before++;
+
+	if (asserted_before == 0 && assert)
+		pm_runtime_get(rcdev->dev);

Shouldn't that be pm_runtime_get_sync() ?

I would do that unconditionally before locking drvdata->lock and then drop unnecessary refcounts afterwards.

Quoted 12 lines
drivers/clk/imx/clk-blk-ctrl.c new file +12 -0
+
+	if (assert) {
+		reg = readl(reg_addr);
+		writel(reg & ~(mask << shift), reg_addr);
+		drvdata->rst_hws[id].asserted = true;
+	} else {
+		reg = readl(reg_addr);
+		writel(reg | (mask << shift), reg_addr);
+		drvdata->rst_hws[id].asserted = false;
+	}
+
+	for (i = 0; i < drvdata->rcdev.nr_resets; i++)

drivers/clk/imx/clk-blk-ctrl.c line 88

Quoted 10 lines
drivers/clk/imx/clk-blk-ctrl.c new file +10 -0
+		if (drvdata->rst_hws[i].asserted)
+			asserted_after++;
+
+	if (asserted_before == 1 && asserted_after == 0)
+		pm_runtime_put(rcdev->dev);
+
+	spin_unlock_irqrestore(&drvdata->lock, flags);
+
+	return 0;
+}

regards
Philipp

author
#29 lore raw

Re: [PATCH v2 11/17] clk: imx: Add blk_ctrl combo driver

Quoted 114 lines · Philipp Zabel
Quoted 100 lines · Abel Vesa

On i.MX8MP, there is a new type of IP which is called BLK_CTRL in RM and usually is comprised of some GPRs that are considered too generic to be part of any dedicated IP from that specific subsystem.

In general, some of the GPRs have some clock bits, some have reset bits, so in order to be able to use the imx clock API, this needs to be in a clock driver. From there it can use the reset controller API and leave the rest to the syscon.

This driver is intended to work with the following BLK_CTRL IPs found in i.MX8MP (but it might be reused by the future i.MX platforms that have this kind of IP in their design):
- Audio
- Media
- HDMI

---
 drivers/clk/imx/Makefile       |   2 +-
 drivers/clk/imx/clk-blk-ctrl.c | 327 +++++++++++++++++++++++++++++++++++++++++
 drivers/clk/imx/clk-blk-ctrl.h |  81 ++++++++++
 3 files changed, 409 insertions(+), 1 deletion(-)
 create mode 100644 drivers/clk/imx/clk-blk-ctrl.c
 create mode 100644 drivers/clk/imx/clk-blk-ctrl.h
drivers/clk/imx/Makefile +1 -1
index 928f874c..7afe1df 100644
@@ -27,7 +27,7 @@ obj-$(CONFIG_MXC_CLK_SCU) += \
 
 obj-$(CONFIG_CLK_IMX8MM) += clk-imx8mm.o
 obj-$(CONFIG_CLK_IMX8MN) += clk-imx8mn.o
-obj-$(CONFIG_CLK_IMX8MP) += clk-imx8mp.o
+obj-$(CONFIG_CLK_IMX8MP) += clk-imx8mp.o clk-blk-ctrl.o
 obj-$(CONFIG_CLK_IMX8MQ) += clk-imx8mq.o
 obj-$(CONFIG_CLK_IMX8QXP) += clk-imx8qxp.o clk-imx8qxp-lpcg.o
 
drivers/clk/imx/clk-blk-ctrl.c new file +56 -0
new file mode 100644
index 00000000..1672646
@@ -0,0 +1,327 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright 2020 NXP.
+ */
+
+#include <linux/clk.h>
+#include <linux/reset-controller.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/types.h>
+
+#include "clk.h"
+#include "clk-blk-ctrl.h"
+
+struct reset_hw {
+	u32 offset;
+	u32 shift;
+	u32 mask;
+	bool asserted;
+};
+
+struct pm_safekeep_info {
+	uint32_t *regs_values;
+	uint32_t *regs_offsets;
+	uint32_t regs_num;
+};
+
+struct imx_blk_ctrl_drvdata {
+	void __iomem *base;
+	struct reset_controller_dev rcdev;
+	struct reset_hw *rst_hws;
+	struct pm_safekeep_info pm_info;
+
+	spinlock_t lock;
+};
+
+static int imx_blk_ctrl_reset_set(struct reset_controller_dev *rcdev,
+				  unsigned long id, bool assert)
+{
+	struct imx_blk_ctrl_drvdata *drvdata = container_of(rcdev,
+			struct imx_blk_ctrl_drvdata, rcdev);
+	unsigned int offset = drvdata->rst_hws[id].offset;
+	unsigned int shift = drvdata->rst_hws[id].shift;
+	unsigned int mask = drvdata->rst_hws[id].mask;
+	void __iomem *reg_addr = drvdata->base + offset;
+	unsigned long flags;
+	unsigned int asserted_before = 0, asserted_after = 0;
+	u32 reg;

drivers/clk/imx/clk-blk-ctrl.c line 66

Quoted 10 lines
drivers/clk/imx/clk-blk-ctrl.c new file +10 -0
+	int i;
+
+	spin_lock_irqsave(&drvdata->lock, flags);
+
+	for (i = 0; i < drvdata->rcdev.nr_resets; i++)
+		if (drvdata->rst_hws[i].asserted)
+			asserted_before++;
+
+	if (asserted_before == 0 && assert)
+		pm_runtime_get(rcdev->dev);

Shouldn't that be pm_runtime_get_sync() ?

Quoted 3 lines

I would do that unconditionally before locking drvdata->lock and then drop unnecessary refcounts afterwards.

I thought we already discussed this on the last's version thread.

The assert and deassert do not necessary get called in pairs, leading to the device power domain staying always on because some use called assert multiple times without doig the same number of deasserts.

Quoted 25 lines
Quoted 12 lines
drivers/clk/imx/clk-blk-ctrl.c new file +12 -0
+
+	if (assert) {
+		reg = readl(reg_addr);
+		writel(reg & ~(mask << shift), reg_addr);
+		drvdata->rst_hws[id].asserted = true;
+	} else {
+		reg = readl(reg_addr);
+		writel(reg | (mask << shift), reg_addr);
+		drvdata->rst_hws[id].asserted = false;
+	}
+
+	for (i = 0; i < drvdata->rcdev.nr_resets; i++)

drivers/clk/imx/clk-blk-ctrl.c line 88

Quoted 10 lines
drivers/clk/imx/clk-blk-ctrl.c new file +10 -0
+		if (drvdata->rst_hws[i].asserted)
+			asserted_after++;
+
+	if (asserted_before == 1 && asserted_after == 0)
+		pm_runtime_put(rcdev->dev);
+
+	spin_unlock_irqrestore(&drvdata->lock, flags);
+
+	return 0;
+}

regards
Philipp

maintainer
#30 lore raw

Re: [PATCH v2 11/17] clk: imx: Add blk_ctrl combo driver

On Tue, 2020-08-25 at 14:24 +0300, Abel Vesa wrote:
[...]

Quoted 25 lines
Quoted 25 lines
Quoted 12 lines
drivers/clk/imx/clk-blk-ctrl.c new file +12 -0
+static int imx_blk_ctrl_reset_set(struct reset_controller_dev *rcdev,
+				  unsigned long id, bool assert)
+{
+	struct imx_blk_ctrl_drvdata *drvdata = container_of(rcdev,
+			struct imx_blk_ctrl_drvdata, rcdev);
+	unsigned int offset = drvdata->rst_hws[id].offset;
+	unsigned int shift = drvdata->rst_hws[id].shift;
+	unsigned int mask = drvdata->rst_hws[id].mask;
+	void __iomem *reg_addr = drvdata->base + offset;
+	unsigned long flags;
+	unsigned int asserted_before = 0, asserted_after = 0;
+	u32 reg;

drivers/clk/imx/clk-blk-ctrl.c line 66

Quoted 10 lines
drivers/clk/imx/clk-blk-ctrl.c new file +10 -0
+	int i;
+
+	spin_lock_irqsave(&drvdata->lock, flags);
+
+	for (i = 0; i < drvdata->rcdev.nr_resets; i++)
+		if (drvdata->rst_hws[i].asserted)
+			asserted_before++;
+
+	if (asserted_before == 0 && assert)
+		pm_runtime_get(rcdev->dev);

Shouldn't that be pm_runtime_get_sync() ?

Quoted 5 lines
Quoted 3 lines

I would do that unconditionally before locking drvdata->lock and then drop unnecessary refcounts afterwards.

I thought we already discussed this on the last's version thread.

This is about something different. pm_runtime_get() just queues the device to be enabled at a later point, but I presume you want to have it enabled before writing to its registers. (The question here is can you write to the registers, and have the device update its internal state, while the power domain is disabled?)
Either way, if you want the reset to be asserted after the function returns (as is required by the reset API), as I understand it, you have to make sure that the power domain is activated before the function returns.
Therefore pm_runtime_get_sync() is required instead of pm_runtime_get(), and that must be called outside of the spin locked section. My suggestion would be:

	if (assert)
		pm_runtime_get_sync();
	spin_lock_irqsave();
	/* ... */
	spin_unlock_irqrestore();
	if (assert && asserted_before)
		pm_runtime_put();

unless the following might be an issue:

Quoted 8 lines
Quoted 8 lines

drivers/clk/imx/clk-blk-ctrl.c line 74

Quoted 8 lines
drivers/clk/imx/clk-blk-ctrl.c new file +8 -0
+
+	if (assert) {
+		reg = readl(reg_addr);
+		writel(reg & ~(mask << shift), reg_addr);
+		drvdata->rst_hws[id].asserted = true;
+	} else {
+		reg = readl(reg_addr);
+		writel(reg | (mask << shift), reg_addr);

Could this cause problems if the power domain is already disabled? If so, it would be best to either temporarily enable power, or to skip the register writes if asserted_before == 0 && !assert.

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/clk/imx/clk-blk-ctrl.c new file +6 -0
+		drvdata->rst_hws[id].asserted = false;
+	}
+
+	for (i = 0; i < drvdata->rcdev.nr_resets; i++)
+		if (drvdata->rst_hws[i].asserted)
+			asserted_after++;
Quoted 8 lines
Quoted 8 lines

drivers/clk/imx/clk-blk-ctrl.c line 88

Quoted 8 lines
drivers/clk/imx/clk-blk-ctrl.c new file +8 -0
+
+	if (asserted_before == 1 && asserted_after == 0)
+		pm_runtime_put(rcdev->dev);
+
+	spin_unlock_irqrestore(&drvdata->lock, flags);
+
+	return 0;
+}

regards
Philipp

author
#31 lore raw

Re: [PATCH v2 11/17] clk: imx: Add blk_ctrl combo driver

Quoted 46 lines · Philipp Zabel

On Tue, 2020-08-25 at 14:24 +0300, Abel Vesa wrote:
[...]

Quoted 25 lines
Quoted 25 lines
Quoted 12 lines
drivers/clk/imx/clk-blk-ctrl.c new file +12 -0
+static int imx_blk_ctrl_reset_set(struct reset_controller_dev *rcdev,
+				  unsigned long id, bool assert)
+{
+	struct imx_blk_ctrl_drvdata *drvdata = container_of(rcdev,
+			struct imx_blk_ctrl_drvdata, rcdev);
+	unsigned int offset = drvdata->rst_hws[id].offset;
+	unsigned int shift = drvdata->rst_hws[id].shift;
+	unsigned int mask = drvdata->rst_hws[id].mask;
+	void __iomem *reg_addr = drvdata->base + offset;
+	unsigned long flags;
+	unsigned int asserted_before = 0, asserted_after = 0;
+	u32 reg;

drivers/clk/imx/clk-blk-ctrl.c line 66

Quoted 10 lines
drivers/clk/imx/clk-blk-ctrl.c new file +10 -0
+	int i;
+
+	spin_lock_irqsave(&drvdata->lock, flags);
+
+	for (i = 0; i < drvdata->rcdev.nr_resets; i++)
+		if (drvdata->rst_hws[i].asserted)
+			asserted_before++;
+
+	if (asserted_before == 0 && assert)
+		pm_runtime_get(rcdev->dev);

Shouldn't that be pm_runtime_get_sync() ?

Quoted 5 lines
Quoted 3 lines

I would do that unconditionally before locking drvdata->lock and then drop unnecessary refcounts afterwards.

I thought we already discussed this on the last's version thread.

This is about something different. pm_runtime_get() just queues the device to be enabled at a later point, but I presume you want to have it enabled before writing to its registers. (The question here is can you write to the registers, and have the device update its internal state, while the power domain is disabled?)
Either way, if you want the reset to be asserted after the function returns (as is required by the reset API), as I understand it, you have to make sure that the power domain is activated before the function returns.
Therefore pm_runtime_get_sync() is required instead of pm_runtime_get(), and that must be called outside of the spin locked section. My suggestion would be:

Quoted 8 lines
	if (assert)
		pm_runtime_get_sync();
	spin_lock_irqsave();
	/* ... */
	spin_unlock_irqrestore();
	if (assert && asserted_before)
		pm_runtime_put();

You're right this makes more sense.

Quoted 14 lines

unless the following might be an issue:

Quoted 8 lines
Quoted 8 lines

drivers/clk/imx/clk-blk-ctrl.c line 74

Quoted 8 lines
drivers/clk/imx/clk-blk-ctrl.c new file +8 -0
+
+	if (assert) {
+		reg = readl(reg_addr);
+		writel(reg & ~(mask << shift), reg_addr);
+		drvdata->rst_hws[id].asserted = true;
+	} else {
+		reg = readl(reg_addr);
+		writel(reg | (mask << shift), reg_addr);

Could this cause problems if the power domain is already disabled? If so, it would be best to either temporarily enable power, or to skip the register writes if asserted_before == 0 && !assert.

I'll go with the latter one since it leaves the PD off.

Quoted 18 lines
Quoted 15 lines
Quoted 15 lines
Quoted 5 lines
drivers/clk/imx/clk-blk-ctrl.c new file +4 -0
+		drvdata->rst_hws[id].asserted = false;
+	}
+
+	for (i = 0; i < drvdata->rcdev.nr_resets; i++)

drivers/clk/imx/clk-blk-ctrl.c line 88

Quoted 10 lines
drivers/clk/imx/clk-blk-ctrl.c new file +10 -0
+		if (drvdata->rst_hws[i].asserted)
+			asserted_after++;
+
+	if (asserted_before == 1 && asserted_after == 0)
+		pm_runtime_put(rcdev->dev);
+
+	spin_unlock_irqrestore(&drvdata->lock, flags);
+
+	return 0;
+}

regards
Philipp

author
#32 lore raw

Re: [PATCH v2 11/17] clk: imx: Add blk_ctrl combo driver

In reply to Philipp Zabel
Quoted 46 lines · Philipp Zabel

On Tue, 2020-08-25 at 14:24 +0300, Abel Vesa wrote:
[...]

Quoted 25 lines
Quoted 25 lines
Quoted 12 lines
drivers/clk/imx/clk-blk-ctrl.c new file +12 -0
+static int imx_blk_ctrl_reset_set(struct reset_controller_dev *rcdev,
+				  unsigned long id, bool assert)
+{
+	struct imx_blk_ctrl_drvdata *drvdata = container_of(rcdev,
+			struct imx_blk_ctrl_drvdata, rcdev);
+	unsigned int offset = drvdata->rst_hws[id].offset;
+	unsigned int shift = drvdata->rst_hws[id].shift;
+	unsigned int mask = drvdata->rst_hws[id].mask;
+	void __iomem *reg_addr = drvdata->base + offset;
+	unsigned long flags;
+	unsigned int asserted_before = 0, asserted_after = 0;
+	u32 reg;

drivers/clk/imx/clk-blk-ctrl.c line 66

Quoted 10 lines
drivers/clk/imx/clk-blk-ctrl.c new file +10 -0
+	int i;
+
+	spin_lock_irqsave(&drvdata->lock, flags);
+
+	for (i = 0; i < drvdata->rcdev.nr_resets; i++)
+		if (drvdata->rst_hws[i].asserted)
+			asserted_before++;
+
+	if (asserted_before == 0 && assert)
+		pm_runtime_get(rcdev->dev);

Shouldn't that be pm_runtime_get_sync() ?

Quoted 5 lines
Quoted 3 lines

I would do that unconditionally before locking drvdata->lock and then drop unnecessary refcounts afterwards.

I thought we already discussed this on the last's version thread.

This is about something different. pm_runtime_get() just queues the device to be enabled at a later point, but I presume you want to have it enabled before writing to its registers. (The question here is can you write to the registers, and have the device update its internal state, while the power domain is disabled?)
Either way, if you want the reset to be asserted after the function returns (as is required by the reset API), as I understand it, you have to make sure that the power domain is activated before the function returns.
Therefore pm_runtime_get_sync() is required instead of pm_runtime_get(), and that must be called outside of the spin locked section. My suggestion would be:

Quoted 8 lines
	if (assert)
		pm_runtime_get_sync();
	spin_lock_irqsave();
	/* ... */
	spin_unlock_irqrestore();
	if (assert && asserted_before)
		pm_runtime_put();

On a second thought this doesn't work because, for the first assertion, the runtime put will never be called, if the asserted_before does not count the current assertion. If it counts the current assertion, then every assertion will end with runtime put. None of these options work here.

How about the following:

	if (assert && !test_and_set_bit(1, &drvdata->rst_hws[id].asserted))     
		pm_runtime_get_sync(rcdev->dev);                                
                                                                        
	spin_lock_irqsave(&drvdata->lock, flags);                               
                                                                        
	reg = readl(reg_addr);                                                  
	if (assert)                                                             
		writel(reg & ~(mask << shift), reg_addr);                       
	else                                                                    
		writel(reg | (mask << shift), reg_addr);                        
                                                                        
	spin_unlock_irqrestore(&drvdata->lock, flags);                          
                                                                        
	if (!assert && test_and_clear_bit(1, &drvdata->rst_hws[id].asserted))   
		pm_runtime_put(rcdev->dev);                                     

This would only call the get_sync/put once for each reset bit.

Quoted 24 lines

unless the following might be an issue:

Quoted 8 lines
Quoted 8 lines

drivers/clk/imx/clk-blk-ctrl.c line 74

Quoted 8 lines
drivers/clk/imx/clk-blk-ctrl.c new file +8 -0
+
+	if (assert) {
+		reg = readl(reg_addr);
+		writel(reg & ~(mask << shift), reg_addr);
+		drvdata->rst_hws[id].asserted = true;
+	} else {
+		reg = readl(reg_addr);
+		writel(reg | (mask << shift), reg_addr);

Could this cause problems if the power domain is already disabled? If so, it would be best to either temporarily enable power, or to skip the register writes if asserted_before == 0 && !assert.

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
drivers/clk/imx/clk-blk-ctrl.c new file +9 -0
+		drvdata->rst_hws[id].asserted = false;
+	}
+
+	for (i = 0; i < drvdata->rcdev.nr_resets; i++)
+		if (drvdata->rst_hws[i].asserted)
+			asserted_after++;
+
+	if (asserted_before == 1 && asserted_after == 0)
+		pm_runtime_put(rcdev->dev);
Quoted 8 lines
Quoted 5 lines
Quoted 5 lines

drivers/clk/imx/clk-blk-ctrl.c line 88

Quoted 5 lines
drivers/clk/imx/clk-blk-ctrl.c new file +5 -0
+
+	spin_unlock_irqrestore(&drvdata->lock, flags);
+
+	return 0;
+}

regards
Philipp

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

maintainer
#33 lore raw

Re: [PATCH v2 11/17] clk: imx: Add blk_ctrl combo driver

On Tue, 2020-08-25 at 21:30 +0300, Abel Vesa wrote:
[...]

Quoted 9 lines
Quoted 8 lines
	if (assert)
		pm_runtime_get_sync();
	spin_lock_irqsave();
	/* ... */
	spin_unlock_irqrestore();
	if (assert && asserted_before)
		pm_runtime_put();
Quoted 3 lines

On a second thought this doesn't work because, for the first assertion, the runtime put will never be called, if the asserted_before does not count the current assertion.

I'm not sure I follow. The first assert will increment device usage 0 -> 1, all others asserts will just temporarily increment and decrement 1 -> 2 -> 1. Isn't this just missing one

	if (!assert && !asserted_after)
		pm_runtime_put()

to do the last deassert 1 -> 0 transition?

Quoted 21 lines

If it counts the current assertion, then every assertion will end with runtime put. None of these options work here.

How about the following:

	if (assert && !test_and_set_bit(1, &drvdata->rst_hws[id].asserted))     
		pm_runtime_get_sync(rcdev->dev);                                
                                                                        
	spin_lock_irqsave(&drvdata->lock, flags);                               
                                                                        
	reg = readl(reg_addr);                                                  
	if (assert)                                                             
		writel(reg & ~(mask << shift), reg_addr);                       
	else                                                                    
		writel(reg | (mask << shift), reg_addr);                        
                                                                        
	spin_unlock_irqrestore(&drvdata->lock, flags);                          
                                                                        
	if (!assert && test_and_clear_bit(1, &drvdata->rst_hws[id].asserted))   
		pm_runtime_put(rcdev->dev);                                     
Quoted 1 line

This would only call the get_sync/put once for each reset bit.

Yes, that should work. I think it is a much better idea, no more looping through the entire reset control array.

regards
Philipp

author
#34 lore raw

PATCH v2 12/17 clk: imx8mp: Add audio blk_ctrl clocks and resets

In reply to Abel Vesa

Add audio blk_ctrl clocks and resets in the i.MX8MP clock driver to be picked up by the clk-blk-ctrl driver.

---
 drivers/clk/imx/clk-blk-ctrl.c |   4 ++
 drivers/clk/imx/clk-imx8mp.c   | 138 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+)
drivers/clk/imx/clk-blk-ctrl.c +4 -0
index 1672646..1c2991c 100644
@@ -312,6 +312,10 @@ static const struct dev_pm_ops imx_blk_ctrl_pm_ops = {
 };
 
 static const struct of_device_id imx_blk_ctrl_of_match[] = {
+	{
+		.compatible = "fsl,imx8mp-audio-blk-ctrl",
+		.data = &imx8mp_audio_blk_ctrl_dev_data
+	},
 	{ /* Sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, imx_blk_ctrl_of_match);
drivers/clk/imx/clk-imx8mp.c +138 -0

155 lines not on this page · raw message

Signature · 1 line
2.7.4
#35 lore raw

Re: [PATCH v2 12/17] clk: imx8mp: Add audio blk_ctrl clocks and resets

Quoted 8 lines · Abel Vesa

Add audio blk_ctrl clocks and resets in the i.MX8MP clock driver to be picked up by the clk-blk-ctrl driver.

---
 drivers/clk/imx/clk-blk-ctrl.c |   4 ++
 drivers/clk/imx/clk-imx8mp.c   | 138 +++++++++++++++++++++++++++++++++++++++++

As i mentioned in Patch 11, I wonder we probably better to put blk ctrl clk data in blk ctrl driver.
Otherwise, i'm okay with the code.

Regards
Aisheng

Quoted 181 lines
 2 files changed, 142 insertions(+)
drivers/clk/imx/clk-blk-ctrl.c +4 -0
index 1672646..1c2991c 100644
@@ -312,6 +312,10 @@ static const struct dev_pm_ops imx_blk_ctrl_pm_ops = {
 };
 
 static const struct of_device_id imx_blk_ctrl_of_match[] = {
+       {
+               .compatible = "fsl,imx8mp-audio-blk-ctrl",
+               .data = &imx8mp_audio_blk_ctrl_dev_data
+       },
        { /* Sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, imx_blk_ctrl_of_match);
drivers/clk/imx/clk-imx8mp.c +138 -1
index 462c558..00e7f5e 100644
@@ -4,6 +4,7 @@
  */
 
 #include <dt-bindings/clock/imx8mp-clock.h>
+#include <dt-bindings/reset/imx8mp-reset.h>
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/io.h>
@@ -14,11 +15,148 @@
 #include <linux/types.h>
 
 #include "clk.h"
+#include "clk-blk-ctrl.h"
+
+#define        IMX_AUDIO_BLK_CTRL_CLKEN0               0x0
+#define        IMX_AUDIO_BLK_CTRL_CLKEN1               0x4
+#define        IMX_AUDIO_BLK_CTRL_EARC                 0x200
+#define        IMX_AUDIO_BLK_CTRL_SAI1_MCLK_SEL        0x300
+#define        IMX_AUDIO_BLK_CTRL_SAI2_MCLK_SEL        0x304
+#define        IMX_AUDIO_BLK_CTRL_SAI3_MCLK_SEL        0x308
+#define        IMX_AUDIO_BLK_CTRL_SAI5_MCLK_SEL        0x30C
+#define        IMX_AUDIO_BLK_CTRL_SAI6_MCLK_SEL        0x310
+#define        IMX_AUDIO_BLK_CTRL_SAI7_MCLK_SEL        0x314
+#define        IMX_AUDIO_BLK_CTRL_PDM_CLK              0x318
+#define        IMX_AUDIO_BLK_CTRL_SAI_PLL_GNRL_CTL     0x400
+#define        IMX_AUDIO_BLK_CTRL_SAI_PLL_FDIVL_CTL0   0x404
+#define        IMX_AUDIO_BLK_CTRL_SAI_PLL_FDIVL_CTL1   0x408
+#define        IMX_AUDIO_BLK_CTRL_SAI_PLL_SSCG_CTL     0x40C
+#define        IMX_AUDIO_BLK_CTRL_SAI_PLL_MNIT_CTL     0x410
+#define        IMX_AUDIO_BLK_CTRL_IPG_LP_CTRL          0x504
+
+#define IMX_MEDIA_BLK_CTRL_SFT_RSTN            0x0
+#define IMX_MEDIA_BLK_CTRL_CLK_EN              0x4
 
 static u32 share_count_nand;
 static u32 share_count_media;
 static u32 share_count_audio;
 
+static int shared_count_pdm;
+
+static const struct imx_pll14xx_rate_table imx_blk_ctrl_sai_pll_tbl[] = {
+       PLL_1443X_RATE(650000000U, 325, 3, 2, 0),
+};
+
+static const struct imx_pll14xx_clk imx_blk_ctrl_sai_pll = {
+       .type = PLL_1443X,
+       .rate_table = imx_blk_ctrl_sai_pll_tbl,
+};
+
+static const char * const imx_sai_mclk2_sels[] = {"sai1_root", "sai2_root", "sai3_root", "dummy",
+                                          "sai5_root", "sai6_root", "sai7_root", "sai1_mclk",
+                                          "sai2_mclk", "sai3_mclk", "dummy",
+                                          "sai5_mclk", "sai6_mclk", "sai7_mclk", "spdif1_ext_clk"};
+static const char * const imx_sai1_mclk1_sels[] = {"sai1_root", "sai1_mclk", };
+static const char * const imx_sai2_mclk1_sels[] = {"sai2_root", "sai2_mclk", };
+static const char * const imx_sai3_mclk1_sels[] = {"sai3_root", "sai3_mclk", };
+static const char * const imx_sai5_mclk1_sels[] = {"sai5_root", "sai5_mclk", };
+static const char * const imx_sai6_mclk1_sels[] = {"sai6_root", "sai6_mclk", };
+static const char * const imx_sai7_mclk1_sels[] = {"sai7_root", "sai7_mclk", };
+static const char * const imx_pdm_sels[] = {"pdm_root", "sai_pll_div2", "dummy", "dummy" };
+static const char * const imx_sai_pll_ref_sels[] = {"osc_24m", "dummy", "dummy", "dummy", };
+static const char * const imx_sai_pll_bypass_sels[] = {"sai_pll", "sai_pll_ref_sel", };
+
+static struct imx_blk_ctrl_hw imx8mp_audio_blk_ctrl_hws[] = {
+       /* clocks */
+       IMX_BLK_CTRL_CLK_MUX("sai_pll_ref_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL_REF_SEL, 0x400, 0, 2, imx_sai_pll_ref_sels),
+       IMX_BLK_CTRL_CLK_PLL14XX("sai_pll", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL, 0x400, "sai_pll_ref_sel", &imx_blk_ctrl_sai_pll),
+       IMX_BLK_CTRL_CLK_MUX_FLAGS("sai_pll_bypass", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL_BYPASS, 0x400, 4, 1, imx_sai_pll_bypass_sels, CLK_SET_RATE_PARENT),
+       IMX_BLK_CTRL_CLK_GATE("sai_pll_out", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL_OUT, 0x400, 13, "sai_pll_bypass"),
+       IMX_BLK_CTRL_CLK_MUX_FLAGS("sai1_mclk1_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK1_SEL, 0x300, 0, 1, imx_sai1_mclk1_sels, CLK_SET_RATE_PARENT),
+       IMX_BLK_CTRL_CLK_MUX("sai1_mclk2_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK2_SEL, 0x300, 1, 4, imx_sai_mclk2_sels),
+       IMX_BLK_CTRL_CLK_MUX_FLAGS("sai2_mclk1_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK1_SEL, 0x304, 0, 1, imx_sai2_mclk1_sels, CLK_SET_RATE_PARENT),
+       IMX_BLK_CTRL_CLK_MUX("sai2_mclk2_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK2_SEL, 0x304, 1, 4, imx_sai_mclk2_sels),
+       IMX_BLK_CTRL_CLK_MUX_FLAGS("sai3_mclk1_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK1_SEL, 0x308, 0, 1, imx_sai3_mclk1_sels, CLK_SET_RATE_PARENT),
+       IMX_BLK_CTRL_CLK_MUX("sai3_mclk2_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK2_SEL, 0x308, 1, 4, imx_sai_mclk2_sels),
+       IMX_BLK_CTRL_CLK_MUX("sai5_mclk1_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK1_SEL, 0x30C, 0, 1, imx_sai5_mclk1_sels),
+       IMX_BLK_CTRL_CLK_MUX("sai5_mclk2_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK2_SEL, 0x30C, 1, 4, imx_sai_mclk2_sels),
+       IMX_BLK_CTRL_CLK_MUX("sai6_mclk1_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK1_SEL, 0x310, 0, 1, imx_sai6_mclk1_sels),
+       IMX_BLK_CTRL_CLK_MUX("sai6_mclk2_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK2_SEL, 0x310, 1, 4, imx_sai_mclk2_sels),
+       IMX_BLK_CTRL_CLK_MUX("sai7_mclk1_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK1_SEL, 0x314, 0, 1, imx_sai7_mclk1_sels),
+       IMX_BLK_CTRL_CLK_MUX("sai7_mclk2_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK2_SEL, 0x314, 1, 4, imx_sai_mclk2_sels),
+       IMX_BLK_CTRL_CLK_GATE("sai1_ipg_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_IPG, 0, 0, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("sai1_mclk1_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK1, 0, 1, "sai1_mclk1_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai1_mclk2_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK2, 0, 2, "sai1_mclk2_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai1_mclk3_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK3, 0, 3, "sai_pll_out"),
+       IMX_BLK_CTRL_CLK_GATE("sai2_ipg_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_IPG, 0, 4, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("sai2_mclk1_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK1, 0, 5, "sai2_mclk1_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai2_mclk2_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK2, 0, 6, "sai2_mclk2_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai2_mclk3_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK3, 0, 7, "sai_pll_out"),
+       IMX_BLK_CTRL_CLK_GATE("sai3_ipg_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_IPG, 0, 8, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("sai3_mclk1_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK1, 0, 9, "sai3_mclk1_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai3_mclk2_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK2, 0, 10, "sai3_mclk2_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai3_mclk3_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK3, 0, 11, "sai_pll_out"),
+       IMX_BLK_CTRL_CLK_GATE("sai5_ipg_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_IPG, 0, 12, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("sai5_mclk1_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK1, 0, 13, "sai5_mclk1_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai5_mclk2_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK2, 0, 14, "sai5_mclk2_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai5_mclk3_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK3, 0, 15, "sai_pll_out"),
+       IMX_BLK_CTRL_CLK_GATE("sai6_ipg_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_IPG, 0, 16, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("sai6_mclk1_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK1, 0, 17, "sai6_mclk1_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai6_mclk2_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK2, 0, 18, "sai6_mclk2_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai6_mclk3_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK3, 0, 19, "sai_pll_out"),
+       IMX_BLK_CTRL_CLK_GATE("sai7_ipg_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_IPG, 0, 20, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("sai7_mclk1_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK1, 0, 21, "sai7_mclk1_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai7_mclk2_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK2, 0, 22, "sai7_mclk2_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai7_mclk3_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK3, 0, 23, "sai_pll_out"),
+       IMX_BLK_CTRL_CLK_GATE("asrc_ipg_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_ASRC_IPG, 0, 24, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_SHARED_GATE("pdm_ipg_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_PDM_IPG, 0, 25, "audio_ahb_root", &shared_count_pdm),
+       IMX_BLK_CTRL_CLK_SHARED_GATE("pdm_root_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_PDM_ROOT, 0, 25, "pdm_root", &shared_count_pdm),
+       IMX_BLK_CTRL_CLK_GATE("sdma2_root_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SDMA2_ROOT, 0, 26, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("sdma3_root_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SDMA3_ROOT, 0, 27, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("spba2_root_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SPBA2_ROOT, 0, 28, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("dsp_root_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_DSP_ROOT, 0, 29, "audio_axi_root"),
+       IMX_BLK_CTRL_CLK_GATE("dsp_dbg_clk",    IMX8MP_CLK_AUDIO_BLK_CTRL_DSPDBG_ROOT, 0, 30, "audio_axi_root"),
+       IMX_BLK_CTRL_CLK_GATE("earc_ipg_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_EARC_IPG, 0, 31, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("ocram_a_ipg_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_OCRAMA_IPG, 4, 0, "audio_axi_root"),
+       IMX_BLK_CTRL_CLK_GATE("aud2htx_ipg_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_AUD2HTX_IPG, 4, 1, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("edma_root_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_EDMA_ROOT, 4, 2, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("aud_pll_clk",  IMX8MP_CLK_AUDIO_BLK_CTRL_AUDPLL_ROOT, 4, 3, "osc_24m"),
+       IMX_BLK_CTRL_CLK_GATE("mu2_root_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_MU2_ROOT, 4, 4, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("mu3_root_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_MU3_ROOT, 4, 5, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("earc_phy_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_EARC_PHY, 4, 6, "sai_pll_out"),
+       IMX_BLK_CTRL_CLK_MUX("pdm_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_PDM_SEL, 0x318, 1, 4, imx_pdm_sels),
+
+       /* resets */
+       IMX_BLK_CTRL_RESET(IMX8MP_AUDIO_BLK_CTRL_EARC_RESET, 0x200, 0),
+       IMX_BLK_CTRL_RESET(IMX8MP_AUDIO_BLK_CTRL_EARC_PHY_RESET, 0x200, 1),
+};
+
+const struct imx_blk_ctrl_dev_data imx8mp_audio_blk_ctrl_dev_data __initconst = {
+       .hws = imx8mp_audio_blk_ctrl_hws,
+       .hws_num = ARRAY_SIZE(imx8mp_audio_blk_ctrl_hws),
+       .clocks_max = IMX8MP_CLK_AUDIO_BLK_CTRL_END,
+       .resets_max = IMX8MP_AUDIO_BLK_CTRL_RESET_NUM,
+       .pm_runtime_saved_regs_num = 16,
+       .pm_runtime_saved_regs = {
+               IMX_AUDIO_BLK_CTRL_CLKEN0,
+               IMX_AUDIO_BLK_CTRL_CLKEN1,
+               IMX_AUDIO_BLK_CTRL_EARC,
+               IMX_AUDIO_BLK_CTRL_SAI1_MCLK_SEL,
+               IMX_AUDIO_BLK_CTRL_SAI2_MCLK_SEL,
+               IMX_AUDIO_BLK_CTRL_SAI3_MCLK_SEL,
+               IMX_AUDIO_BLK_CTRL_SAI5_MCLK_SEL,
+               IMX_AUDIO_BLK_CTRL_SAI6_MCLK_SEL,
+               IMX_AUDIO_BLK_CTRL_SAI7_MCLK_SEL,
+               IMX_AUDIO_BLK_CTRL_PDM_CLK,
+               IMX_AUDIO_BLK_CTRL_SAI_PLL_GNRL_CTL,
+               IMX_AUDIO_BLK_CTRL_SAI_PLL_FDIVL_CTL0,
+               IMX_AUDIO_BLK_CTRL_SAI_PLL_FDIVL_CTL1,
+               IMX_AUDIO_BLK_CTRL_SAI_PLL_SSCG_CTL,
+               IMX_AUDIO_BLK_CTRL_SAI_PLL_MNIT_CTL,
+               IMX_AUDIO_BLK_CTRL_IPG_LP_CTRL
+       },
+};
+
 static const char * const pll_ref_sels[] = { "osc_24m", "dummy", "dummy", "dummy", };
 static const char * const audio_pll1_bypass_sels[] = {"audio_pll1", "audio_pll1_ref_sel", };
 static const char * const audio_pll2_bypass_sels[] = {"audio_pll2", "audio_pll2_ref_sel", };
--

2.7.4

author
#36 lore raw

Re: [PATCH v2 12/17] clk: imx8mp: Add audio blk_ctrl clocks and resets

Quoted 5 lines · Dong Aisheng
Quoted 4 lines · Abel Vesa

Add audio blk_ctrl clocks and resets in the i.MX8MP clock driver to be picked up by the clk-blk-ctrl driver.

Quoted 9 lines
Quoted 4 lines
---
 drivers/clk/imx/clk-blk-ctrl.c |   4 ++
 drivers/clk/imx/clk-imx8mp.c   | 138 +++++++++++++++++++++++++++++++++++++++++

As i mentioned in Patch 11, I wonder we probably better to put blk ctrl clk data in blk ctrl driver.
Otherwise, i'm okay with the code.

Check out my reply to the 11th patch.

Quoted 184 lines

Regards
Aisheng

Quoted 181 lines
 2 files changed, 142 insertions(+)
drivers/clk/imx/clk-blk-ctrl.c +4 -0
index 1672646..1c2991c 100644
@@ -312,6 +312,10 @@ static const struct dev_pm_ops imx_blk_ctrl_pm_ops = {
 };
 
 static const struct of_device_id imx_blk_ctrl_of_match[] = {
+       {
+               .compatible = "fsl,imx8mp-audio-blk-ctrl",
+               .data = &imx8mp_audio_blk_ctrl_dev_data
+       },
        { /* Sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, imx_blk_ctrl_of_match);
drivers/clk/imx/clk-imx8mp.c +138 -1
index 462c558..00e7f5e 100644
@@ -4,6 +4,7 @@
  */
 
 #include <dt-bindings/clock/imx8mp-clock.h>
+#include <dt-bindings/reset/imx8mp-reset.h>
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/io.h>
@@ -14,11 +15,148 @@
 #include <linux/types.h>
 
 #include "clk.h"
+#include "clk-blk-ctrl.h"
+
+#define        IMX_AUDIO_BLK_CTRL_CLKEN0               0x0
+#define        IMX_AUDIO_BLK_CTRL_CLKEN1               0x4
+#define        IMX_AUDIO_BLK_CTRL_EARC                 0x200
+#define        IMX_AUDIO_BLK_CTRL_SAI1_MCLK_SEL        0x300
+#define        IMX_AUDIO_BLK_CTRL_SAI2_MCLK_SEL        0x304
+#define        IMX_AUDIO_BLK_CTRL_SAI3_MCLK_SEL        0x308
+#define        IMX_AUDIO_BLK_CTRL_SAI5_MCLK_SEL        0x30C
+#define        IMX_AUDIO_BLK_CTRL_SAI6_MCLK_SEL        0x310
+#define        IMX_AUDIO_BLK_CTRL_SAI7_MCLK_SEL        0x314
+#define        IMX_AUDIO_BLK_CTRL_PDM_CLK              0x318
+#define        IMX_AUDIO_BLK_CTRL_SAI_PLL_GNRL_CTL     0x400
+#define        IMX_AUDIO_BLK_CTRL_SAI_PLL_FDIVL_CTL0   0x404
+#define        IMX_AUDIO_BLK_CTRL_SAI_PLL_FDIVL_CTL1   0x408
+#define        IMX_AUDIO_BLK_CTRL_SAI_PLL_SSCG_CTL     0x40C
+#define        IMX_AUDIO_BLK_CTRL_SAI_PLL_MNIT_CTL     0x410
+#define        IMX_AUDIO_BLK_CTRL_IPG_LP_CTRL          0x504
+
+#define IMX_MEDIA_BLK_CTRL_SFT_RSTN            0x0
+#define IMX_MEDIA_BLK_CTRL_CLK_EN              0x4
 
 static u32 share_count_nand;
 static u32 share_count_media;
 static u32 share_count_audio;
 
+static int shared_count_pdm;
+
+static const struct imx_pll14xx_rate_table imx_blk_ctrl_sai_pll_tbl[] = {
+       PLL_1443X_RATE(650000000U, 325, 3, 2, 0),
+};
+
+static const struct imx_pll14xx_clk imx_blk_ctrl_sai_pll = {
+       .type = PLL_1443X,
+       .rate_table = imx_blk_ctrl_sai_pll_tbl,
+};
+
+static const char * const imx_sai_mclk2_sels[] = {"sai1_root", "sai2_root", "sai3_root", "dummy",
+                                          "sai5_root", "sai6_root", "sai7_root", "sai1_mclk",
+                                          "sai2_mclk", "sai3_mclk", "dummy",
+                                          "sai5_mclk", "sai6_mclk", "sai7_mclk", "spdif1_ext_clk"};
+static const char * const imx_sai1_mclk1_sels[] = {"sai1_root", "sai1_mclk", };
+static const char * const imx_sai2_mclk1_sels[] = {"sai2_root", "sai2_mclk", };
+static const char * const imx_sai3_mclk1_sels[] = {"sai3_root", "sai3_mclk", };
+static const char * const imx_sai5_mclk1_sels[] = {"sai5_root", "sai5_mclk", };
+static const char * const imx_sai6_mclk1_sels[] = {"sai6_root", "sai6_mclk", };
+static const char * const imx_sai7_mclk1_sels[] = {"sai7_root", "sai7_mclk", };
+static const char * const imx_pdm_sels[] = {"pdm_root", "sai_pll_div2", "dummy", "dummy" };
+static const char * const imx_sai_pll_ref_sels[] = {"osc_24m", "dummy", "dummy", "dummy", };
+static const char * const imx_sai_pll_bypass_sels[] = {"sai_pll", "sai_pll_ref_sel", };
+
+static struct imx_blk_ctrl_hw imx8mp_audio_blk_ctrl_hws[] = {
+       /* clocks */
+       IMX_BLK_CTRL_CLK_MUX("sai_pll_ref_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL_REF_SEL, 0x400, 0, 2, imx_sai_pll_ref_sels),
+       IMX_BLK_CTRL_CLK_PLL14XX("sai_pll", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL, 0x400, "sai_pll_ref_sel", &imx_blk_ctrl_sai_pll),
+       IMX_BLK_CTRL_CLK_MUX_FLAGS("sai_pll_bypass", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL_BYPASS, 0x400, 4, 1, imx_sai_pll_bypass_sels, CLK_SET_RATE_PARENT),
+       IMX_BLK_CTRL_CLK_GATE("sai_pll_out", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI_PLL_OUT, 0x400, 13, "sai_pll_bypass"),
+       IMX_BLK_CTRL_CLK_MUX_FLAGS("sai1_mclk1_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK1_SEL, 0x300, 0, 1, imx_sai1_mclk1_sels, CLK_SET_RATE_PARENT),
+       IMX_BLK_CTRL_CLK_MUX("sai1_mclk2_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK2_SEL, 0x300, 1, 4, imx_sai_mclk2_sels),
+       IMX_BLK_CTRL_CLK_MUX_FLAGS("sai2_mclk1_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK1_SEL, 0x304, 0, 1, imx_sai2_mclk1_sels, CLK_SET_RATE_PARENT),
+       IMX_BLK_CTRL_CLK_MUX("sai2_mclk2_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK2_SEL, 0x304, 1, 4, imx_sai_mclk2_sels),
+       IMX_BLK_CTRL_CLK_MUX_FLAGS("sai3_mclk1_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK1_SEL, 0x308, 0, 1, imx_sai3_mclk1_sels, CLK_SET_RATE_PARENT),
+       IMX_BLK_CTRL_CLK_MUX("sai3_mclk2_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK2_SEL, 0x308, 1, 4, imx_sai_mclk2_sels),
+       IMX_BLK_CTRL_CLK_MUX("sai5_mclk1_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK1_SEL, 0x30C, 0, 1, imx_sai5_mclk1_sels),
+       IMX_BLK_CTRL_CLK_MUX("sai5_mclk2_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK2_SEL, 0x30C, 1, 4, imx_sai_mclk2_sels),
+       IMX_BLK_CTRL_CLK_MUX("sai6_mclk1_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK1_SEL, 0x310, 0, 1, imx_sai6_mclk1_sels),
+       IMX_BLK_CTRL_CLK_MUX("sai6_mclk2_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK2_SEL, 0x310, 1, 4, imx_sai_mclk2_sels),
+       IMX_BLK_CTRL_CLK_MUX("sai7_mclk1_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK1_SEL, 0x314, 0, 1, imx_sai7_mclk1_sels),
+       IMX_BLK_CTRL_CLK_MUX("sai7_mclk2_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK2_SEL, 0x314, 1, 4, imx_sai_mclk2_sels),
+       IMX_BLK_CTRL_CLK_GATE("sai1_ipg_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_IPG, 0, 0, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("sai1_mclk1_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK1, 0, 1, "sai1_mclk1_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai1_mclk2_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK2, 0, 2, "sai1_mclk2_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai1_mclk3_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI1_MCLK3, 0, 3, "sai_pll_out"),
+       IMX_BLK_CTRL_CLK_GATE("sai2_ipg_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_IPG, 0, 4, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("sai2_mclk1_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK1, 0, 5, "sai2_mclk1_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai2_mclk2_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK2, 0, 6, "sai2_mclk2_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai2_mclk3_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI2_MCLK3, 0, 7, "sai_pll_out"),
+       IMX_BLK_CTRL_CLK_GATE("sai3_ipg_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_IPG, 0, 8, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("sai3_mclk1_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK1, 0, 9, "sai3_mclk1_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai3_mclk2_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK2, 0, 10, "sai3_mclk2_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai3_mclk3_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI3_MCLK3, 0, 11, "sai_pll_out"),
+       IMX_BLK_CTRL_CLK_GATE("sai5_ipg_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_IPG, 0, 12, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("sai5_mclk1_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK1, 0, 13, "sai5_mclk1_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai5_mclk2_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK2, 0, 14, "sai5_mclk2_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai5_mclk3_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI5_MCLK3, 0, 15, "sai_pll_out"),
+       IMX_BLK_CTRL_CLK_GATE("sai6_ipg_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_IPG, 0, 16, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("sai6_mclk1_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK1, 0, 17, "sai6_mclk1_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai6_mclk2_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK2, 0, 18, "sai6_mclk2_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai6_mclk3_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI6_MCLK3, 0, 19, "sai_pll_out"),
+       IMX_BLK_CTRL_CLK_GATE("sai7_ipg_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_IPG, 0, 20, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("sai7_mclk1_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK1, 0, 21, "sai7_mclk1_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai7_mclk2_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK2, 0, 22, "sai7_mclk2_sel"),
+       IMX_BLK_CTRL_CLK_GATE("sai7_mclk3_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SAI7_MCLK3, 0, 23, "sai_pll_out"),
+       IMX_BLK_CTRL_CLK_GATE("asrc_ipg_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_ASRC_IPG, 0, 24, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_SHARED_GATE("pdm_ipg_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_PDM_IPG, 0, 25, "audio_ahb_root", &shared_count_pdm),
+       IMX_BLK_CTRL_CLK_SHARED_GATE("pdm_root_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_PDM_ROOT, 0, 25, "pdm_root", &shared_count_pdm),
+       IMX_BLK_CTRL_CLK_GATE("sdma2_root_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SDMA2_ROOT, 0, 26, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("sdma3_root_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SDMA3_ROOT, 0, 27, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("spba2_root_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_SPBA2_ROOT, 0, 28, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("dsp_root_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_DSP_ROOT, 0, 29, "audio_axi_root"),
+       IMX_BLK_CTRL_CLK_GATE("dsp_dbg_clk",    IMX8MP_CLK_AUDIO_BLK_CTRL_DSPDBG_ROOT, 0, 30, "audio_axi_root"),
+       IMX_BLK_CTRL_CLK_GATE("earc_ipg_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_EARC_IPG, 0, 31, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("ocram_a_ipg_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_OCRAMA_IPG, 4, 0, "audio_axi_root"),
+       IMX_BLK_CTRL_CLK_GATE("aud2htx_ipg_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_AUD2HTX_IPG, 4, 1, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("edma_root_clk",   IMX8MP_CLK_AUDIO_BLK_CTRL_EDMA_ROOT, 4, 2, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("aud_pll_clk",  IMX8MP_CLK_AUDIO_BLK_CTRL_AUDPLL_ROOT, 4, 3, "osc_24m"),
+       IMX_BLK_CTRL_CLK_GATE("mu2_root_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_MU2_ROOT, 4, 4, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("mu3_root_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_MU3_ROOT, 4, 5, "audio_ahb_root"),
+       IMX_BLK_CTRL_CLK_GATE("earc_phy_clk", IMX8MP_CLK_AUDIO_BLK_CTRL_EARC_PHY, 4, 6, "sai_pll_out"),
+       IMX_BLK_CTRL_CLK_MUX("pdm_sel", IMX8MP_CLK_AUDIO_BLK_CTRL_PDM_SEL, 0x318, 1, 4, imx_pdm_sels),
+
+       /* resets */
+       IMX_BLK_CTRL_RESET(IMX8MP_AUDIO_BLK_CTRL_EARC_RESET, 0x200, 0),
+       IMX_BLK_CTRL_RESET(IMX8MP_AUDIO_BLK_CTRL_EARC_PHY_RESET, 0x200, 1),
+};
+
+const struct imx_blk_ctrl_dev_data imx8mp_audio_blk_ctrl_dev_data __initconst = {
+       .hws = imx8mp_audio_blk_ctrl_hws,
+       .hws_num = ARRAY_SIZE(imx8mp_audio_blk_ctrl_hws),
+       .clocks_max = IMX8MP_CLK_AUDIO_BLK_CTRL_END,
+       .resets_max = IMX8MP_AUDIO_BLK_CTRL_RESET_NUM,
+       .pm_runtime_saved_regs_num = 16,
+       .pm_runtime_saved_regs = {
+               IMX_AUDIO_BLK_CTRL_CLKEN0,
+               IMX_AUDIO_BLK_CTRL_CLKEN1,
+               IMX_AUDIO_BLK_CTRL_EARC,
+               IMX_AUDIO_BLK_CTRL_SAI1_MCLK_SEL,
+               IMX_AUDIO_BLK_CTRL_SAI2_MCLK_SEL,
+               IMX_AUDIO_BLK_CTRL_SAI3_MCLK_SEL,
+               IMX_AUDIO_BLK_CTRL_SAI5_MCLK_SEL,
+               IMX_AUDIO_BLK_CTRL_SAI6_MCLK_SEL,
+               IMX_AUDIO_BLK_CTRL_SAI7_MCLK_SEL,
+               IMX_AUDIO_BLK_CTRL_PDM_CLK,
+               IMX_AUDIO_BLK_CTRL_SAI_PLL_GNRL_CTL,
+               IMX_AUDIO_BLK_CTRL_SAI_PLL_FDIVL_CTL0,
+               IMX_AUDIO_BLK_CTRL_SAI_PLL_FDIVL_CTL1,
+               IMX_AUDIO_BLK_CTRL_SAI_PLL_SSCG_CTL,
+               IMX_AUDIO_BLK_CTRL_SAI_PLL_MNIT_CTL,
+               IMX_AUDIO_BLK_CTRL_IPG_LP_CTRL
+       },
+};
+
 static const char * const pll_ref_sels[] = { "osc_24m", "dummy", "dummy", "dummy", };
 static const char * const audio_pll1_bypass_sels[] = {"audio_pll1", "audio_pll1_ref_sel", };
 static const char * const audio_pll2_bypass_sels[] = {"audio_pll2", "audio_pll2_ref_sel", };
--

2.7.4

author
#37 lore raw

PATCH v2 13/17 clk: imx8mp: Add hdmi blk_ctrl clocks and resets

In reply to Abel Vesa

Add hdmi blk_ctrl clocks and resets in the i.MX8MP clock driver to be picked up by the clk-blk-ctrl driver.

---
 drivers/clk/imx/clk-blk-ctrl.c |  4 +++
 drivers/clk/imx/clk-imx8mp.c   | 63 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
drivers/clk/imx/clk-blk-ctrl.c +4 -0
index 1c2991c..43412ab 100644
@@ -316,6 +316,10 @@ static const struct of_device_id imx_blk_ctrl_of_match[] = {
 		.compatible = "fsl,imx8mp-audio-blk-ctrl",
 		.data = &imx8mp_audio_blk_ctrl_dev_data
 	},
+	{
+		.compatible = "fsl,imx8mp-hdmi-blk-ctrl",
+		.data = &imx8mp_hdmi_blk_ctrl_dev_data
+	},
 	{ /* Sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, imx_blk_ctrl_of_match);
drivers/clk/imx/clk-imx8mp.c +63 -0

75 lines not on this page · raw message

Signature · 1 line
2.7.4
author
#38 lore raw

PATCH v2 14/17 clk: imx8mp: Add media blk_ctrl clocks and resets

In reply to Abel Vesa

Add media blk_ctrl clocks and resets in the i.MX8MP clock driver to be picked up by the clk-blk-ctrl driver.

---
 drivers/clk/imx/clk-blk-ctrl.c |  4 +++
 drivers/clk/imx/clk-imx8mp.c   | 68 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)
drivers/clk/imx/clk-blk-ctrl.c +4 -0
index 43412ab..e0bcbbca 100644
@@ -317,6 +317,10 @@ static const struct of_device_id imx_blk_ctrl_of_match[] = {
 		.data = &imx8mp_audio_blk_ctrl_dev_data
 	},
 	{
+		.compatible = "fsl,imx8mp-media-blk-ctrl",
+		.data = &imx8mp_media_blk_ctrl_dev_data
+	},
+	{
 		.compatible = "fsl,imx8mp-hdmi-blk-ctrl",
 		.data = &imx8mp_hdmi_blk_ctrl_dev_data
 	},
drivers/clk/imx/clk-imx8mp.c +68 -0

80 lines not on this page · raw message

Signature · 1 line
2.7.4
author
#39 lore raw

PATCH v2 15/17 arm64: dts: imx8mp: Add audio_blk_ctrl node

In reply to Abel Vesa

Some of the features of the audio_ctrl will be used by some different drivers in a way those drivers will know best, so adding the syscon compatible we allow those to do just that. Only the resets and the clocks are registered bit the clk-blk-ctrl driver.

---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +16 -0
index daa1769..dede0ae 100644
@@ -736,6 +736,22 @@
 			};
 		};
 
+		aips5: bus@30c00000 {
+			compatible = "fsl,aips-bus", "simple-bus";
+			reg = <0x30c00000 0x400000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges;
+
+			audio_blk_ctrl: clock-controller@30e20000 {
+				compatible = "fsl,imx8mp-audio-blk-ctrl", "syscon";
+				reg = <0x30e20000 0x50C>;
+
+				#clock-cells = <1>;
+				#reset-cells = <1>;
+			};
+		};
+
 		gic: interrupt-controller@38800000 {
 			compatible = "arm,gic-v3";
 			reg = <0x38800000 0x10000>,
Signature · 1 line
2.7.4
Reviewed-by on v2 15/17
#40 lore raw

Re: [PATCH v2 15/17] arm64: dts: imx8mp: Add audio_blk_ctrl node

Quoted 19 lines · Abel Vesa

Some of the features of the audio_ctrl will be used by some different drivers in a way those drivers will know best, so adding the syscon compatible we allow those to do just that. Only the resets and the clocks are registered bit the clk-blk-ctrl driver.

---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
index daa1769..dede0ae 100644
@@ -736,6 +736,22 @@
                        };
                };
 

arch/arm64/boot/dts/freescale/imx8mp.dtsi line 748

Quoted 10 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +10 -0
+               aips5: bus@30c00000 {
+                       compatible = "fsl,aips-bus", "simple-bus";
+                       reg = <0x30c00000 0x400000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges;
+
+                       audio_blk_ctrl: clock-controller@30e20000 {
+                               compatible = "fsl,imx8mp-audio-blk-ctrl", "syscon";
+                               reg = <0x30e20000 0x50C>;

0x50c

arch/arm64/boot/dts/freescale/imx8mp.dtsi line 749

Quoted 1 line
arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -0
+

remove unnecessary blank line

Otherwise:

Regards
Aisheng

Quoted 11 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +5 -1
+                               #clock-cells = <1>;
+                               #reset-cells = <1>;
+                       };
+               };
+
                gic: interrupt-controller@38800000 {
                        compatible = "arm,gic-v3";
                        reg = <0x38800000 0x10000>,
--

2.7.4

author
#41 lore raw

Re: [PATCH v2 15/17] arm64: dts: imx8mp: Add audio_blk_ctrl node

Quoted 20 lines · Dong Aisheng
Quoted 19 lines · Abel Vesa

Some of the features of the audio_ctrl will be used by some different drivers in a way those drivers will know best, so adding the syscon compatible we allow those to do just that. Only the resets and the clocks are registered bit the clk-blk-ctrl driver.

---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
index daa1769..dede0ae 100644
@@ -736,6 +736,22 @@
                        };
                };
 
Quoted 13 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi line 748

Quoted 10 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +10 -0
+               aips5: bus@30c00000 {
+                       compatible = "fsl,aips-bus", "simple-bus";
+                       reg = <0x30c00000 0x400000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges;
+
+                       audio_blk_ctrl: clock-controller@30e20000 {
+                               compatible = "fsl,imx8mp-audio-blk-ctrl", "syscon";
+                               reg = <0x30e20000 0x50C>;

0x50c

Will do.

Quoted 4 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi line 749

Quoted 1 line
arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -0
+

remove unnecessary blank line

Will do.

Quoted 17 lines

Otherwise:

Regards
Aisheng

Quoted 11 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +5 -1
+                               #clock-cells = <1>;
+                               #reset-cells = <1>;
+                       };
+               };
+
                gic: interrupt-controller@38800000 {
                        compatible = "arm,gic-v3";
                        reg = <0x38800000 0x10000>,
--

2.7.4

author
#42 lore raw

PATCH v2 16/17 arm64: dts: imx8mp: Add media_blk_ctrl node

In reply to Abel Vesa

Some of the features of the media_ctrl will be used by some different drivers in a way those drivers will know best, so adding the syscon compatible we allow those to do just that. Only the resets and the clocks are registered bit the clk-blk-ctrl driver.

---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +16 -0
index dede0ae..2d6d213 100644
@@ -736,6 +736,22 @@
 			};
 		};
 
+		aips4: bus@32c00000 {
+			compatible = "simple-bus";
+			reg = <0x32c00000 0x400000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges;
+
+			media_blk_ctrl: clock-controller@32ec0000 {
+				compatible = "fsl,imx8mp-media-blk-ctrl", "syscon";
+				reg = <0x32ec0000 0x10000>;
+
+				#clock-cells = <1>;
+				#reset-cells = <1>;
+			};
+		};
+
 		aips5: bus@30c00000 {
 			compatible = "fsl,aips-bus", "simple-bus";
 			reg = <0x30c00000 0x400000>;
Signature · 1 line
2.7.4
Reviewed-by on v2 16/17
#43 lore raw

Re: [PATCH v2 16/17] arm64: dts: imx8mp: Add media_blk_ctrl node

Quoted 17 lines · Abel Vesa

Some of the features of the media_ctrl will be used by some different drivers in a way those drivers will know best, so adding the syscon compatible we allow those to do just that. Only the resets and the clocks are registered bit the clk-blk-ctrl driver.

---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
index dede0ae..2d6d213 100644
@@ -736,6 +736,22 @@
                        };

arch/arm64/boot/dts/freescale/imx8mp.dtsi line 746

Quoted 10 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +8 -0
                };
 
+               aips4: bus@32c00000 {
+                       compatible = "simple-bus";
+                       reg = <0x32c00000 0x400000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges;
+
+                       media_blk_ctrl: clock-controller@32ec0000 {

For this combo device, maybe we can directly name it as blk-ctrl@32ec0000. Rob, do you think if we can do that?

arch/arm64/boot/dts/freescale/imx8mp.dtsi line 749

Quoted 3 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +3 -0
+                               compatible = "fsl,imx8mp-media-blk-ctrl", "syscon";
+                               reg = <0x32ec0000 0x10000>;
+

Remove unnecessary blank line

Otherwise:

Regards
Aisheng

Quoted 11 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +5 -1
+                               #clock-cells = <1>;
+                               #reset-cells = <1>;
+                       };
+               };
+
                aips5: bus@30c00000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        reg = <0x30c00000 0x400000>;
--

2.7.4

author
#44 lore raw

Re: [PATCH v2 16/17] arm64: dts: imx8mp: Add media_blk_ctrl node

Quoted 20 lines · Dong Aisheng
Quoted 19 lines · Abel Vesa

Some of the features of the media_ctrl will be used by some different drivers in a way those drivers will know best, so adding the syscon compatible we allow those to do just that. Only the resets and the clocks are registered bit the clk-blk-ctrl driver.

---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
index dede0ae..2d6d213 100644
@@ -736,6 +736,22 @@
                        };
                };
 
Quoted 12 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi line 746

Quoted 8 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +8 -0
+               aips4: bus@32c00000 {
+                       compatible = "simple-bus";
+                       reg = <0x32c00000 0x400000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges;
+
+                       media_blk_ctrl: clock-controller@32ec0000 {

For this combo device, maybe we can directly name it as blk-ctrl@32ec0000. Rob, do you think if we can do that?

I think it was Stephen who suggested we change it to clock-controller in the last's version thread.

TBH, I agree with you here, since it makes more sense to be called blk-ctrl provided that this is not really just a clock controller.

Quoted 6 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi line 749

Quoted 3 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +3 -0
+                               compatible = "fsl,imx8mp-media-blk-ctrl", "syscon";
+                               reg = <0x32ec0000 0x10000>;
+

Remove unnecessary blank line

Will do.

Quoted 17 lines

Otherwise:

Regards
Aisheng

Quoted 11 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +5 -1
+                               #clock-cells = <1>;
+                               #reset-cells = <1>;
+                       };
+               };
+
                aips5: bus@30c00000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        reg = <0x30c00000 0x400000>;
--

2.7.4

#45 lore raw

Re: [PATCH v2 16/17] arm64: dts: imx8mp: Add media_blk_ctrl node

Hi Rob, Stephen,

Quoted 35 lines · Abel Vesa
Quoted 20 lines · Dong Aisheng
Quoted 19 lines · Abel Vesa

Some of the features of the media_ctrl will be used by some different drivers in a way those drivers will know best, so adding the syscon compatible we allow those to do just that. Only the resets and the clocks are registered bit the clk-blk-ctrl driver.

---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
index dede0ae..2d6d213 100644
@@ -736,6 +736,22 @@
                        };
                };
 
Quoted 12 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi line 746

Quoted 8 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +8 -0
+               aips4: bus@32c00000 {
+                       compatible = "simple-bus";
+                       reg = <0x32c00000 0x400000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges;
+
+                       media_blk_ctrl: clock-controller@32ec0000 {

For this combo device, maybe we can directly name it as blk-ctrl@32ec0000. Rob, do you think if we can do that?

Quoted 6 lines

I think it was Stephen who suggested we change it to clock-controller in the last's version thread.

TBH, I agree with you here, since it makes more sense to be called blk-ctrl provided that this is not really just a clock controller.

How do you think?

Regards
Aisheng

Quoted 26 lines
Quoted 6 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi line 749

Quoted 3 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +3 -0
+                               compatible = "fsl,imx8mp-media-blk-ctrl", "syscon";
+                               reg = <0x32ec0000 0x10000>;
+

Remove unnecessary blank line

Will do.

Quoted 17 lines

Otherwise:

Regards
Aisheng

Quoted 11 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +5 -1
+                               #clock-cells = <1>;
+                               #reset-cells = <1>;
+                       };
+               };
+
                aips5: bus@30c00000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        reg = <0x30c00000 0x400000>;
--

2.7.4

author
#46 lore raw

Re: [PATCH v2 16/17] arm64: dts: imx8mp: Add media_blk_ctrl node

Quoted 38 lines · Dong Aisheng

Hi Rob, Stephen,

Quoted 35 lines · Abel Vesa
Quoted 32 lines · Dong Aisheng
Quoted 17 lines · Abel Vesa

Some of the features of the media_ctrl will be used by some different drivers in a way those drivers will know best, so adding the syscon compatible we allow those to do just that. Only the resets and the clocks are registered bit the clk-blk-ctrl driver.

---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
index dede0ae..2d6d213 100644
@@ -736,6 +736,22 @@
                        };

arch/arm64/boot/dts/freescale/imx8mp.dtsi line 746

Quoted 10 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +8 -0
                };
 
+               aips4: bus@32c00000 {
+                       compatible = "simple-bus";
+                       reg = <0x32c00000 0x400000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges;
+
+                       media_blk_ctrl: clock-controller@32ec0000 {

For this combo device, maybe we can directly name it as blk-ctrl@32ec0000. Rob, do you think if we can do that?

Quoted 9 lines
Quoted 6 lines

I think it was Stephen who suggested we change it to clock-controller in the last's version thread.

TBH, I agree with you here, since it makes more sense to be called blk-ctrl provided that this is not really just a clock controller.

How do you think?

Stephen, can you give us an argument for leaving it as clock-controller ?

Quoted 29 lines

Regards
Aisheng

Quoted 26 lines
Quoted 6 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi line 749

Quoted 3 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +3 -0
+                               compatible = "fsl,imx8mp-media-blk-ctrl", "syscon";
+                               reg = <0x32ec0000 0x10000>;
+

Remove unnecessary blank line

Will do.

Quoted 17 lines

Otherwise:

Regards
Aisheng

Quoted 11 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +5 -1
+                               #clock-cells = <1>;
+                               #reset-cells = <1>;
+                       };
+               };
+
                aips5: bus@30c00000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        reg = <0x30c00000 0x400000>;
--

2.7.4

author
#47 lore raw

PATCH v2 17/17 arm64: dts: imx8mp: Add hdmi_blk_ctrl node

In reply to Abel Vesa

Some of the features of the hdmi_ctrl will be used by some different drivers in a way those drivers will know best, so adding the syscon compatible we allow those to do just that. Only the resets and the clocks are registered bit the clk-blk-ctrl driver.

---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +8 -0
index 2d6d213..5503edd 100644
@@ -750,6 +750,14 @@
 				#clock-cells = <1>;
 				#reset-cells = <1>;
 			};
+
+			hdmi_blk_ctrl: clock-controller@32fc0000 {
+				compatible = "fsl,imx8mp-hdmi-blk-ctrl", "syscon";
+				reg = <0x32fc0000 0x1000>;
+
+				#clock-cells = <1>;
+				#reset-cells = <1>;
+			};
 		};
 
 		aips5: bus@30c00000 {
Signature · 1 line
2.7.4