Skip to content

Commit f09de60

Browse files
tmlindtmlind
committed
Merge branch 'omap-for-v4.15/fixes-dt' into omap-for-v4.15/ti-sysc
2 parents 10e998f + 160ec89 commit f09de60

File tree

10 files changed

+447
-16
lines changed

10 files changed

+447
-16
lines changed

‎Documentation/devicetree/bindings/arm/omap/ctrl.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ Required properties:
2121
"ti,omap3-scm"
2222
"ti,omap4-scm-core"
2323
"ti,omap4-scm-padconf-core"
24+
"ti,omap4-scm-wkup"
25+
"ti,omap4-scm-padconf-wkup"
2426
"ti,omap5-scm-core"
2527
"ti,omap5-scm-padconf-core"
2628
"ti,dra7-scm-core"

‎Documentation/devicetree/bindings/bus/ti-sysc.txt

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
Texas Instruments sysc interconnect target module wrapper binding
2+
3+
Texas Instruments SoCs can have a generic interconnect target module
4+
hardware for devices connected to various interconnects such as L3
5+
interconnect (Arteris NoC) and L4 interconnect (Sonics s3220). The sysc
6+
is mostly used for interaction between module and PRCM. It participates
7+
in the OCP Disconnect Protocol but other than that is mostly independent
8+
of the interconnect.
9+
10+
Each interconnect target module can have one or more devices connected to
11+
it. There is a set of control registers for managing interconnect target
12+
module clocks, idle modes and interconnect level resets for the module.
13+
14+
These control registers are sprinkled into the unused register address
15+
space of the first child device IP block managed by the interconnect
16+
target module and typically are named REVISION, SYSCONFIG and SYSSTATUS.
17+
18+
Required standard properties:
19+
20+
- compatible shall be one of the following generic types:
21+
22+
"ti,sysc-omap2"
23+
"ti,sysc-omap4"
24+
"ti,sysc-omap4-simple"
25+
26+
or one of the following derivative types for hardware
27+
needing special workarounds:
28+
29+
"ti,sysc-omap3430-sr"
30+
"ti,sysc-omap3630-sr"
31+
"ti,sysc-omap4-sr"
32+
"ti,sysc-omap3-sham"
33+
"ti,sysc-omap-aes"
34+
"ti,sysc-mcasp"
35+
"ti,sysc-usb-host-fs"
36+
37+
- reg shall have register areas implemented for the interconnect
38+
target module in question such as revision, sysc and syss
39+
40+
- reg-names shall contain the register names implemented for the
41+
interconnect target module in question such as
42+
"rev, "sysc", and "syss"
43+
44+
- ranges shall contain the interconnect target module IO range
45+
available for one or more child device IP blocks managed
46+
by the interconnect target module, the ranges may include
47+
multiple ranges such as device L4 range for control and
48+
parent L3 range for DMA access
49+
50+
Optional properties:
51+
52+
- clocks clock specifier for each name in the clock-names as
53+
specified in the binding documentation for ti-clkctrl,
54+
typically available for all interconnect targets on TI SoCs
55+
based on omap4 except if it's read-only register in hwauto
56+
mode as for example omap4 L4_CFG_CLKCTRL
57+
58+
- clock-names should contain at least "fck", and optionally also "ick"
59+
depending on the SoC and the interconnect target module
60+
61+
- ti,hwmods optional TI interconnect module name to use legacy
62+
hwmod platform data
63+
64+
65+
Example: Single instance of MUSB controller on omap4 using interconnect ranges
66+
using offsets from l4_cfg second segment (0x4a000000 + 0x80000 = 0x4a0ab000):
67+
68+
target-module@2b000 { /* 0x4a0ab000, ap 84 12.0 */
69+
compatible = "ti,sysc-omap2";
70+
ti,hwmods = "usb_otg_hs";
71+
reg = <0x2b400 0x4>,
72+
<0x2b404 0x4>,
73+
<0x2b408 0x4>;
74+
reg-names = "rev", "sysc", "syss";
75+
clocks = <&l3_init_clkctrl OMAP4_USB_OTG_HS_CLKCTRL 0>;
76+
clock-names = "fck";
77+
#address-cells = <1>;
78+
#size-cells = <1>;
79+
ranges = <0 0x2b000 0x1000>;
80+
81+
usb_otg_hs: otg@0 {
82+
compatible = "ti,omap4-musb";
83+
reg = <0x0 0x7ff>;
84+
interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>,
85+
<GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
86+
usb-phy = <&usb2_phy>;
87+
...
88+
};
89+
};
90+
91+
Note that other SoCs, such as am335x can have multipe child devices. On am335x
92+
there are two MUSB instances, two USB PHY instances, and a single CPPI41 DMA
93+
instance as children of a single interconnet target module.

‎Documentation/devicetree/bindings/hsi/omap-ssi.txt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
OMAP SSI controller bindings
22

3-
OMAP Synchronous Serial Interface (SSI) controller implements a legacy
4-
variant of MIPI's High Speed Synchronous Serial Interface (HSI).
3+
OMAP3's Synchronous Serial Interface (SSI) controller implements a
4+
legacy variant of MIPI's High Speed Synchronous Serial Interface (HSI),
5+
while the controller found inside OMAP4 is supposed to be fully compliant
6+
with the HSI standard.
57

68
Required properties:
7-
- compatible: Should include "ti,omap3-ssi".
9+
- compatible: Should include "ti,omap3-ssi" or "ti,omap4-hsi"
810
- reg-names: Contains the values "sys" and "gdd" (in this order).
911
- reg: Contains a matching register specifier for each entry
1012
in reg-names.
@@ -27,6 +29,7 @@ Each port is represented as a sub-node of the ti,omap3-ssi device.
2729
Required Port sub-node properties:
2830
- compatible: Should be set to the following value
2931
ti,omap3-ssi-port (applicable to OMAP34xx devices)
32+
ti,omap4-hsi-port (applicable to OMAP44xx devices)
3033
- reg-names: Contains the values "tx" and "rx" (in this order).
3134
- reg: Contains a matching register specifier for each entry
3235
in reg-names.
@@ -38,6 +41,10 @@ Required Port sub-node properties:
3841
property. If it's missing the port will not be
3942
enabled.
4043

44+
Optional properties:
45+
- ti,hwmods: Shall contain TI interconnect module name if needed
46+
by the SoC
47+
4148
Example for Nokia N900:
4249

4350
ssi-controller@48058000 {

‎Documentation/devicetree/bindings/memory-controllers/ti/emif.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ of the EMIF IP and memory parts attached to it.
77

88
Required properties:
99
- compatible : Should be of the form "ti,emif-<ip-rev>" where <ip-rev>
10-
is the IP revision of the specific EMIF instance.
11-
For am437x should be ti,emif-am4372.
10+
is the IP revision of the specific EMIF instance. For newer controllers,
11+
compatible should be one of the following:
12+
"ti,emif-am3352"
13+
"ti,emif-am4372"
1214

1315
- phy-type : <u32> indicating the DDR phy type. Following are the
1416
allowed values

‎Documentation/devicetree/bindings/power/ti-smartreflex.txt

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
Texas Instruments SmartReflex binding
2+
3+
SmartReflex is used to set and adjust the SoC operating points.
4+
5+
6+
Required properties:
7+
8+
compatible: Shall be one of the following:
9+
"ti,omap3-smartreflex-core"
10+
"ti,omap3-smartreflex-iva"
11+
"ti,omap4-smartreflex-core"
12+
"ti,omap4-smartreflex-mpu"
13+
"ti,omap4-smartreflex-iva"
14+
15+
reg: Shall contain the device instance IO range
16+
17+
interrupts: Shall contain the device instance interrupt
18+
19+
20+
Optional properties:
21+
22+
ti,hwmods: Shall contain the TI interconnect module name if needed
23+
by the SoC
24+
25+
26+
Example:
27+
28+
smartreflex_iva: smartreflex@4a0db000 {
29+
compatible = "ti,omap4-smartreflex-iva";
30+
reg = <0x4a0db000 0x80>;
31+
interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
32+
ti,hwmods = "smartreflex_iva";
33+
};
34+
35+
smartreflex_core: smartreflex@4a0dd000 {
36+
compatible = "ti,omap4-smartreflex-core";
37+
reg = <0x4a0dd000 0x80>;
38+
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
39+
ti,hwmods = "smartreflex_core";
40+
};
41+
42+
smartreflex_mpu: smartreflex@4a0d9000 {
43+
compatible = "ti,omap4-smartreflex-mpu";
44+
reg = <0x4a0d9000 0x80>;
45+
interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
46+
ti,hwmods = "smartreflex_mpu";
47+
};

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,11 @@
128128
};
129129
};
130130

131-
pmu {
131+
pmu@4b000000 {
132132
compatible = "arm,cortex-a8-pmu";
133133
interrupts = <3>;
134+
reg = <0x4b000000 0x1000000>;
135+
ti,hwmods = "debugss";
134136
};
135137

136138
/*
@@ -927,6 +929,12 @@
927929
};
928930
};
929931

932+
emif: emif@4c000000 {
933+
compatible = "ti,emif-am3352";
934+
reg = <0x4c000000 0x1000000>;
935+
ti,hwmods = "emif";
936+
};
937+
930938
gpmc: gpmc@50000000 {
931939
compatible = "ti,am3352-gpmc";
932940
ti,hwmods = "gpmc";

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,7 @@
457457
#dma-cells = <1>;
458458
dma-channels = <32>;
459459
dma-requests = <127>;
460+
ti,hwmods = "dma_system";
460461
};
461462

462463
edma: edma@43300000 {
@@ -1069,6 +1070,13 @@
10691070
max-frequency = <192000000>;
10701071
};
10711072

1073+
hdqw1w: 1w@480b2000 {
1074+
compatible = "ti,omap3-1w";
1075+
reg = <0x480b2000 0x1000>;
1076+
interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
1077+
ti,hwmods = "hdq1w";
1078+
};
1079+
10721080
mmc2: mmc@480b4000 {
10731081
compatible = "ti,omap4-hsmmc";
10741082
reg = <0x480b4000 0x400>;
@@ -1489,6 +1497,32 @@
14891497
};
14901498
};
14911499

1500+
target-module@4a0dd000 {
1501+
compatible = "ti,sysc-omap4-sr";
1502+
ti,hwmods = "smartreflex_core";
1503+
reg = <0x4a0dd000 0x4>,
1504+
<0x4a0dd008 0x4>;
1505+
reg-names = "rev", "sysc";
1506+
#address-cells = <1>;
1507+
#size-cells = <1>;
1508+
ranges = <0 0x4a0dd000 0x001000>;
1509+
1510+
/* SmartReflex child device marked reserved in TRM */
1511+
};
1512+
1513+
target-module@4a0d9000 {
1514+
compatible = "ti,sysc-omap4-sr";
1515+
ti,hwmods = "smartreflex_mpu";
1516+
reg = <0x4a0d9000 0x4>,
1517+
<0x4a0d9008 0x4>;
1518+
reg-names = "rev", "sysc";
1519+
#address-cells = <1>;
1520+
#size-cells = <1>;
1521+
ranges = <0 0x4a0d9000 0x001000>;
1522+
1523+
/* SmartReflex child device marked reserved in TRM */
1524+
};
1525+
14921526
omap_dwc3_1: omap_dwc3_1@48880000 {
14931527
compatible = "ti,dwc3";
14941528
ti,hwmods = "usb_otg_ss1";

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@
215215
#dma-cells = <1>;
216216
dma-channels = <32>;
217217
dma-requests = <96>;
218+
ti,hwmods = "dma";
218219
};
219220

220221
gpio1: gpio@48310000 {

0 commit comments

Comments
 (0)