diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-07 18:18:08 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-07 18:18:19 -0700 |
| commit | 3d0d8b9155b2a60e3d2498e7d928051043d2d546 (patch) | |
| tree | 970ddbaf041a3cc7fd1383a5e21863f6342c8e47 /.gitignore | |
| parent | 9c1fcdccc7ce5611ec1edf45dbbe51b10e333bd3 (diff) | |
| parent | a08b9bc586a7810cdebbc316d5cbaed56a2a04a9 (diff) | |
| download | op-kernel-dev-3d0d8b9155b2a60e3d2498e7d928051043d2d546.zip op-kernel-dev-3d0d8b9155b2a60e3d2498e7d928051043d2d546.tar.gz | |
Merge tag 'imx-fixes-3.10-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
From Shawn Guo, imx fixes for 3.10, take 2:
- One device tree fix for all spi node to have per clock added.
The clock is needed by spi driver to calculate bit rate divisor.
The spi node in the current device trees either does not have the
clock or is defined as dummy clock, in which case the driver probe
will fail or spi will run at a wrong bit rate.
- Two imx6q clock fixes, which correct axi_sels and ldb_di_sels.
* tag 'imx-fixes-3.10-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: imx: clk-imx6q: AXI clock select index is incorrect
ARM: dts: imx: fix clocks for cspi
ARM i.MX6q: fix for ldb_di_sels
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions
