Skip to content

Commit 955d8f3

Browse files
olofjolofj
committed
Merge tag 'omap-for-v5.6/ti-sysc-drop-pdata-crypto-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/late
Late changes for omap secure accelerators for v5.6 merge window A series of changes to configure secure accelerators for omap4 & 5 to finally get hardware random number generator working. Apologies on a late pull request on these changes, but this pull request could not be sent out earlier because of a dependency to recent clock changes. This is based on earlier changes to drop omap legacy platform data with Tero Kristo's for-5.6-ti-clk branch merged in. * tag 'omap-for-v5.6/ti-sysc-drop-pdata-crypto-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (98 commits) ARM: OMAP2+: Drop legacy platform data for omap4 des ARM: OMAP2+: Drop legacy platform data for omap4 sham ARM: OMAP2+: Drop legacy platform data for omap4 aes ARM: dts: Configure interconnect target module for omap4 des ARM: dts: Configure interconnect target module for omap4 aes ARM: dts: Configure interconnect target module for omap4 sham ARM: dts: Configure omap5 rng to probe with ti-sysc ARM: dts: Configure omap4 rng to probe with ti-sysc ARM: dts: Add missing omap5 secure clocks ARM: dts: Add missing omap4 secure clocks clk: ti: clkctrl: Fix hidden dependency to node name clk: ti: add clkctrl data dra7 sgx clk: ti: omap5: Add missing AESS clock clk: ti: dra7: fix parent for gmac_clkctrl clk: ti: dra7: add vpe clkctrl data clk: ti: dra7: add cam clkctrl data dt-bindings: clock: Move ti-dra7-atl.h to dt-bindings/clock dmaengine: ti: omap-dma: don't allow a null od->plat pointer to be dereferenced ARM: OMAP2+: Drop legacy platform data for sdma ARM: OMAP2+: Drop legacy init for sdma ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Olof Johansson <[email protected]>
2 parents d1eef1c + 885d21e commit 955d8f3

Some content is hidden

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

68 files changed

+1383
-5226
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/am335x-sancloud-bbe.dts

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

109109
&cpsw_emac0 {
110110
phy-handle = <&ethphy0>;
111-
phy-mode = "rgmii-txid";
111+
phy-mode = "rgmii-id";
112112
};
113113

114114
&i2c0 {

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@
225225

226226
target-module@d000 { /* 0x44e0d000, ap 20 38.0 */
227227
compatible = "ti,sysc-omap4", "ti,sysc";
228-
ti,hwmods = "adc_tsc";
229228
reg = <0xd000 0x4>,
230229
<0xd010 0x4>;
231230
reg-names = "rev", "sysc";
@@ -1009,7 +1008,6 @@
10091008

10101009
target-module@30000 { /* 0x48030000, ap 77 08.0 */
10111010
compatible = "ti,sysc-omap2", "ti,sysc";
1012-
ti,hwmods = "spi0";
10131011
reg = <0x30000 0x4>,
10141012
<0x30110 0x4>,
10151013
<0x30114 0x4>;
@@ -1134,7 +1132,6 @@
11341132

11351133
target-module@42000 { /* 0x48042000, ap 24 1c.0 */
11361134
compatible = "ti,sysc-omap4-timer", "ti,sysc";
1137-
ti,hwmods = "timer3";
11381135
reg = <0x42000 0x4>,
11391136
<0x42010 0x4>,
11401137
<0x42014 0x4>;
@@ -1160,7 +1157,6 @@
11601157

11611158
target-module@44000 { /* 0x48044000, ap 26 26.0 */
11621159
compatible = "ti,sysc-omap4-timer", "ti,sysc";
1163-
ti,hwmods = "timer4";
11641160
reg = <0x44000 0x4>,
11651161
<0x44010 0x4>,
11661162
<0x44014 0x4>;
@@ -1187,7 +1183,6 @@
11871183

11881184
target-module@46000 { /* 0x48046000, ap 28 28.0 */
11891185
compatible = "ti,sysc-omap4-timer", "ti,sysc";
1190-
ti,hwmods = "timer5";
11911186
reg = <0x46000 0x4>,
11921187
<0x46010 0x4>,
11931188
<0x46014 0x4>;
@@ -1214,7 +1209,6 @@
12141209

12151210
target-module@48000 { /* 0x48048000, ap 30 22.0 */
12161211
compatible = "ti,sysc-omap4-timer", "ti,sysc";
1217-
ti,hwmods = "timer6";
12181212
reg = <0x48000 0x4>,
12191213
<0x48010 0x4>,
12201214
<0x48014 0x4>;
@@ -1241,7 +1235,6 @@
12411235

12421236
target-module@4a000 { /* 0x4804a000, ap 85 60.0 */
12431237
compatible = "ti,sysc-omap4-timer", "ti,sysc";
1244-
ti,hwmods = "timer7";
12451238
reg = <0x4a000 0x4>,
12461239
<0x4a010 0x4>,
12471240
<0x4a014 0x4>;
@@ -1344,7 +1337,6 @@
13441337

13451338
target-module@80000 { /* 0x48080000, ap 38 18.0 */
13461339
compatible = "ti,sysc-omap2", "ti,sysc";
1347-
ti,hwmods = "elm";
13481340
reg = <0x80000 0x4>,
13491341
<0x80010 0x4>,
13501342
<0x80014 0x4>;
@@ -1412,7 +1404,6 @@
14121404

14131405
target-module@ca000 { /* 0x480ca000, ap 91 40.0 */
14141406
compatible = "ti,sysc-omap2", "ti,sysc";
1415-
ti,hwmods = "spinlock";
14161407
reg = <0xca000 0x4>,
14171408
<0xca010 0x4>,
14181409
<0xca014 0x4>;
@@ -1533,7 +1524,6 @@
15331524

15341525
target-module@a0000 { /* 0x481a0000, ap 79 24.0 */
15351526
compatible = "ti,sysc-omap2", "ti,sysc";
1536-
ti,hwmods = "spi1";
15371527
reg = <0xa0000 0x4>,
15381528
<0xa0110 0x4>,
15391529
<0xa0114 0x4>;
@@ -1749,7 +1739,6 @@
17491739
compatible = "ti,sysc-omap4", "ti,sysc";
17501740
reg = <0xcc020 0x4>;
17511741
reg-names = "rev";
1752-
ti,hwmods = "d_can0";
17531742
/* Domains (P, C): per_pwrdm, l4ls_clkdm */
17541743
clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0>,
17551744
<&dcan0_fck>;
@@ -1773,7 +1762,6 @@
17731762
compatible = "ti,sysc-omap4", "ti,sysc";
17741763
reg = <0xd0020 0x4>;
17751764
reg-names = "rev";
1776-
ti,hwmods = "d_can1";
17771765
/* Domains (P, C): per_pwrdm, l4ls_clkdm */
17781766
clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0>,
17791767
<&dcan1_fck>;
@@ -1863,7 +1851,6 @@
18631851

18641852
target-module@0 { /* 0x48300000, ap 66 48.0 */
18651853
compatible = "ti,sysc-omap4", "ti,sysc";
1866-
ti,hwmods = "epwmss0";
18671854
reg = <0x0 0x4>,
18681855
<0x4 0x4>;
18691856
reg-names = "rev", "sysc";
@@ -1916,7 +1903,6 @@
19161903

19171904
target-module@2000 { /* 0x48302000, ap 68 52.0 */
19181905
compatible = "ti,sysc-omap4", "ti,sysc";
1919-
ti,hwmods = "epwmss1";
19201906
reg = <0x2000 0x4>,
19211907
<0x2004 0x4>;
19221908
reg-names = "rev", "sysc";
@@ -1969,7 +1955,6 @@
19691955

19701956
target-module@4000 { /* 0x48304000, ap 70 44.0 */
19711957
compatible = "ti,sysc-omap4", "ti,sysc";
1972-
ti,hwmods = "epwmss2";
19731958
reg = <0x4000 0x4>,
19741959
<0x4004 0x4>;
19751960
reg-names = "rev", "sysc";
@@ -2022,7 +2007,6 @@
20222007

20232008
target-module@e000 { /* 0x4830e000, ap 72 4a.0 */
20242009
compatible = "ti,sysc-omap4", "ti,sysc";
2025-
ti,hwmods = "lcdc";
20262010
reg = <0xe000 0x4>,
20272011
<0xe054 0x4>;
20282012
reg-names = "rev", "sysc";

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

Lines changed: 54 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -439,23 +439,62 @@
439439
status = "disabled";
440440
};
441441

442-
sham: sham@53100000 {
443-
compatible = "ti,omap4-sham";
444-
ti,hwmods = "sham";
445-
reg = <0x53100000 0x200>;
446-
interrupts = <109>;
447-
dmas = <&edma 36 0>;
448-
dma-names = "rx";
442+
sham_target: target-module@53100000 {
443+
compatible = "ti,sysc-omap3-sham", "ti,sysc";
444+
reg = <0x53100100 0x4>,
445+
<0x53100110 0x4>,
446+
<0x53100114 0x4>;
447+
reg-names = "rev", "sysc", "syss";
448+
ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET |
449+
SYSC_OMAP2_AUTOIDLE)>;
450+
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
451+
<SYSC_IDLE_NO>,
452+
<SYSC_IDLE_SMART>;
453+
ti,syss-mask = <1>;
454+
/* Domains (P, C): per_pwrdm, l3_clkdm */
455+
clocks = <&l3_clkctrl AM3_L3_SHAM_CLKCTRL 0>;
456+
clock-names = "fck";
457+
#address-cells = <1>;
458+
#size-cells = <1>;
459+
ranges = <0x0 0x53100000 0x1000>;
460+
461+
sham: sham@0 {
462+
compatible = "ti,omap4-sham";
463+
reg = <0 0x200>;
464+
interrupts = <109>;
465+
dmas = <&edma 36 0>;
466+
dma-names = "rx";
467+
};
449468
};
450469

451-
aes: aes@53500000 {
452-
compatible = "ti,omap4-aes";
453-
ti,hwmods = "aes";
454-
reg = <0x53500000 0xa0>;
455-
interrupts = <103>;
456-
dmas = <&edma 6 0>,
457-
<&edma 5 0>;
458-
dma-names = "tx", "rx";
470+
aes_target: target-module@53500000 {
471+
compatible = "ti,sysc-omap2", "ti,sysc";
472+
reg = <0x53500080 0x4>,
473+
<0x53500084 0x4>,
474+
<0x53500088 0x4>;
475+
reg-names = "rev", "sysc", "syss";
476+
ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET |
477+
SYSC_OMAP2_AUTOIDLE)>;
478+
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
479+
<SYSC_IDLE_NO>,
480+
<SYSC_IDLE_SMART>,
481+
<SYSC_IDLE_SMART_WKUP>;
482+
ti,syss-mask = <1>;
483+
/* Domains (P, C): per_pwrdm, l3_clkdm */
484+
clocks = <&l3_clkctrl AM3_L3_AES_CLKCTRL 0>;
485+
clock-names = "fck";
486+
#address-cells = <1>;
487+
#size-cells = <1>;
488+
ranges = <0x0 0x53500000 0x1000>;
489+
490+
aes: aes@0 {
491+
compatible = "ti,omap4-aes";
492+
reg = <0 0xa0>;
493+
interrupts = <103>;
494+
dmas = <&edma 6 0>,
495+
<&edma 5 0>;
496+
dma-names = "tx", "rx";
497+
};
459498
};
460499
};
461500
};

0 commit comments

Comments
 (0)