diff options
Diffstat (limited to 'Documentation')
12 files changed, 94 insertions, 344 deletions
diff --git a/Documentation/arm/Marvell/README b/Documentation/arm/Marvell/README index 2cce5401e323..1af3a5d5621d 100644 --- a/Documentation/arm/Marvell/README +++ b/Documentation/arm/Marvell/README | |||
@@ -83,7 +83,9 @@ EBU Armada family | |||
83 | 88F6710 | 83 | 88F6710 |
84 | 88F6707 | 84 | 88F6707 |
85 | 88F6W11 | 85 | 88F6W11 |
86 | Product Brief: http://www.marvell.com/embedded-processors/armada-300/assets/Marvell_ARMADA_370_SoC.pdf | 86 | Product Brief: http://www.marvell.com/embedded-processors/armada-300/assets/Marvell_ARMADA_370_SoC.pdf |
87 | Hardware Spec: http://www.marvell.com/embedded-processors/armada-300/assets/ARMADA370-datasheet.pdf | ||
88 | Functional Spec: http://www.marvell.com/embedded-processors/armada-300/assets/ARMADA370-FunctionalSpec-datasheet.pdf | ||
87 | 89 | ||
88 | Armada 375 Flavors: | 90 | Armada 375 Flavors: |
89 | 88F6720 | 91 | 88F6720 |
diff --git a/Documentation/arm/Samsung/Overview.txt b/Documentation/arm/Samsung/Overview.txt index 658abb258cef..8f7309bad460 100644 --- a/Documentation/arm/Samsung/Overview.txt +++ b/Documentation/arm/Samsung/Overview.txt | |||
@@ -13,8 +13,6 @@ Introduction | |||
13 | 13 | ||
14 | - S3C24XX: See Documentation/arm/Samsung-S3C24XX/Overview.txt for full list | 14 | - S3C24XX: See Documentation/arm/Samsung-S3C24XX/Overview.txt for full list |
15 | - S3C64XX: S3C6400 and S3C6410 | 15 | - S3C64XX: S3C6400 and S3C6410 |
16 | - S5P6440 | ||
17 | - S5PC100 | ||
18 | - S5PC110 / S5PV210 | 16 | - S5PC110 / S5PV210 |
19 | 17 | ||
20 | 18 | ||
@@ -34,8 +32,6 @@ Configuration | |||
34 | A number of configurations are supplied, as there is no current way of | 32 | A number of configurations are supplied, as there is no current way of |
35 | unifying all the SoCs into one kernel. | 33 | unifying all the SoCs into one kernel. |
36 | 34 | ||
37 | s5p6440_defconfig - S5P6440 specific default configuration | ||
38 | s5pc100_defconfig - S5PC100 specific default configuration | ||
39 | s5pc110_defconfig - S5PC110 specific default configuration | 35 | s5pc110_defconfig - S5PC110 specific default configuration |
40 | s5pv210_defconfig - S5PV210 specific default configuration | 36 | s5pv210_defconfig - S5PV210 specific default configuration |
41 | 37 | ||
@@ -67,13 +63,6 @@ Layout changes | |||
67 | where to simplify the include and dependency issues involved with having | 63 | where to simplify the include and dependency issues involved with having |
68 | so many different platform directories. | 64 | so many different platform directories. |
69 | 65 | ||
70 | It was decided to remove plat-s5pc1xx as some of the support was already | ||
71 | in plat-s5p or plat-samsung, with the S5PC110 support added with S5PV210 | ||
72 | the only user was the S5PC100. The S5PC100 specific items where moved to | ||
73 | arch/arm/mach-s5pc100. | ||
74 | |||
75 | |||
76 | |||
77 | 66 | ||
78 | Port Contributors | 67 | Port Contributors |
79 | ----------------- | 68 | ----------------- |
diff --git a/Documentation/arm/Samsung/clksrc-change-registers.awk b/Documentation/arm/Samsung/clksrc-change-registers.awk index 0c50220851fb..d9174fabe37e 100755 --- a/Documentation/arm/Samsung/clksrc-change-registers.awk +++ b/Documentation/arm/Samsung/clksrc-change-registers.awk | |||
@@ -68,7 +68,6 @@ BEGIN { | |||
68 | 68 | ||
69 | while (getline line < ARGV[1] > 0) { | 69 | while (getline line < ARGV[1] > 0) { |
70 | if (line ~ /\#define.*_MASK/ && | 70 | if (line ~ /\#define.*_MASK/ && |
71 | !(line ~ /S5PC100_EPLL_MASK/) && | ||
72 | !(line ~ /USB_SIG_MASK/)) { | 71 | !(line ~ /USB_SIG_MASK/)) { |
73 | splitdefine(line, fields) | 72 | splitdefine(line, fields) |
74 | name = fields[0] | 73 | name = fields[0] |
diff --git a/Documentation/devicetree/bindings/arm/arm-boards b/Documentation/devicetree/bindings/arm/arm-boards index 3509707f9320..c554ed3d44fb 100644 --- a/Documentation/devicetree/bindings/arm/arm-boards +++ b/Documentation/devicetree/bindings/arm/arm-boards | |||
@@ -86,3 +86,9 @@ Interrupt controllers: | |||
86 | compatible = "arm,versatile-sic"; | 86 | compatible = "arm,versatile-sic"; |
87 | interrupt-controller; | 87 | interrupt-controller; |
88 | #interrupt-cells = <1>; | 88 | #interrupt-cells = <1>; |
89 | |||
90 | Required nodes: | ||
91 | |||
92 | - core-module: the root node to the Versatile platforms must have | ||
93 | a core-module with regs and the compatible strings | ||
94 | "arm,core-module-versatile", "syscon" | ||
diff --git a/Documentation/devicetree/bindings/arm/mediatek.txt b/Documentation/devicetree/bindings/arm/mediatek.txt new file mode 100644 index 000000000000..d6ac71f37314 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/mediatek.txt | |||
@@ -0,0 +1,8 @@ | |||
1 | Mediatek MT6589 Platforms Device Tree Bindings | ||
2 | |||
3 | Boards with a SoC of the Mediatek MT6589 shall have the following property: | ||
4 | |||
5 | Required root node property: | ||
6 | |||
7 | compatible: must contain "mediatek,mt6589" | ||
8 | |||
diff --git a/Documentation/devicetree/bindings/clock/arm-integrator.txt b/Documentation/devicetree/bindings/clock/arm-integrator.txt index 652914b17b95..ecc69520bcea 100644 --- a/Documentation/devicetree/bindings/clock/arm-integrator.txt +++ b/Documentation/devicetree/bindings/clock/arm-integrator.txt | |||
@@ -1,4 +1,4 @@ | |||
1 | Clock bindings for ARM Integrator Core Module clocks | 1 | Clock bindings for ARM Integrator and Versatile Core Module clocks |
2 | 2 | ||
3 | Auxilary Oscillator Clock | 3 | Auxilary Oscillator Clock |
4 | 4 | ||
@@ -12,7 +12,7 @@ parent node. | |||
12 | 12 | ||
13 | 13 | ||
14 | Required properties: | 14 | Required properties: |
15 | - compatible: must be "arm,integrator-cm-auxosc" | 15 | - compatible: must be "arm,integrator-cm-auxosc" or "arm,versatile-cm-auxosc" |
16 | - #clock-cells: must be <0> | 16 | - #clock-cells: must be <0> |
17 | 17 | ||
18 | Optional properties: | 18 | Optional properties: |
diff --git a/Documentation/devicetree/bindings/clock/imx1-clock.txt b/Documentation/devicetree/bindings/clock/imx1-clock.txt new file mode 100644 index 000000000000..b7adf4e3ea98 --- /dev/null +++ b/Documentation/devicetree/bindings/clock/imx1-clock.txt | |||
@@ -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 | }; | ||
diff --git a/Documentation/devicetree/bindings/clock/imx21-clock.txt b/Documentation/devicetree/bindings/clock/imx21-clock.txt new file mode 100644 index 000000000000..c3b0db437c48 --- /dev/null +++ b/Documentation/devicetree/bindings/clock/imx21-clock.txt | |||
@@ -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 | }; | ||
diff --git a/Documentation/devicetree/bindings/clock/imx27-clock.txt b/Documentation/devicetree/bindings/clock/imx27-clock.txt index 6bc9fd2c6631..cc05de9ec393 100644 --- a/Documentation/devicetree/bindings/clock/imx27-clock.txt +++ b/Documentation/devicetree/bindings/clock/imx27-clock.txt | |||
@@ -7,117 +7,22 @@ Required properties: | |||
7 | - #clock-cells: Should be <1> | 7 | - #clock-cells: Should be <1> |
8 | 8 | ||
9 | The clock consumer should specify the desired clock by having the clock | 9 | 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 | 10 | ID in its "clocks" phandle cell. See include/dt-bindings/clock/imx27-clock.h |
11 | clocks and IDs. | 11 | for the full list of i.MX27 clock 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 | ||
107 | 12 | ||
108 | Examples: | 13 | Examples: |
14 | clks: ccm@10027000{ | ||
15 | compatible = "fsl,imx27-ccm"; | ||
16 | reg = <0x10027000 0x1000>; | ||
17 | #clock-cells = <1>; | ||
18 | }; | ||
109 | 19 | ||
110 | clks: ccm@10027000{ | 20 | uart1: serial@1000a000 { |
111 | compatible = "fsl,imx27-ccm"; | 21 | compatible = "fsl,imx27-uart", "fsl,imx21-uart"; |
112 | reg = <0x10027000 0x1000>; | 22 | reg = <0x1000a000 0x1000>; |
113 | #clock-cells = <1>; | 23 | interrupts = <20>; |
114 | }; | 24 | clocks = <&clks IMX27_CLK_UART1_IPG_GATE>, |
115 | 25 | <&clks IMX27_CLK_PER1_GATE>; | |
116 | uart1: serial@1000a000 { | 26 | clock-names = "ipg", "per"; |
117 | compatible = "fsl,imx27-uart", "fsl,imx21-uart"; | 27 | status = "disabled"; |
118 | reg = <0x1000a000 0x1000>; | 28 | }; |
119 | interrupts = <20>; | ||
120 | clocks = <&clks 81>, <&clks 61>; | ||
121 | clock-names = "ipg", "per"; | ||
122 | status = "disabled"; | ||
123 | }; | ||
diff --git a/Documentation/devicetree/bindings/clock/imx6q-clock.txt b/Documentation/devicetree/bindings/clock/imx6q-clock.txt index 90ec91fe5ce0..9252912a5b0e 100644 --- a/Documentation/devicetree/bindings/clock/imx6q-clock.txt +++ b/Documentation/devicetree/bindings/clock/imx6q-clock.txt | |||
@@ -7,223 +7,13 @@ Required properties: | |||
7 | - #clock-cells: Should be <1> | 7 | - #clock-cells: Should be <1> |
8 | 8 | ||
9 | The clock consumer should specify the desired clock by having the clock | 9 | 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.MX6Q | 10 | ID in its "clocks" phandle cell. See include/dt-bindings/clock/imx6qdl-clock.h |
11 | clocks and IDs. | 11 | for the full list of i.MX6 Quad and DualLite clock IDs. |
12 | |||
13 | Clock ID | ||
14 | --------------------------- | ||
15 | dummy 0 | ||
16 | ckil 1 | ||
17 | ckih 2 | ||
18 | osc 3 | ||
19 | pll2_pfd0_352m 4 | ||
20 | pll2_pfd1_594m 5 | ||
21 | pll2_pfd2_396m 6 | ||
22 | pll3_pfd0_720m 7 | ||
23 | pll3_pfd1_540m 8 | ||
24 | pll3_pfd2_508m 9 | ||
25 | pll3_pfd3_454m 10 | ||
26 | pll2_198m 11 | ||
27 | pll3_120m 12 | ||
28 | pll3_80m 13 | ||
29 | pll3_60m 14 | ||
30 | twd 15 | ||
31 | step 16 | ||
32 | pll1_sw 17 | ||
33 | periph_pre 18 | ||
34 | periph2_pre 19 | ||
35 | periph_clk2_sel 20 | ||
36 | periph2_clk2_sel 21 | ||
37 | axi_sel 22 | ||
38 | esai_sel 23 | ||
39 | asrc_sel 24 | ||
40 | spdif_sel 25 | ||
41 | gpu2d_axi 26 | ||
42 | gpu3d_axi 27 | ||
43 | gpu2d_core_sel 28 | ||
44 | gpu3d_core_sel 29 | ||
45 | gpu3d_shader_sel 30 | ||
46 | ipu1_sel 31 | ||
47 | ipu2_sel 32 | ||
48 | ldb_di0_sel 33 | ||
49 | ldb_di1_sel 34 | ||
50 | ipu1_di0_pre_sel 35 | ||
51 | ipu1_di1_pre_sel 36 | ||
52 | ipu2_di0_pre_sel 37 | ||
53 | ipu2_di1_pre_sel 38 | ||
54 | ipu1_di0_sel 39 | ||
55 | ipu1_di1_sel 40 | ||
56 | ipu2_di0_sel 41 | ||
57 | ipu2_di1_sel 42 | ||
58 | hsi_tx_sel 43 | ||
59 | pcie_axi_sel 44 | ||
60 | ssi1_sel 45 | ||
61 | ssi2_sel 46 | ||
62 | ssi3_sel 47 | ||
63 | usdhc1_sel 48 | ||
64 | usdhc2_sel 49 | ||
65 | usdhc3_sel 50 | ||
66 | usdhc4_sel 51 | ||
67 | enfc_sel 52 | ||
68 | emi_sel 53 | ||
69 | emi_slow_sel 54 | ||
70 | vdo_axi_sel 55 | ||
71 | vpu_axi_sel 56 | ||
72 | cko1_sel 57 | ||
73 | periph 58 | ||
74 | periph2 59 | ||
75 | periph_clk2 60 | ||
76 | periph2_clk2 61 | ||
77 | ipg 62 | ||
78 | ipg_per 63 | ||
79 | esai_pred 64 | ||
80 | esai_podf 65 | ||
81 | asrc_pred 66 | ||
82 | asrc_podf 67 | ||
83 | spdif_pred 68 | ||
84 | spdif_podf 69 | ||
85 | can_root 70 | ||
86 | ecspi_root 71 | ||
87 | gpu2d_core_podf 72 | ||
88 | gpu3d_core_podf 73 | ||
89 | gpu3d_shader 74 | ||
90 | ipu1_podf 75 | ||
91 | ipu2_podf 76 | ||
92 | ldb_di0_podf 77 | ||
93 | ldb_di1_podf 78 | ||
94 | ipu1_di0_pre 79 | ||
95 | ipu1_di1_pre 80 | ||
96 | ipu2_di0_pre 81 | ||
97 | ipu2_di1_pre 82 | ||
98 | hsi_tx_podf 83 | ||
99 | ssi1_pred 84 | ||
100 | ssi1_podf 85 | ||
101 | ssi2_pred 86 | ||
102 | ssi2_podf 87 | ||
103 | ssi3_pred 88 | ||
104 | ssi3_podf 89 | ||
105 | uart_serial_podf 90 | ||
106 | usdhc1_podf 91 | ||
107 | usdhc2_podf 92 | ||
108 | usdhc3_podf 93 | ||
109 | usdhc4_podf 94 | ||
110 | enfc_pred 95 | ||
111 | enfc_podf 96 | ||
112 | emi_podf 97 | ||
113 | emi_slow_podf 98 | ||
114 | vpu_axi_podf 99 | ||
115 | cko1_podf 100 | ||
116 | axi 101 | ||
117 | mmdc_ch0_axi_podf 102 | ||
118 | mmdc_ch1_axi_podf 103 | ||
119 | arm 104 | ||
120 | ahb 105 | ||
121 | apbh_dma 106 | ||
122 | asrc 107 | ||
123 | can1_ipg 108 | ||
124 | can1_serial 109 | ||
125 | can2_ipg 110 | ||
126 | can2_serial 111 | ||
127 | ecspi1 112 | ||
128 | ecspi2 113 | ||
129 | ecspi3 114 | ||
130 | ecspi4 115 | ||
131 | ecspi5 116 | ||
132 | enet 117 | ||
133 | esai 118 | ||
134 | gpt_ipg 119 | ||
135 | gpt_ipg_per 120 | ||
136 | gpu2d_core 121 | ||
137 | gpu3d_core 122 | ||
138 | hdmi_iahb 123 | ||
139 | hdmi_isfr 124 | ||
140 | i2c1 125 | ||
141 | i2c2 126 | ||
142 | i2c3 127 | ||
143 | iim 128 | ||
144 | enfc 129 | ||
145 | ipu1 130 | ||
146 | ipu1_di0 131 | ||
147 | ipu1_di1 132 | ||
148 | ipu2 133 | ||
149 | ipu2_di0 134 | ||
150 | ldb_di0 135 | ||
151 | ldb_di1 136 | ||
152 | ipu2_di1 137 | ||
153 | hsi_tx 138 | ||
154 | mlb 139 | ||
155 | mmdc_ch0_axi 140 | ||
156 | mmdc_ch1_axi 141 | ||
157 | ocram 142 | ||
158 | openvg_axi 143 | ||
159 | pcie_axi 144 | ||
160 | pwm1 145 | ||
161 | pwm2 146 | ||
162 | pwm3 147 | ||
163 | pwm4 148 | ||
164 | per1_bch 149 | ||
165 | gpmi_bch_apb 150 | ||
166 | gpmi_bch 151 | ||
167 | gpmi_io 152 | ||
168 | gpmi_apb 153 | ||
169 | sata 154 | ||
170 | sdma 155 | ||
171 | spba 156 | ||
172 | ssi1 157 | ||
173 | ssi2 158 | ||
174 | ssi3 159 | ||
175 | uart_ipg 160 | ||
176 | uart_serial 161 | ||
177 | usboh3 162 | ||
178 | usdhc1 163 | ||
179 | usdhc2 164 | ||
180 | usdhc3 165 | ||
181 | usdhc4 166 | ||
182 | vdo_axi 167 | ||
183 | vpu_axi 168 | ||
184 | cko1 169 | ||
185 | pll1_sys 170 | ||
186 | pll2_bus 171 | ||
187 | pll3_usb_otg 172 | ||
188 | pll4_audio 173 | ||
189 | pll5_video 174 | ||
190 | pll8_mlb 175 | ||
191 | pll7_usb_host 176 | ||
192 | pll6_enet 177 | ||
193 | ssi1_ipg 178 | ||
194 | ssi2_ipg 179 | ||
195 | ssi3_ipg 180 | ||
196 | rom 181 | ||
197 | usbphy1 182 | ||
198 | usbphy2 183 | ||
199 | ldb_di0_div_3_5 184 | ||
200 | ldb_di1_div_3_5 185 | ||
201 | sata_ref 186 | ||
202 | sata_ref_100m 187 | ||
203 | pcie_ref 188 | ||
204 | pcie_ref_125m 189 | ||
205 | enet_ref 190 | ||
206 | usbphy1_gate 191 | ||
207 | usbphy2_gate 192 | ||
208 | pll4_post_div 193 | ||
209 | pll5_post_div 194 | ||
210 | pll5_video_div 195 | ||
211 | eim_slow 196 | ||
212 | spdif 197 | ||
213 | cko2_sel 198 | ||
214 | cko2_podf 199 | ||
215 | cko2 200 | ||
216 | cko 201 | ||
217 | vdoa 202 | ||
218 | pll4_audio_div 203 | ||
219 | lvds1_sel 204 | ||
220 | lvds2_sel 205 | ||
221 | lvds1_gate 206 | ||
222 | lvds2_gate 207 | ||
223 | esai_ahb 208 | ||
224 | 12 | ||
225 | Examples: | 13 | Examples: |
226 | 14 | ||
15 | #include <dt-bindings/clock/imx6qdl-clock.h> | ||
16 | |||
227 | clks: ccm@020c4000 { | 17 | clks: ccm@020c4000 { |
228 | compatible = "fsl,imx6q-ccm"; | 18 | compatible = "fsl,imx6q-ccm"; |
229 | reg = <0x020c4000 0x4000>; | 19 | reg = <0x020c4000 0x4000>; |
@@ -235,7 +25,7 @@ uart1: serial@02020000 { | |||
235 | compatible = "fsl,imx6q-uart", "fsl,imx21-uart"; | 25 | compatible = "fsl,imx6q-uart", "fsl,imx21-uart"; |
236 | reg = <0x02020000 0x4000>; | 26 | reg = <0x02020000 0x4000>; |
237 | interrupts = <0 26 0x04>; | 27 | interrupts = <0 26 0x04>; |
238 | clocks = <&clks 160>, <&clks 161>; | 28 | clocks = <&clks IMX6QDL_CLK_UART_IPG>, <&clks IMX6QDL_CLK_UART_SERIAL>; |
239 | clock-names = "ipg", "per"; | 29 | clock-names = "ipg", "per"; |
240 | status = "disabled"; | 30 | status = "disabled"; |
241 | }; | 31 | }; |
diff --git a/Documentation/devicetree/bindings/spi/spi-samsung.txt b/Documentation/devicetree/bindings/spi/spi-samsung.txt index 86aa061f069f..fe6f9037b561 100644 --- a/Documentation/devicetree/bindings/spi/spi-samsung.txt +++ b/Documentation/devicetree/bindings/spi/spi-samsung.txt | |||
@@ -8,7 +8,6 @@ Required SoC Specific Properties: | |||
8 | - compatible: should be one of the following. | 8 | - compatible: should be one of the following. |
9 | - samsung,s3c2443-spi: for s3c2443, s3c2416 and s3c2450 platforms | 9 | - samsung,s3c2443-spi: for s3c2443, s3c2416 and s3c2450 platforms |
10 | - samsung,s3c6410-spi: for s3c6410 platforms | 10 | - samsung,s3c6410-spi: for s3c6410 platforms |
11 | - samsung,s5p6440-spi: for s5p6440 and s5p6450 platforms | ||
12 | - samsung,s5pv210-spi: for s5pv210 and s5pc110 platforms | 11 | - samsung,s5pv210-spi: for s5pv210 and s5pc110 platforms |
13 | - samsung,exynos4210-spi: for exynos4 and exynos5 platforms | 12 | - samsung,exynos4210-spi: for exynos4 and exynos5 platforms |
14 | 13 | ||
diff --git a/Documentation/devicetree/bindings/video/samsung-fimd.txt b/Documentation/devicetree/bindings/video/samsung-fimd.txt index 2dad41b689af..77942607f77f 100644 --- a/Documentation/devicetree/bindings/video/samsung-fimd.txt +++ b/Documentation/devicetree/bindings/video/samsung-fimd.txt | |||
@@ -8,8 +8,6 @@ Required properties: | |||
8 | - compatible: value should be one of the following | 8 | - compatible: value should be one of the following |
9 | "samsung,s3c2443-fimd"; /* for S3C24XX SoCs */ | 9 | "samsung,s3c2443-fimd"; /* for S3C24XX SoCs */ |
10 | "samsung,s3c6400-fimd"; /* for S3C64XX SoCs */ | 10 | "samsung,s3c6400-fimd"; /* for S3C64XX SoCs */ |
11 | "samsung,s5p6440-fimd"; /* for S5P64X0 SoCs */ | ||
12 | "samsung,s5pc100-fimd"; /* for S5PC100 SoC */ | ||
13 | "samsung,s5pv210-fimd"; /* for S5PV210 SoC */ | 11 | "samsung,s5pv210-fimd"; /* for S5PV210 SoC */ |
14 | "samsung,exynos4210-fimd"; /* for Exynos4 SoCs */ | 12 | "samsung,exynos4210-fimd"; /* for Exynos4 SoCs */ |
15 | "samsung,exynos5250-fimd"; /* for Exynos5 SoCs */ | 13 | "samsung,exynos5250-fimd"; /* for Exynos5 SoCs */ |