diff options
Diffstat (limited to 'Documentation/devicetree/bindings')
15 files changed, 266 insertions, 205 deletions
diff --git a/Documentation/devicetree/bindings/arm/atmel-adc.txt b/Documentation/devicetree/bindings/arm/atmel-adc.txt index 723c205cb10d..d1061469f63d 100644 --- a/Documentation/devicetree/bindings/arm/atmel-adc.txt +++ b/Documentation/devicetree/bindings/arm/atmel-adc.txt | |||
@@ -7,7 +7,6 @@ Required properties: | |||
7 | - interrupts: Should contain the IRQ line for the ADC | 7 | - interrupts: Should contain the IRQ line for the ADC |
8 | - atmel,adc-channels-used: Bitmask of the channels muxed and enable for this | 8 | - atmel,adc-channels-used: Bitmask of the channels muxed and enable for this |
9 | device | 9 | device |
10 | - atmel,adc-num-channels: Number of channels available in the ADC | ||
11 | - atmel,adc-startup-time: Startup Time of the ADC in microseconds as | 10 | - atmel,adc-startup-time: Startup Time of the ADC in microseconds as |
12 | defined in the datasheet | 11 | defined in the datasheet |
13 | - atmel,adc-vref: Reference voltage in millivolts for the conversions | 12 | - atmel,adc-vref: Reference voltage in millivolts for the conversions |
@@ -24,6 +23,13 @@ Optional properties: | |||
24 | resolution will be used. | 23 | resolution will be used. |
25 | - atmel,adc-sleep-mode: Boolean to enable sleep mode when no conversion | 24 | - atmel,adc-sleep-mode: Boolean to enable sleep mode when no conversion |
26 | - atmel,adc-sample-hold-time: Sample and Hold Time in microseconds | 25 | - atmel,adc-sample-hold-time: Sample and Hold Time in microseconds |
26 | - atmel,adc-ts-wires: Number of touch screen wires. Should be 4 or 5. If this | ||
27 | value is set, then adc driver will enable touch screen | ||
28 | support. | ||
29 | NOTE: when adc touch screen enabled, the adc hardware trigger will be | ||
30 | disabled. Since touch screen will occupied the trigger register. | ||
31 | - atmel,adc-ts-pressure-threshold: a pressure threshold for touchscreen. It | ||
32 | make touch detect more precision. | ||
27 | 33 | ||
28 | Optional trigger Nodes: | 34 | Optional trigger Nodes: |
29 | - Required properties: | 35 | - Required properties: |
diff --git a/Documentation/devicetree/bindings/iio/light/cm36651.txt b/Documentation/devicetree/bindings/iio/light/cm36651.txt new file mode 100644 index 000000000000..c03e19db4550 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/light/cm36651.txt | |||
@@ -0,0 +1,26 @@ | |||
1 | * Capella CM36651 I2C Proximity and Color Light sensor | ||
2 | |||
3 | Required properties: | ||
4 | - compatible: must be "capella,cm36651" | ||
5 | - reg: the I2C address of the device | ||
6 | - interrupts: interrupt-specifier for the sole interrupt | ||
7 | generated by the device | ||
8 | - vled-supply: regulator for the IR LED. IR_LED is a part | ||
9 | of the cm36651 for proximity detection. | ||
10 | As covered in ../../regulator/regulator.txt | ||
11 | |||
12 | Example: | ||
13 | |||
14 | i2c_cm36651: i2c-gpio { | ||
15 | /* ... */ | ||
16 | |||
17 | cm36651@18 { | ||
18 | compatible = "capella,cm36651"; | ||
19 | reg = <0x18>; | ||
20 | interrupt-parent = <&gpx0>; | ||
21 | interrupts = <2 0>; | ||
22 | vled-supply = <&ps_als_reg>; | ||
23 | }; | ||
24 | |||
25 | /* ... */ | ||
26 | }; | ||
diff --git a/Documentation/devicetree/bindings/iio/light/gp2ap020a00f.txt b/Documentation/devicetree/bindings/iio/light/gp2ap020a00f.txt new file mode 100644 index 000000000000..9231c82317ad --- /dev/null +++ b/Documentation/devicetree/bindings/iio/light/gp2ap020a00f.txt | |||
@@ -0,0 +1,21 @@ | |||
1 | * Sharp GP2AP020A00F I2C Proximity/ALS sensor | ||
2 | |||
3 | The proximity detector sensor requires power supply | ||
4 | for its built-in led. It is also defined by this binding. | ||
5 | |||
6 | Required properties: | ||
7 | |||
8 | - compatible : should be "sharp,gp2ap020a00f" | ||
9 | - reg : the I2C slave address of the light sensor | ||
10 | - interrupts : interrupt specifier for the sole interrupt generated | ||
11 | by the device | ||
12 | - vled-supply : VLED power supply, as covered in ../regulator/regulator.txt | ||
13 | |||
14 | Example: | ||
15 | |||
16 | gp2ap020a00f@39 { | ||
17 | compatible = "sharp,gp2ap020a00f"; | ||
18 | reg = <0x39>; | ||
19 | interrupts = <2 0>; | ||
20 | vled-supply = <...>; | ||
21 | }; | ||
diff --git a/Documentation/devicetree/bindings/memory.txt b/Documentation/devicetree/bindings/memory.txt deleted file mode 100644 index eb2469365593..000000000000 --- a/Documentation/devicetree/bindings/memory.txt +++ /dev/null | |||
@@ -1,168 +0,0 @@ | |||
1 | *** Memory binding *** | ||
2 | |||
3 | The /memory node provides basic information about the address and size | ||
4 | of the physical memory. This node is usually filled or updated by the | ||
5 | bootloader, depending on the actual memory configuration of the given | ||
6 | hardware. | ||
7 | |||
8 | The memory layout is described by the following node: | ||
9 | |||
10 | / { | ||
11 | #address-cells = <(n)>; | ||
12 | #size-cells = <(m)>; | ||
13 | memory { | ||
14 | device_type = "memory"; | ||
15 | reg = <(baseaddr1) (size1) | ||
16 | (baseaddr2) (size2) | ||
17 | ... | ||
18 | (baseaddrN) (sizeN)>; | ||
19 | }; | ||
20 | ... | ||
21 | }; | ||
22 | |||
23 | A memory node follows the typical device tree rules for "reg" property: | ||
24 | n: number of cells used to store base address value | ||
25 | m: number of cells used to store size value | ||
26 | baseaddrX: defines a base address of the defined memory bank | ||
27 | sizeX: the size of the defined memory bank | ||
28 | |||
29 | |||
30 | More than one memory bank can be defined. | ||
31 | |||
32 | |||
33 | *** Reserved memory regions *** | ||
34 | |||
35 | In /memory/reserved-memory node one can create child nodes describing | ||
36 | particular reserved (excluded from normal use) memory regions. Such | ||
37 | memory regions are usually designed for the special usage by various | ||
38 | device drivers. A good example are contiguous memory allocations or | ||
39 | memory sharing with other operating system on the same hardware board. | ||
40 | Those special memory regions might depend on the board configuration and | ||
41 | devices used on the target system. | ||
42 | |||
43 | Parameters for each memory region can be encoded into the device tree | ||
44 | with the following convention: | ||
45 | |||
46 | [(label):] (name) { | ||
47 | compatible = "linux,contiguous-memory-region", "reserved-memory-region"; | ||
48 | reg = <(address) (size)>; | ||
49 | (linux,default-contiguous-region); | ||
50 | }; | ||
51 | |||
52 | compatible: one or more of: | ||
53 | - "linux,contiguous-memory-region" - enables binding of this | ||
54 | region to Contiguous Memory Allocator (special region for | ||
55 | contiguous memory allocations, shared with movable system | ||
56 | memory, Linux kernel-specific). | ||
57 | - "reserved-memory-region" - compatibility is defined, given | ||
58 | region is assigned for exclusive usage for by the respective | ||
59 | devices. | ||
60 | |||
61 | reg: standard property defining the base address and size of | ||
62 | the memory region | ||
63 | |||
64 | linux,default-contiguous-region: property indicating that the region | ||
65 | is the default region for all contiguous memory | ||
66 | allocations, Linux specific (optional) | ||
67 | |||
68 | It is optional to specify the base address, so if one wants to use | ||
69 | autoconfiguration of the base address, '0' can be specified as a base | ||
70 | address in the 'reg' property. | ||
71 | |||
72 | The /memory/reserved-memory node must contain the same #address-cells | ||
73 | and #size-cells value as the root node. | ||
74 | |||
75 | |||
76 | *** Device node's properties *** | ||
77 | |||
78 | Once regions in the /memory/reserved-memory node have been defined, they | ||
79 | may be referenced by other device nodes. Bindings that wish to reference | ||
80 | memory regions should explicitly document their use of the following | ||
81 | property: | ||
82 | |||
83 | memory-region = <&phandle_to_defined_region>; | ||
84 | |||
85 | This property indicates that the device driver should use the memory | ||
86 | region pointed by the given phandle. | ||
87 | |||
88 | |||
89 | *** Example *** | ||
90 | |||
91 | This example defines a memory consisting of 4 memory banks. 3 contiguous | ||
92 | regions are defined for Linux kernel, one default of all device drivers | ||
93 | (named contig_mem, placed at 0x72000000, 64MiB), one dedicated to the | ||
94 | framebuffer device (labelled display_mem, placed at 0x78000000, 8MiB) | ||
95 | and one for multimedia processing (labelled multimedia_mem, placed at | ||
96 | 0x77000000, 64MiB). 'display_mem' region is then assigned to fb@12300000 | ||
97 | device for DMA memory allocations (Linux kernel drivers will use CMA is | ||
98 | available or dma-exclusive usage otherwise). 'multimedia_mem' is | ||
99 | assigned to scaler@12500000 and codec@12600000 devices for contiguous | ||
100 | memory allocations when CMA driver is enabled. | ||
101 | |||
102 | The reason for creating a separate region for framebuffer device is to | ||
103 | match the framebuffer base address to the one configured by bootloader, | ||
104 | so once Linux kernel drivers starts no glitches on the displayed boot | ||
105 | logo appears. Scaller and codec drivers should share the memory | ||
106 | allocations. | ||
107 | |||
108 | / { | ||
109 | #address-cells = <1>; | ||
110 | #size-cells = <1>; | ||
111 | |||
112 | /* ... */ | ||
113 | |||
114 | memory { | ||
115 | reg = <0x40000000 0x10000000 | ||
116 | 0x50000000 0x10000000 | ||
117 | 0x60000000 0x10000000 | ||
118 | 0x70000000 0x10000000>; | ||
119 | |||
120 | reserved-memory { | ||
121 | #address-cells = <1>; | ||
122 | #size-cells = <1>; | ||
123 | |||
124 | /* | ||
125 | * global autoconfigured region for contiguous allocations | ||
126 | * (used only with Contiguous Memory Allocator) | ||
127 | */ | ||
128 | contig_region@0 { | ||
129 | compatible = "linux,contiguous-memory-region"; | ||
130 | reg = <0x0 0x4000000>; | ||
131 | linux,default-contiguous-region; | ||
132 | }; | ||
133 | |||
134 | /* | ||
135 | * special region for framebuffer | ||
136 | */ | ||
137 | display_region: region@78000000 { | ||
138 | compatible = "linux,contiguous-memory-region", "reserved-memory-region"; | ||
139 | reg = <0x78000000 0x800000>; | ||
140 | }; | ||
141 | |||
142 | /* | ||
143 | * special region for multimedia processing devices | ||
144 | */ | ||
145 | multimedia_region: region@77000000 { | ||
146 | compatible = "linux,contiguous-memory-region"; | ||
147 | reg = <0x77000000 0x4000000>; | ||
148 | }; | ||
149 | }; | ||
150 | }; | ||
151 | |||
152 | /* ... */ | ||
153 | |||
154 | fb0: fb@12300000 { | ||
155 | status = "okay"; | ||
156 | memory-region = <&display_region>; | ||
157 | }; | ||
158 | |||
159 | scaler: scaler@12500000 { | ||
160 | status = "okay"; | ||
161 | memory-region = <&multimedia_region>; | ||
162 | }; | ||
163 | |||
164 | codec: codec@12600000 { | ||
165 | status = "okay"; | ||
166 | memory-region = <&multimedia_region>; | ||
167 | }; | ||
168 | }; | ||
diff --git a/Documentation/devicetree/bindings/misc/allwinner,sunxi-sid.txt b/Documentation/devicetree/bindings/misc/allwinner,sunxi-sid.txt new file mode 100644 index 000000000000..68ba37295565 --- /dev/null +++ b/Documentation/devicetree/bindings/misc/allwinner,sunxi-sid.txt | |||
@@ -0,0 +1,17 @@ | |||
1 | Allwinner sunxi-sid | ||
2 | |||
3 | Required properties: | ||
4 | - compatible: "allwinner,sun4i-sid" or "allwinner,sun7i-a20-sid". | ||
5 | - reg: Should contain registers location and length | ||
6 | |||
7 | Example for sun4i: | ||
8 | sid@01c23800 { | ||
9 | compatible = "allwinner,sun4i-sid"; | ||
10 | reg = <0x01c23800 0x10> | ||
11 | }; | ||
12 | |||
13 | Example for sun7i: | ||
14 | sid@01c23800 { | ||
15 | compatible = "allwinner,sun7i-a20-sid"; | ||
16 | reg = <0x01c23800 0x200> | ||
17 | }; | ||
diff --git a/Documentation/devicetree/bindings/misc/ti,dac7512.txt b/Documentation/devicetree/bindings/misc/ti,dac7512.txt new file mode 100644 index 000000000000..1db45939dac9 --- /dev/null +++ b/Documentation/devicetree/bindings/misc/ti,dac7512.txt | |||
@@ -0,0 +1,20 @@ | |||
1 | TI DAC7512 DEVICETREE BINDINGS | ||
2 | |||
3 | Required properties: | ||
4 | |||
5 | - "compatible" Must be set to "ti,dac7512" | ||
6 | |||
7 | Property rules described in Documentation/devicetree/bindings/spi/spi-bus.txt | ||
8 | apply. In particular, "reg" and "spi-max-frequency" properties must be given. | ||
9 | |||
10 | |||
11 | Example: | ||
12 | |||
13 | spi_master { | ||
14 | dac7512: dac7512@0 { | ||
15 | compatible = "ti,dac7512"; | ||
16 | reg = <0>; /* CS0 */ | ||
17 | spi-max-frequency = <1000000>; | ||
18 | }; | ||
19 | }; | ||
20 | |||
diff --git a/Documentation/devicetree/bindings/phy/phy-bindings.txt b/Documentation/devicetree/bindings/phy/phy-bindings.txt new file mode 100644 index 000000000000..8ae844fc0c60 --- /dev/null +++ b/Documentation/devicetree/bindings/phy/phy-bindings.txt | |||
@@ -0,0 +1,66 @@ | |||
1 | This document explains only the device tree data binding. For general | ||
2 | information about PHY subsystem refer to Documentation/phy.txt | ||
3 | |||
4 | PHY device node | ||
5 | =============== | ||
6 | |||
7 | Required Properties: | ||
8 | #phy-cells: Number of cells in a PHY specifier; The meaning of all those | ||
9 | cells is defined by the binding for the phy node. The PHY | ||
10 | provider can use the values in cells to find the appropriate | ||
11 | PHY. | ||
12 | |||
13 | For example: | ||
14 | |||
15 | phys: phy { | ||
16 | compatible = "xxx"; | ||
17 | reg = <...>; | ||
18 | . | ||
19 | . | ||
20 | #phy-cells = <1>; | ||
21 | . | ||
22 | . | ||
23 | }; | ||
24 | |||
25 | That node describes an IP block (PHY provider) that implements 2 different PHYs. | ||
26 | In order to differentiate between these 2 PHYs, an additonal specifier should be | ||
27 | given while trying to get a reference to it. | ||
28 | |||
29 | PHY user node | ||
30 | ============= | ||
31 | |||
32 | Required Properties: | ||
33 | phys : the phandle for the PHY device (used by the PHY subsystem) | ||
34 | phy-names : the names of the PHY corresponding to the PHYs present in the | ||
35 | *phys* phandle | ||
36 | |||
37 | Example 1: | ||
38 | usb1: usb_otg_ss@xxx { | ||
39 | compatible = "xxx"; | ||
40 | reg = <xxx>; | ||
41 | . | ||
42 | . | ||
43 | phys = <&usb2_phy>, <&usb3_phy>; | ||
44 | phy-names = "usb2phy", "usb3phy"; | ||
45 | . | ||
46 | . | ||
47 | }; | ||
48 | |||
49 | This node represents a controller that uses two PHYs, one for usb2 and one for | ||
50 | usb3. | ||
51 | |||
52 | Example 2: | ||
53 | usb2: usb_otg_ss@xxx { | ||
54 | compatible = "xxx"; | ||
55 | reg = <xxx>; | ||
56 | . | ||
57 | . | ||
58 | phys = <&phys 1>; | ||
59 | phy-names = "usbphy"; | ||
60 | . | ||
61 | . | ||
62 | }; | ||
63 | |||
64 | This node represents a controller that uses one of the PHYs of the PHY provider | ||
65 | device defined previously. Note that the phy handle has an additional specifier | ||
66 | "1" to differentiate between the two PHYs. | ||
diff --git a/Documentation/devicetree/bindings/phy/samsung-phy.txt b/Documentation/devicetree/bindings/phy/samsung-phy.txt new file mode 100644 index 000000000000..c0fccaa1671e --- /dev/null +++ b/Documentation/devicetree/bindings/phy/samsung-phy.txt | |||
@@ -0,0 +1,22 @@ | |||
1 | Samsung S5P/EXYNOS SoC series MIPI CSIS/DSIM DPHY | ||
2 | ------------------------------------------------- | ||
3 | |||
4 | Required properties: | ||
5 | - compatible : should be "samsung,s5pv210-mipi-video-phy"; | ||
6 | - reg : offset and length of the MIPI DPHY register set; | ||
7 | - #phy-cells : from the generic phy bindings, must be 1; | ||
8 | |||
9 | For "samsung,s5pv210-mipi-video-phy" compatible PHYs the second cell in | ||
10 | the PHY specifier identifies the PHY and its meaning is as follows: | ||
11 | 0 - MIPI CSIS 0, | ||
12 | 1 - MIPI DSIM 0, | ||
13 | 2 - MIPI CSIS 1, | ||
14 | 3 - MIPI DSIM 1. | ||
15 | |||
16 | Samsung EXYNOS SoC series Display Port PHY | ||
17 | ------------------------------------------------- | ||
18 | |||
19 | Required properties: | ||
20 | - compatible : should be "samsung,exynos5250-dp-video-phy"; | ||
21 | - reg : offset and length of the Display Port PHY register set; | ||
22 | - #phy-cells : from the generic PHY bindings, must be 0; | ||
diff --git a/Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt b/Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt index 46882058b59b..ee05dc390694 100644 --- a/Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt +++ b/Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt | |||
@@ -1,7 +1,8 @@ | |||
1 | * Freescale i.MX28 LRADC device driver | 1 | * Freescale i.MX28 LRADC device driver |
2 | 2 | ||
3 | Required properties: | 3 | Required properties: |
4 | - compatible: Should be "fsl,imx28-lradc" | 4 | - compatible: Should be "fsl,imx23-lradc" for i.MX23 SoC and "fsl,imx28-lradc" |
5 | for i.MX28 SoC | ||
5 | - reg: Address and length of the register set for the device | 6 | - reg: Address and length of the register set for the device |
6 | - interrupts: Should contain the LRADC interrupts | 7 | - interrupts: Should contain the LRADC interrupts |
7 | 8 | ||
@@ -9,13 +10,38 @@ Optional properties: | |||
9 | - fsl,lradc-touchscreen-wires: Number of wires used to connect the touchscreen | 10 | - fsl,lradc-touchscreen-wires: Number of wires used to connect the touchscreen |
10 | to LRADC. Valid value is either 4 or 5. If this | 11 | to LRADC. Valid value is either 4 or 5. If this |
11 | property is not present, then the touchscreen is | 12 | property is not present, then the touchscreen is |
12 | disabled. | 13 | disabled. 5 wires is valid for i.MX28 SoC only. |
14 | - fsl,ave-ctrl: number of samples per direction to calculate an average value. | ||
15 | Allowed value is 1 ... 31, default is 4 | ||
16 | - fsl,ave-delay: delay between consecutive samples. Allowed value is | ||
17 | 1 ... 2047. It is used if 'fsl,ave-ctrl' > 1, counts at | ||
18 | 2 kHz and its default is 2 (= 1 ms) | ||
19 | - fsl,settling: delay between plate switch to next sample. Allowed value is | ||
20 | 1 ... 2047. It counts at 2 kHz and its default is | ||
21 | 10 (= 5 ms) | ||
13 | 22 | ||
14 | Examples: | 23 | Example for i.MX23 SoC: |
24 | |||
25 | lradc@80050000 { | ||
26 | compatible = "fsl,imx23-lradc"; | ||
27 | reg = <0x80050000 0x2000>; | ||
28 | interrupts = <36 37 38 39 40 41 42 43 44>; | ||
29 | status = "okay"; | ||
30 | fsl,lradc-touchscreen-wires = <4>; | ||
31 | fsl,ave-ctrl = <4>; | ||
32 | fsl,ave-delay = <2>; | ||
33 | fsl,settling = <10>; | ||
34 | }; | ||
35 | |||
36 | Example for i.MX28 SoC: | ||
15 | 37 | ||
16 | lradc@80050000 { | 38 | lradc@80050000 { |
17 | compatible = "fsl,imx28-lradc"; | 39 | compatible = "fsl,imx28-lradc"; |
18 | reg = <0x80050000 0x2000>; | 40 | reg = <0x80050000 0x2000>; |
19 | interrupts = <10 14 15 16 17 18 19 | 41 | interrupts = <10 14 15 16 17 18 19 20 21 22 23 24 25>; |
20 | 20 21 22 23 24 25>; | 42 | status = "okay"; |
43 | fsl,lradc-touchscreen-wires = <5>; | ||
44 | fsl,ave-ctrl = <4>; | ||
45 | fsl,ave-delay = <2>; | ||
46 | fsl,settling = <10>; | ||
21 | }; | 47 | }; |
diff --git a/Documentation/devicetree/bindings/usb/msm-hsusb.txt b/Documentation/devicetree/bindings/usb/msm-hsusb.txt new file mode 100644 index 000000000000..5ea26c631e3a --- /dev/null +++ b/Documentation/devicetree/bindings/usb/msm-hsusb.txt | |||
@@ -0,0 +1,17 @@ | |||
1 | MSM SoC HSUSB controllers | ||
2 | |||
3 | EHCI | ||
4 | |||
5 | Required properties: | ||
6 | - compatible: Should contain "qcom,ehci-host" | ||
7 | - regs: offset and length of the register set in the memory map | ||
8 | - usb-phy: phandle for the PHY device | ||
9 | |||
10 | Example EHCI controller device node: | ||
11 | |||
12 | ehci: ehci@f9a55000 { | ||
13 | compatible = "qcom,ehci-host"; | ||
14 | reg = <0xf9a55000 0x400>; | ||
15 | usb-phy = <&usb_otg>; | ||
16 | }; | ||
17 | |||
diff --git a/Documentation/devicetree/bindings/usb/omap-usb.txt b/Documentation/devicetree/bindings/usb/omap-usb.txt index 9088ab09e200..090e5e22bd2b 100644 --- a/Documentation/devicetree/bindings/usb/omap-usb.txt +++ b/Documentation/devicetree/bindings/usb/omap-usb.txt | |||
@@ -3,9 +3,6 @@ OMAP GLUE AND OTHER OMAP SPECIFIC COMPONENTS | |||
3 | OMAP MUSB GLUE | 3 | OMAP MUSB GLUE |
4 | - compatible : Should be "ti,omap4-musb" or "ti,omap3-musb" | 4 | - compatible : Should be "ti,omap4-musb" or "ti,omap3-musb" |
5 | - ti,hwmods : must be "usb_otg_hs" | 5 | - ti,hwmods : must be "usb_otg_hs" |
6 | - ti,has-mailbox : to specify that omap uses an external mailbox | ||
7 | (in control module) to communicate with the musb core during device connect | ||
8 | and disconnect. | ||
9 | - multipoint : Should be "1" indicating the musb controller supports | 6 | - multipoint : Should be "1" indicating the musb controller supports |
10 | multipoint. This is a MUSB configuration-specific setting. | 7 | multipoint. This is a MUSB configuration-specific setting. |
11 | - num-eps : Specifies the number of endpoints. This is also a | 8 | - num-eps : Specifies the number of endpoints. This is also a |
@@ -19,6 +16,9 @@ OMAP MUSB GLUE | |||
19 | - power : Should be "50". This signifies the controller can supply up to | 16 | - power : Should be "50". This signifies the controller can supply up to |
20 | 100mA when operating in host mode. | 17 | 100mA when operating in host mode. |
21 | - usb-phy : the phandle for the PHY device | 18 | - usb-phy : the phandle for the PHY device |
19 | - phys : the phandle for the PHY device (used by generic PHY framework) | ||
20 | - phy-names : the names of the PHY corresponding to the PHYs present in the | ||
21 | *phy* phandle. | ||
22 | 22 | ||
23 | Optional properties: | 23 | Optional properties: |
24 | - ctrl-module : phandle of the control module this glue uses to write to | 24 | - ctrl-module : phandle of the control module this glue uses to write to |
@@ -28,11 +28,12 @@ SOC specific device node entry | |||
28 | usb_otg_hs: usb_otg_hs@4a0ab000 { | 28 | usb_otg_hs: usb_otg_hs@4a0ab000 { |
29 | compatible = "ti,omap4-musb"; | 29 | compatible = "ti,omap4-musb"; |
30 | ti,hwmods = "usb_otg_hs"; | 30 | ti,hwmods = "usb_otg_hs"; |
31 | ti,has-mailbox; | ||
32 | multipoint = <1>; | 31 | multipoint = <1>; |
33 | num-eps = <16>; | 32 | num-eps = <16>; |
34 | ram-bits = <12>; | 33 | ram-bits = <12>; |
35 | ctrl-module = <&omap_control_usb>; | 34 | ctrl-module = <&omap_control_usb>; |
35 | phys = <&usb2_phy>; | ||
36 | phy-names = "usb2-phy"; | ||
36 | }; | 37 | }; |
37 | 38 | ||
38 | Board specific device node entry | 39 | Board specific device node entry |
@@ -78,22 +79,22 @@ omap_dwc3 { | |||
78 | OMAP CONTROL USB | 79 | OMAP CONTROL USB |
79 | 80 | ||
80 | Required properties: | 81 | Required properties: |
81 | - compatible: Should be "ti,omap-control-usb" | 82 | - compatible: Should be one of |
83 | "ti,control-phy-otghs" - if it has otghs_control mailbox register as on OMAP4. | ||
84 | "ti,control-phy-usb2" - if it has Power down bit in control_dev_conf register | ||
85 | e.g. USB2_PHY on OMAP5. | ||
86 | "ti,control-phy-pipe3" - if it has DPLL and individual Rx & Tx power control | ||
87 | e.g. USB3 PHY and SATA PHY on OMAP5. | ||
88 | "ti,control-phy-dra7usb2" - if it has power down register like USB2 PHY on | ||
89 | DRA7 platform. | ||
82 | - reg : Address and length of the register set for the device. It contains | 90 | - reg : Address and length of the register set for the device. It contains |
83 | the address of "control_dev_conf" and "otghs_control" or "phy_power_usb" | 91 | the address of "otghs_control" for control-phy-otghs or "power" register |
84 | depending upon omap4 or omap5. | 92 | for other types. |
85 | - reg-names: The names of the register addresses corresponding to the registers | 93 | - reg-names: should be "otghs_control" control-phy-otghs and "power" for |
86 | filled in "reg". | 94 | other types. |
87 | - ti,type: This is used to differentiate whether the control module has | ||
88 | usb mailbox or usb3 phy power. omap4 has usb mailbox in control module to | ||
89 | notify events to the musb core and omap5 has usb3 phy power register to | ||
90 | power on usb3 phy. Should be "1" if it has mailbox and "2" if it has usb3 | ||
91 | phy power. | ||
92 | 95 | ||
93 | omap_control_usb: omap-control-usb@4a002300 { | 96 | omap_control_usb: omap-control-usb@4a002300 { |
94 | compatible = "ti,omap-control-usb"; | 97 | compatible = "ti,control-phy-otghs"; |
95 | reg = <0x4a002300 0x4>, | 98 | reg = <0x4a00233c 0x4>; |
96 | <0x4a00233c 0x4>; | 99 | reg-names = "otghs_control"; |
97 | reg-names = "control_dev_conf", "otghs_control"; | ||
98 | ti,type = <1>; | ||
99 | }; | 100 | }; |
diff --git a/Documentation/devicetree/bindings/usb/usb-nop-xceiv.txt b/Documentation/devicetree/bindings/usb/usb-nop-xceiv.txt index d7e272671c7e..1bd37faba05b 100644 --- a/Documentation/devicetree/bindings/usb/usb-nop-xceiv.txt +++ b/Documentation/devicetree/bindings/usb/usb-nop-xceiv.txt | |||
@@ -15,7 +15,7 @@ Optional properties: | |||
15 | 15 | ||
16 | - vcc-supply: phandle to the regulator that provides RESET to the PHY. | 16 | - vcc-supply: phandle to the regulator that provides RESET to the PHY. |
17 | 17 | ||
18 | - reset-supply: phandle to the regulator that provides power to the PHY. | 18 | - reset-gpios: Should specify the GPIO for reset. |
19 | 19 | ||
20 | Example: | 20 | Example: |
21 | 21 | ||
@@ -25,10 +25,9 @@ Example: | |||
25 | clocks = <&osc 0>; | 25 | clocks = <&osc 0>; |
26 | clock-names = "main_clk"; | 26 | clock-names = "main_clk"; |
27 | vcc-supply = <&hsusb1_vcc_regulator>; | 27 | vcc-supply = <&hsusb1_vcc_regulator>; |
28 | reset-supply = <&hsusb1_reset_regulator>; | 28 | reset-gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; |
29 | }; | 29 | }; |
30 | 30 | ||
31 | hsusb1_phy is a NOP USB PHY device that gets its clock from an oscillator | 31 | hsusb1_phy is a NOP USB PHY device that gets its clock from an oscillator |
32 | and expects that clock to be configured to 19.2MHz by the NOP PHY driver. | 32 | and expects that clock to be configured to 19.2MHz by the NOP PHY driver. |
33 | hsusb1_vcc_regulator provides power to the PHY and hsusb1_reset_regulator | 33 | hsusb1_vcc_regulator provides power to the PHY and GPIO 7 controls RESET. |
34 | controls RESET. | ||
diff --git a/Documentation/devicetree/bindings/usb/usb-phy.txt b/Documentation/devicetree/bindings/usb/usb-phy.txt index 61496f5cb095..c0245c888982 100644 --- a/Documentation/devicetree/bindings/usb/usb-phy.txt +++ b/Documentation/devicetree/bindings/usb/usb-phy.txt | |||
@@ -5,6 +5,8 @@ OMAP USB2 PHY | |||
5 | Required properties: | 5 | Required properties: |
6 | - compatible: Should be "ti,omap-usb2" | 6 | - compatible: Should be "ti,omap-usb2" |
7 | - reg : Address and length of the register set for the device. | 7 | - reg : Address and length of the register set for the device. |
8 | - #phy-cells: determine the number of cells that should be given in the | ||
9 | phandle while referencing this phy. | ||
8 | 10 | ||
9 | Optional properties: | 11 | Optional properties: |
10 | - ctrl-module : phandle of the control module used by PHY driver to power on | 12 | - ctrl-module : phandle of the control module used by PHY driver to power on |
@@ -16,6 +18,7 @@ usb2phy@4a0ad080 { | |||
16 | compatible = "ti,omap-usb2"; | 18 | compatible = "ti,omap-usb2"; |
17 | reg = <0x4a0ad080 0x58>; | 19 | reg = <0x4a0ad080 0x58>; |
18 | ctrl-module = <&omap_control_usb>; | 20 | ctrl-module = <&omap_control_usb>; |
21 | #phy-cells = <0>; | ||
19 | }; | 22 | }; |
20 | 23 | ||
21 | OMAP USB3 PHY | 24 | OMAP USB3 PHY |
@@ -25,6 +28,8 @@ Required properties: | |||
25 | - reg : Address and length of the register set for the device. | 28 | - reg : Address and length of the register set for the device. |
26 | - reg-names: The names of the register addresses corresponding to the registers | 29 | - reg-names: The names of the register addresses corresponding to the registers |
27 | filled in "reg". | 30 | filled in "reg". |
31 | - #phy-cells: determine the number of cells that should be given in the | ||
32 | phandle while referencing this phy. | ||
28 | 33 | ||
29 | Optional properties: | 34 | Optional properties: |
30 | - ctrl-module : phandle of the control module used by PHY driver to power on | 35 | - ctrl-module : phandle of the control module used by PHY driver to power on |
@@ -39,4 +44,5 @@ usb3phy@4a084400 { | |||
39 | <0x4a084c00 0x40>; | 44 | <0x4a084c00 0x40>; |
40 | reg-names = "phy_rx", "phy_tx", "pll_ctrl"; | 45 | reg-names = "phy_rx", "phy_tx", "pll_ctrl"; |
41 | ctrl-module = <&omap_control_usb>; | 46 | ctrl-module = <&omap_control_usb>; |
47 | #phy-cells = <0>; | ||
42 | }; | 48 | }; |
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 2956800f0240..04eab45dd148 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt | |||
@@ -15,6 +15,7 @@ atmel Atmel Corporation | |||
15 | avago Avago Technologies | 15 | avago Avago Technologies |
16 | bosch Bosch Sensortec GmbH | 16 | bosch Bosch Sensortec GmbH |
17 | brcm Broadcom Corporation | 17 | brcm Broadcom Corporation |
18 | capella Capella Microsystems, Inc | ||
18 | cavium Cavium, Inc. | 19 | cavium Cavium, Inc. |
19 | chrp Common Hardware Reference Platform | 20 | chrp Common Hardware Reference Platform |
20 | cirrus Cirrus Logic, Inc. | 21 | cirrus Cirrus Logic, Inc. |
diff --git a/Documentation/devicetree/bindings/video/exynos_dp.txt b/Documentation/devicetree/bindings/video/exynos_dp.txt index 84f10c16cb38..3289d76a21d0 100644 --- a/Documentation/devicetree/bindings/video/exynos_dp.txt +++ b/Documentation/devicetree/bindings/video/exynos_dp.txt | |||
@@ -6,10 +6,10 @@ We use two nodes: | |||
6 | -dptx-phy node(defined inside dp-controller node) | 6 | -dptx-phy node(defined inside dp-controller node) |
7 | 7 | ||
8 | For the DP-PHY initialization, we use the dptx-phy node. | 8 | For the DP-PHY initialization, we use the dptx-phy node. |
9 | Required properties for dptx-phy: | 9 | Required properties for dptx-phy: deprecated, use phys and phy-names |
10 | -reg: | 10 | -reg: deprecated |
11 | Base address of DP PHY register. | 11 | Base address of DP PHY register. |
12 | -samsung,enable-mask: | 12 | -samsung,enable-mask: deprecated |
13 | The bit-mask used to enable/disable DP PHY. | 13 | The bit-mask used to enable/disable DP PHY. |
14 | 14 | ||
15 | For the Panel initialization, we read data from dp-controller node. | 15 | For the Panel initialization, we read data from dp-controller node. |
@@ -27,6 +27,10 @@ Required properties for dp-controller: | |||
27 | from common clock binding: Shall be "dp". | 27 | from common clock binding: Shall be "dp". |
28 | -interrupt-parent: | 28 | -interrupt-parent: |
29 | phandle to Interrupt combiner node. | 29 | phandle to Interrupt combiner node. |
30 | -phys: | ||
31 | from general PHY binding: the phandle for the PHY device. | ||
32 | -phy-names: | ||
33 | from general PHY binding: Should be "dp". | ||
30 | -samsung,color-space: | 34 | -samsung,color-space: |
31 | input video data format. | 35 | input video data format. |
32 | COLOR_RGB = 0, COLOR_YCBCR422 = 1, COLOR_YCBCR444 = 2 | 36 | COLOR_RGB = 0, COLOR_YCBCR422 = 1, COLOR_YCBCR444 = 2 |
@@ -68,11 +72,8 @@ SOC specific portion: | |||
68 | clocks = <&clock 342>; | 72 | clocks = <&clock 342>; |
69 | clock-names = "dp"; | 73 | clock-names = "dp"; |
70 | 74 | ||
71 | dptx-phy { | 75 | phys = <&dp_phy>; |
72 | reg = <0x10040720>; | 76 | phy-names = "dp"; |
73 | samsung,enable-mask = <1>; | ||
74 | }; | ||
75 | |||
76 | }; | 77 | }; |
77 | 78 | ||
78 | Board Specific portion: | 79 | Board Specific portion: |