Skip to content

Commit 885d21e

Browse files
tmlindtmlind
committed
Merge branch 'omap-for-v5.6/ti-sysc-omap45-rng' into omap-for-v5.6/ti-sysc-drop-pdata
2 parents a25e29b + ddf664d commit 885d21e

File tree

21 files changed

+426
-196
lines changed

21 files changed

+426
-196
lines changed

‎Documentation/devicetree/bindings/clock/ti-clkctrl.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,23 @@ For more information, please see the Linux clock framework binding at
1616
Documentation/devicetree/bindings/clock/clock-bindings.txt.
1717

1818
Required properties :
19-
- compatible : shall be "ti,clkctrl"
19+
- compatible : shall be "ti,clkctrl" or a clock domain specific name:
20+
"ti,clkctrl-l4-cfg"
21+
"ti,clkctrl-l4-per"
22+
"ti,clkctrl-l4-secure"
23+
"ti,clkctrl-l4-wkup"
2024
- #clock-cells : shall contain 2 with the first entry being the instance
2125
offset from the clock domain base and the second being the
2226
clock index
27+
- reg : clock registers
2328

2429
Example: Clock controller node on omap 4430:
2530

2631
&cm2 {
2732
l4per: cm@1400 {
2833
cm_l4per@0 {
29-
cm_l4per_clkctrl: clk@20 {
30-
compatible = "ti,clkctrl";
34+
cm_l4per_clkctrl: clock@20 {
35+
compatible = "ti,clkctrl-l4-per", "ti,clkctrl";
3136
reg = <0x20 0x1b0>;
3237
#clock-cells = <2>;
3338
};

‎Documentation/devicetree/bindings/clock/ti/dra7-atl.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Configuration of ATL instances:
4343
- aws : Audio word select signal selection
4444
};
4545

46-
For valid word select signals, see the dt-bindings/clk/ti-dra7-atl.h include
46+
For valid word select signals, see the dt-bindings/clock/ti-dra7-atl.h include
4747
file.
4848

4949
Examples:
@@ -83,7 +83,7 @@ atl: atl@4843c000 {
8383
clock-names = "fck";
8484
};
8585

86-
#include <dt-bindings/clk/ti-dra7-atl.h>
86+
#include <dt-bindings/clock/ti-dra7-atl.h>
8787

8888
&atl {
8989

‎arch/arm/boot/dts/dra7-evm-common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
#include <dt-bindings/gpio/gpio.h>
7-
#include <dt-bindings/clk/ti-dra7-atl.h>
7+
#include <dt-bindings/clock/ti-dra7-atl.h>
88
#include <dt-bindings/input/input.h>
99

1010
/ {

‎arch/arm/boot/dts/dra72-evm-common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "dra72x.dtsi"
88
#include <dt-bindings/gpio/gpio.h>
9-
#include <dt-bindings/clk/ti-dra7-atl.h>
9+
#include <dt-bindings/clock/ti-dra7-atl.h>
1010

1111
/ {
1212
compatible = "ti,dra72-evm", "ti,dra722", "ti,dra72", "ti,dra7";

‎arch/arm/boot/dts/dra7xx-clocks.dtsi

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1734,6 +1734,20 @@
17341734
};
17351735
};
17361736

1737+
gpu_cm: gpu-cm@1200 {
1738+
compatible = "ti,omap4-cm";
1739+
reg = <0x1200 0x100>;
1740+
#address-cells = <1>;
1741+
#size-cells = <1>;
1742+
ranges = <0 0x1200 0x100>;
1743+
1744+
gpu_clkctrl: gpu-clkctrl@20 {
1745+
compatible = "ti,clkctrl";
1746+
reg = <0x20 0x4>;
1747+
#clock-cells = <2>;
1748+
};
1749+
};
1750+
17371751
l3init_cm: l3init-cm@1300 {
17381752
compatible = "ti,omap4-cm";
17391753
reg = <0x1300 0x100>;

‎arch/arm/boot/dts/motorola-mapphone-common.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,11 @@
650650
};
651651
};
652652

653+
/* RNG is used by secure mode and not accessible */
654+
&rng_target {
655+
status = "disabled";
656+
};
657+
653658
/* Configure pwm clock source for timers 8 & 9 */
654659
&timer8 {
655660
assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>;

‎arch/arm/boot/dts/omap4-l4.dtsi

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1990,12 +1990,26 @@
19901990
};
19911991
};
19921992

1993-
target-module@90000 { /* 0x48090000, ap 57 2a.0 */
1994-
compatible = "ti,sysc";
1995-
status = "disabled";
1993+
rng_target: target-module@90000 { /* 0x48090000, ap 57 2a.0 */
1994+
compatible = "ti,sysc-omap2", "ti,sysc";
1995+
reg = <0x91fe0 0x4>,
1996+
<0x91fe4 0x4>;
1997+
reg-names = "rev", "sysc";
1998+
ti,sysc-mask = <(SYSC_OMAP2_AUTOIDLE)>;
1999+
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
2000+
<SYSC_IDLE_NO>;
2001+
/* Domains (P, C): l4per_pwrdm, l4_secure_clkdm */
2002+
clocks = <&l4_secure_clkctrl OMAP4_RNG_CLKCTRL 0>;
2003+
clock-names = "fck";
19962004
#address-cells = <1>;
19972005
#size-cells = <1>;
19982006
ranges = <0x0 0x90000 0x2000>;
2007+
2008+
rng: rng@0 {
2009+
compatible = "ti,omap4-rng";
2010+
reg = <0x0 0x2000>;
2011+
interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
2012+
};
19992013
};
20002014

20012015
target-module@96000 { /* 0x48096000, ap 37 26.0 */
@@ -2159,6 +2173,35 @@
21592173
<0x00001000 0x000a5000 0x00001000>;
21602174
};
21612175

2176+
des_target: target-module@a5000 { /* 0x480a5000 */
2177+
compatible = "ti,sysc-omap2", "ti,sysc";
2178+
reg = <0xa5030 0x4>,
2179+
<0xa5034 0x4>,
2180+
<0xa5038 0x4>;
2181+
reg-names = "rev", "sysc", "syss";
2182+
ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET |
2183+
SYSC_OMAP2_AUTOIDLE)>;
2184+
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
2185+
<SYSC_IDLE_NO>,
2186+
<SYSC_IDLE_SMART>,
2187+
<SYSC_IDLE_SMART_WKUP>;
2188+
ti,syss-mask = <1>;
2189+
/* Domains (P, C): l4per_pwrdm, l4_secure_clkdm */
2190+
clocks = <&l4_secure_clkctrl OMAP4_DES3DES_CLKCTRL 0>;
2191+
clock-names = "fck";
2192+
#address-cells = <1>;
2193+
#size-cells = <1>;
2194+
ranges = <0 0xa5000 0x00001000>;
2195+
2196+
des: des@0 {
2197+
compatible = "ti,omap4-des";
2198+
reg = <0 0xa0>;
2199+
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
2200+
dmas = <&sdma 117>, <&sdma 116>;
2201+
dma-names = "tx", "rx";
2202+
};
2203+
};
2204+
21622205
target-module@a8000 { /* 0x480a8000, ap 61 3e.0 */
21632206
compatible = "ti,sysc";
21642207
status = "disabled";

‎arch/arm/boot/dts/omap4.dtsi

Lines changed: 80 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -278,40 +278,90 @@
278278
hw-caps-temp-alert;
279279
};
280280

281-
aes1: aes@4b501000 {
282-
compatible = "ti,omap4-aes";
283-
ti,hwmods = "aes1";
284-
reg = <0x4b501000 0xa0>;
285-
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
286-
dmas = <&sdma 111>, <&sdma 110>;
287-
dma-names = "tx", "rx";
288-
};
289-
290-
aes2: aes@4b701000 {
291-
compatible = "ti,omap4-aes";
292-
ti,hwmods = "aes2";
293-
reg = <0x4b701000 0xa0>;
294-
interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
295-
dmas = <&sdma 114>, <&sdma 113>;
296-
dma-names = "tx", "rx";
281+
aes1_target: target-module@4b501000 {
282+
compatible = "ti,sysc-omap2", "ti,sysc";
283+
reg = <0x4b501080 0x4>,
284+
<0x4b501084 0x4>,
285+
<0x4b501088 0x4>;
286+
reg-names = "rev", "sysc", "syss";
287+
ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET |
288+
SYSC_OMAP2_AUTOIDLE)>;
289+
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
290+
<SYSC_IDLE_NO>,
291+
<SYSC_IDLE_SMART>,
292+
<SYSC_IDLE_SMART_WKUP>;
293+
ti,syss-mask = <1>;
294+
/* Domains (P, C): l4per_pwrdm, l4_secure_clkdm */
295+
clocks = <&l4_secure_clkctrl OMAP4_AES1_CLKCTRL 0>;
296+
clock-names = "fck";
297+
#address-cells = <1>;
298+
#size-cells = <1>;
299+
ranges = <0x0 0x4b501000 0x1000>;
300+
301+
aes1: aes@0 {
302+
compatible = "ti,omap4-aes";
303+
reg = <0 0xa0>;
304+
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
305+
dmas = <&sdma 111>, <&sdma 110>;
306+
dma-names = "tx", "rx";
307+
};
297308
};
298309

299-
des: des@480a5000 {
300-
compatible = "ti,omap4-des";
301-
ti,hwmods = "des";
302-
reg = <0x480a5000 0xa0>;
303-
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
304-
dmas = <&sdma 117>, <&sdma 116>;
305-
dma-names = "tx", "rx";
310+
aes2_target: target-module@4b701000 {
311+
compatible = "ti,sysc-omap2", "ti,sysc";
312+
reg = <0x4b701080 0x4>,
313+
<0x4b701084 0x4>,
314+
<0x4b701088 0x4>;
315+
reg-names = "rev", "sysc", "syss";
316+
ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET |
317+
SYSC_OMAP2_AUTOIDLE)>;
318+
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
319+
<SYSC_IDLE_NO>,
320+
<SYSC_IDLE_SMART>,
321+
<SYSC_IDLE_SMART_WKUP>;
322+
ti,syss-mask = <1>;
323+
/* Domains (P, C): l4per_pwrdm, l4_secure_clkdm */
324+
clocks = <&l4_secure_clkctrl OMAP4_AES2_CLKCTRL 0>;
325+
clock-names = "fck";
326+
#address-cells = <1>;
327+
#size-cells = <1>;
328+
ranges = <0x0 0x4b701000 0x1000>;
329+
330+
aes2: aes@0 {
331+
compatible = "ti,omap4-aes";
332+
reg = <0 0xa0>;
333+
interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
334+
dmas = <&sdma 114>, <&sdma 113>;
335+
dma-names = "tx", "rx";
336+
};
306337
};
307338

308-
sham: sham@4b100000 {
309-
compatible = "ti,omap4-sham";
310-
ti,hwmods = "sham";
311-
reg = <0x4b100000 0x300>;
312-
interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
313-
dmas = <&sdma 119>;
314-
dma-names = "rx";
339+
sham_target: target-module@4b100000 {
340+
compatible = "ti,sysc-omap3-sham", "ti,sysc";
341+
reg = <0x4b100100 0x4>,
342+
<0x4b100110 0x4>,
343+
<0x4b100114 0x4>;
344+
reg-names = "rev", "sysc", "syss";
345+
ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET |
346+
SYSC_OMAP2_AUTOIDLE)>;
347+
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
348+
<SYSC_IDLE_NO>,
349+
<SYSC_IDLE_SMART>;
350+
ti,syss-mask = <1>;
351+
/* Domains (P, C): l4per_pwrdm, l4_secure_clkdm */
352+
clocks = <&l4_secure_clkctrl OMAP4_SHA2MD5_CLKCTRL 0>;
353+
clock-names = "fck";
354+
#address-cells = <1>;
355+
#size-cells = <1>;
356+
ranges = <0x0 0x4b100000 0x1000>;
357+
358+
sham: sham@0 {
359+
compatible = "ti,omap4-sham";
360+
reg = <0 0x300>;
361+
interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
362+
dmas = <&sdma 119>;
363+
dma-names = "rx";
364+
};
315365
};
316366

317367
abb_mpu: regulator-abb-mpu {

‎arch/arm/boot/dts/omap44xx-clocks.dtsi

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,13 +1279,18 @@
12791279
#size-cells = <1>;
12801280
ranges = <0 0x1400 0x200>;
12811281

1282-
l4_per_clkctrl: clk@20 {
1283-
compatible = "ti,clkctrl";
1282+
l4_per_clkctrl: clock@20 {
1283+
compatible = "ti,clkctrl-l4-per", "ti,clkctrl";
12841284
reg = <0x20 0x144>;
12851285
#clock-cells = <2>;
12861286
};
1287-
};
12881287

1288+
l4_secure_clkctrl: clock@1a0 {
1289+
compatible = "ti,clkctrl-l4-secure", "ti,clkctrl";
1290+
reg = <0x1a0 0x3c>;
1291+
#clock-cells = <2>;
1292+
};
1293+
};
12891294
};
12901295

12911296
&prm {

‎arch/arm/boot/dts/omap5-l4.dtsi

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1764,12 +1764,26 @@
17641764
};
17651765
};
17661766

1767-
target-module@90000 { /* 0x48090000, ap 55 1a.0 */
1768-
compatible = "ti,sysc";
1769-
status = "disabled";
1767+
rng_target: target-module@90000 { /* 0x48090000, ap 55 1a.0 */
1768+
compatible = "ti,sysc-omap2", "ti,sysc";
1769+
reg = <0x91fe0 0x4>,
1770+
<0x91fe4 0x4>;
1771+
reg-names = "rev", "sysc";
1772+
ti,sysc-mask = <(SYSC_OMAP2_AUTOIDLE)>;
1773+
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
1774+
<SYSC_IDLE_NO>;
1775+
/* Domains (P, C): l4per_pwrdm, l4sec_clkdm */
1776+
clocks = <&l4sec_clkctrl OMAP5_RNG_CLKCTRL 0>;
1777+
clock-names = "fck";
17701778
#address-cells = <1>;
17711779
#size-cells = <1>;
17721780
ranges = <0x0 0x90000 0x2000>;
1781+
1782+
rng: rng@0 {
1783+
compatible = "ti,omap4-rng";
1784+
reg = <0x0 0x2000>;
1785+
interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
1786+
};
17731787
};
17741788

17751789
target-module@98000 { /* 0x48098000, ap 47 08.0 */

0 commit comments

Comments
 (0)