Skip to content

Commit 0b2ecf4

Browse files
author
Shawn Guo
committed
Merge tag 'imx-soc-3.17' into imx/dt
The i.MX SoC changes for 3.17: - Add devicetree support for i.MX1 and i.MX21 clock driver - Use CLOCKSOURCE_OF_DECLARE() to initialize timer for DT targets - Use of_clk_init() to initialize i.MX25 and i.MX27 clock driver in device tree boot - Remove i.MX1 camera support - Remove i.MX27 IP Camera and Lite-Kit board support - Add suspend and cpuidle support for i.mx6sx - Clean up unused clk_register_clkdev() lookups - Update imx-weim bus driver to support populating devices on a simple bus - Switch i.MX27 and i.MX6QDL clock driver to use macro for clock IDs - Make i.MX51 a DT only platform and clean up the non-DT support code - Support disabling supervisor protect via DT - Random defconfig updates
2 parents 4c83445 + 4349c42 commit 0b2ecf4

File tree

109 files changed

+1806
-4664
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+1806
-4664
lines changed
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
* Clock bindings for Freescale i.MX1 CPUs
2+
3+
Required properties:
4+
- compatible: Should be "fsl,imx1-ccm".
5+
- reg: Address and length of the register set.
6+
- #clock-cells: Should be <1>.
7+
8+
The clock consumer should specify the desired clock by having the clock
9+
ID in its "clocks" phandle cell. See include/dt-bindings/clock/imx1-clock.h
10+
for the full list of i.MX1 clock IDs.
11+
12+
Examples:
13+
clks: ccm@0021b000 {
14+
#clock-cells = <1>;
15+
compatible = "fsl,imx1-ccm";
16+
reg = <0x0021b000 0x1000>;
17+
};
18+
19+
pwm: pwm@00208000 {
20+
#pwm-cells = <2>;
21+
compatible = "fsl,imx1-pwm";
22+
reg = <0x00208000 0x1000>;
23+
interrupts = <34>;
24+
clocks = <&clks IMX1_CLK_DUMMY>, <&clks IMX1_CLK_PER1>;
25+
clock-names = "ipg", "per";
26+
};
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
* Clock bindings for Freescale i.MX21
2+
3+
Required properties:
4+
- compatible : Should be "fsl,imx21-ccm".
5+
- reg : Address and length of the register set.
6+
- interrupts : Should contain CCM interrupt.
7+
- #clock-cells: Should be <1>.
8+
9+
The clock consumer should specify the desired clock by having the clock
10+
ID in its "clocks" phandle cell. See include/dt-bindings/clock/imx21-clock.h
11+
for the full list of i.MX21 clock IDs.
12+
13+
Examples:
14+
clks: ccm@10027000{
15+
compatible = "fsl,imx21-ccm";
16+
reg = <0x10027000 0x800>;
17+
#clock-cells = <1>;
18+
};
19+
20+
uart1: serial@1000a000 {
21+
compatible = "fsl,imx21-uart";
22+
reg = <0x1000a000 0x1000>;
23+
interrupts = <20>;
24+
clocks = <&clks IMX21_CLK_UART1_IPG_GATE>,
25+
<&clks IMX21_CLK_PER1>;
26+
clock-names = "ipg", "per";
27+
status = "disabled";
28+
};

Documentation/devicetree/bindings/clock/imx27-clock.txt

Lines changed: 16 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -7,117 +7,22 @@ Required properties:
77
- #clock-cells: Should be <1>
88

99
The clock consumer should specify the desired clock by having the clock
10-
ID in its "clocks" phandle cell. The following is a full list of i.MX27
11-
clocks and IDs.
12-
13-
Clock ID
14-
-----------------------
15-
dummy 0
16-
ckih 1
17-
ckil 2
18-
mpll 3
19-
spll 4
20-
mpll_main2 5
21-
ahb 6
22-
ipg 7
23-
nfc_div 8
24-
per1_div 9
25-
per2_div 10
26-
per3_div 11
27-
per4_div 12
28-
vpu_sel 13
29-
vpu_div 14
30-
usb_div 15
31-
cpu_sel 16
32-
clko_sel 17
33-
cpu_div 18
34-
clko_div 19
35-
ssi1_sel 20
36-
ssi2_sel 21
37-
ssi1_div 22
38-
ssi2_div 23
39-
clko_en 24
40-
ssi2_ipg_gate 25
41-
ssi1_ipg_gate 26
42-
slcdc_ipg_gate 27
43-
sdhc3_ipg_gate 28
44-
sdhc2_ipg_gate 29
45-
sdhc1_ipg_gate 30
46-
scc_ipg_gate 31
47-
sahara_ipg_gate 32
48-
rtc_ipg_gate 33
49-
pwm_ipg_gate 34
50-
owire_ipg_gate 35
51-
lcdc_ipg_gate 36
52-
kpp_ipg_gate 37
53-
iim_ipg_gate 38
54-
i2c2_ipg_gate 39
55-
i2c1_ipg_gate 40
56-
gpt6_ipg_gate 41
57-
gpt5_ipg_gate 42
58-
gpt4_ipg_gate 43
59-
gpt3_ipg_gate 44
60-
gpt2_ipg_gate 45
61-
gpt1_ipg_gate 46
62-
gpio_ipg_gate 47
63-
fec_ipg_gate 48
64-
emma_ipg_gate 49
65-
dma_ipg_gate 50
66-
cspi3_ipg_gate 51
67-
cspi2_ipg_gate 52
68-
cspi1_ipg_gate 53
69-
nfc_baud_gate 54
70-
ssi2_baud_gate 55
71-
ssi1_baud_gate 56
72-
vpu_baud_gate 57
73-
per4_gate 58
74-
per3_gate 59
75-
per2_gate 60
76-
per1_gate 61
77-
usb_ahb_gate 62
78-
slcdc_ahb_gate 63
79-
sahara_ahb_gate 64
80-
lcdc_ahb_gate 65
81-
vpu_ahb_gate 66
82-
fec_ahb_gate 67
83-
emma_ahb_gate 68
84-
emi_ahb_gate 69
85-
dma_ahb_gate 70
86-
csi_ahb_gate 71
87-
brom_ahb_gate 72
88-
ata_ahb_gate 73
89-
wdog_ipg_gate 74
90-
usb_ipg_gate 75
91-
uart6_ipg_gate 76
92-
uart5_ipg_gate 77
93-
uart4_ipg_gate 78
94-
uart3_ipg_gate 79
95-
uart2_ipg_gate 80
96-
uart1_ipg_gate 81
97-
ckih_div1p5 82
98-
fpm 83
99-
mpll_osc_sel 84
100-
mpll_sel 85
101-
spll_gate 86
102-
mshc_div 87
103-
rtic_ipg_gate 88
104-
mshc_ipg_gate 89
105-
rtic_ahb_gate 90
106-
mshc_baud_gate 91
10+
ID in its "clocks" phandle cell. See include/dt-bindings/clock/imx27-clock.h
11+
for the full list of i.MX27 clock IDs.
10712

10813
Examples:
14+
clks: ccm@10027000{
15+
compatible = "fsl,imx27-ccm";
16+
reg = <0x10027000 0x1000>;
17+
#clock-cells = <1>;
18+
};
10919

110-
clks: ccm@10027000{
111-
compatible = "fsl,imx27-ccm";
112-
reg = <0x10027000 0x1000>;
113-
#clock-cells = <1>;
114-
};
115-
116-
uart1: serial@1000a000 {
117-
compatible = "fsl,imx27-uart", "fsl,imx21-uart";
118-
reg = <0x1000a000 0x1000>;
119-
interrupts = <20>;
120-
clocks = <&clks 81>, <&clks 61>;
121-
clock-names = "ipg", "per";
122-
status = "disabled";
123-
};
20+
uart1: serial@1000a000 {
21+
compatible = "fsl,imx27-uart", "fsl,imx21-uart";
22+
reg = <0x1000a000 0x1000>;
23+
interrupts = <20>;
24+
clocks = <&clks IMX27_CLK_UART1_IPG_GATE>,
25+
<&clks IMX27_CLK_PER1_GATE>;
26+
clock-names = "ipg", "per";
27+
status = "disabled";
28+
};

0 commit comments

Comments
 (0)