Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
63e95849
Commit
63e95849
authored
Jul 21, 2020
by
Stephen Boyd
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'clk-imx' into clk-next
* clk-imx: clk: imx: vf610: add CAAM clock clk: imx8mp: add mu root clk
parents
b396b3d2
22b1408b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
1 deletion
+4
-1
drivers/clk/imx/clk-imx8mp.c
drivers/clk/imx/clk-imx8mp.c
+1
-0
drivers/clk/imx/clk-vf610.c
drivers/clk/imx/clk-vf610.c
+1
-0
include/dt-bindings/clock/vf610-clock.h
include/dt-bindings/clock/vf610-clock.h
+2
-1
No files found.
drivers/clk/imx/clk-imx8mp.c
View file @
63e95849
...
@@ -680,6 +680,7 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)
...
@@ -680,6 +680,7 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)
hws
[
IMX8MP_CLK_I2C2_ROOT
]
=
imx_clk_hw_gate4
(
"i2c2_root_clk"
,
"i2c2"
,
ccm_base
+
0x4180
,
0
);
hws
[
IMX8MP_CLK_I2C2_ROOT
]
=
imx_clk_hw_gate4
(
"i2c2_root_clk"
,
"i2c2"
,
ccm_base
+
0x4180
,
0
);
hws
[
IMX8MP_CLK_I2C3_ROOT
]
=
imx_clk_hw_gate4
(
"i2c3_root_clk"
,
"i2c3"
,
ccm_base
+
0x4190
,
0
);
hws
[
IMX8MP_CLK_I2C3_ROOT
]
=
imx_clk_hw_gate4
(
"i2c3_root_clk"
,
"i2c3"
,
ccm_base
+
0x4190
,
0
);
hws
[
IMX8MP_CLK_I2C4_ROOT
]
=
imx_clk_hw_gate4
(
"i2c4_root_clk"
,
"i2c4"
,
ccm_base
+
0x41a0
,
0
);
hws
[
IMX8MP_CLK_I2C4_ROOT
]
=
imx_clk_hw_gate4
(
"i2c4_root_clk"
,
"i2c4"
,
ccm_base
+
0x41a0
,
0
);
hws
[
IMX8MP_CLK_MU_ROOT
]
=
imx_clk_hw_gate4
(
"mu_root_clk"
,
"ipg_root"
,
ccm_base
+
0x4210
,
0
);
hws
[
IMX8MP_CLK_OCOTP_ROOT
]
=
imx_clk_hw_gate4
(
"ocotp_root_clk"
,
"ipg_root"
,
ccm_base
+
0x4220
,
0
);
hws
[
IMX8MP_CLK_OCOTP_ROOT
]
=
imx_clk_hw_gate4
(
"ocotp_root_clk"
,
"ipg_root"
,
ccm_base
+
0x4220
,
0
);
hws
[
IMX8MP_CLK_PCIE_ROOT
]
=
imx_clk_hw_gate4
(
"pcie_root_clk"
,
"pcie_aux"
,
ccm_base
+
0x4250
,
0
);
hws
[
IMX8MP_CLK_PCIE_ROOT
]
=
imx_clk_hw_gate4
(
"pcie_root_clk"
,
"pcie_aux"
,
ccm_base
+
0x4250
,
0
);
hws
[
IMX8MP_CLK_PWM1_ROOT
]
=
imx_clk_hw_gate4
(
"pwm1_root_clk"
,
"pwm1"
,
ccm_base
+
0x4280
,
0
);
hws
[
IMX8MP_CLK_PWM1_ROOT
]
=
imx_clk_hw_gate4
(
"pwm1_root_clk"
,
"pwm1"
,
ccm_base
+
0x4280
,
0
);
...
...
drivers/clk/imx/clk-vf610.c
View file @
63e95849
...
@@ -438,6 +438,7 @@ static void __init vf610_clocks_init(struct device_node *ccm_node)
...
@@ -438,6 +438,7 @@ static void __init vf610_clocks_init(struct device_node *ccm_node)
clk
[
VF610_CLK_SNVS
]
=
imx_clk_gate2
(
"snvs-rtc"
,
"ipg_bus"
,
CCM_CCGR6
,
CCM_CCGRx_CGn
(
7
));
clk
[
VF610_CLK_SNVS
]
=
imx_clk_gate2
(
"snvs-rtc"
,
"ipg_bus"
,
CCM_CCGR6
,
CCM_CCGRx_CGn
(
7
));
clk
[
VF610_CLK_DAP
]
=
imx_clk_gate
(
"dap"
,
"platform_bus"
,
CCM_CCSR
,
24
);
clk
[
VF610_CLK_DAP
]
=
imx_clk_gate
(
"dap"
,
"platform_bus"
,
CCM_CCSR
,
24
);
clk
[
VF610_CLK_OCOTP
]
=
imx_clk_gate
(
"ocotp"
,
"ipg_bus"
,
CCM_CCGR6
,
CCM_CCGRx_CGn
(
5
));
clk
[
VF610_CLK_OCOTP
]
=
imx_clk_gate
(
"ocotp"
,
"ipg_bus"
,
CCM_CCGR6
,
CCM_CCGRx_CGn
(
5
));
clk
[
VF610_CLK_CAAM
]
=
imx_clk_gate2
(
"caam"
,
"ipg_bus"
,
CCM_CCGR11
,
CCM_CCGRx_CGn
(
0
));
imx_check_clocks
(
clk
,
ARRAY_SIZE
(
clk
));
imx_check_clocks
(
clk
,
ARRAY_SIZE
(
clk
));
...
...
include/dt-bindings/clock/vf610-clock.h
View file @
63e95849
...
@@ -195,6 +195,7 @@
...
@@ -195,6 +195,7 @@
#define VF610_CLK_WKPU 186
#define VF610_CLK_WKPU 186
#define VF610_CLK_TCON0 187
#define VF610_CLK_TCON0 187
#define VF610_CLK_TCON1 188
#define VF610_CLK_TCON1 188
#define VF610_CLK_END 189
#define VF610_CLK_CAAM 189
#define VF610_CLK_END 190
#endif
/* __DT_BINDINGS_CLOCK_VF610_H */
#endif
/* __DT_BINDINGS_CLOCK_VF610_H */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment