diff options
| author | Richard Zhu <r65037@freescale.com> | 2013-11-07 16:44:23 +0800 |
|---|---|---|
| committer | Richard Zhu <r65037@freescale.com> | 2013-11-20 14:10:25 +0800 |
| commit | adaacb0f426a5a80cdf13874e9e779d745960107 (patch) | |
| tree | 1a0f155cf2fb317b0f95718cbbf14b300a82850b /Documentation | |
| parent | 890d36b29dc192446cf8ba40691e60440e43f7d4 (diff) | |
ENGR00288568 Revert "ENGR00275213-1 arm: pcie: enable pcie on imx6 platforms"
switch to community upstreamed pcie driver.
Revert "ENGR00275213-1 arm: pcie: enable pcie on imx6 platforms"
This reverts commit d33370c77e57aed5a9b6733c9898418541fed54a.
Conflicts:
Documentation/devicetree/bindings/clock/imx6q-clock.txt
arch/arm/mach-imx/clk-imx6q.c
Signed-off-by: Richard Zhu <r65037@freescale.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/clock/imx6q-clock.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/clock/imx6q-clock.txt b/Documentation/devicetree/bindings/clock/imx6q-clock.txt index b289100d6599..02ad1574df10 100644 --- a/Documentation/devicetree/bindings/clock/imx6q-clock.txt +++ b/Documentation/devicetree/bindings/clock/imx6q-clock.txt @@ -220,9 +220,9 @@ clocks and IDs. ldb_di0_div_sel 207 ldb_di1_div_sel 208 pll4_audio_div 209 - lvds1_sel 210 - lvds1_in 211 - lvds1_out 212 + pcie_dummy1 210 + pcie_dummy2 211 + pcie_dummy3 212 caam_mem 213 caam_aclk 214 caam_ipg 215 |