diff options
| author | Olof Johansson <olof@lixom.net> | 2014-10-25 23:44:05 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-10-25 23:44:05 -0400 |
| commit | efc176a8ee1f959b89292597bd8a99417475a79a (patch) | |
| tree | 0c510012697520be345f2ec4f0e2a1f32d46c89f /arch/arm/boot/dts/imx28-evk.dts | |
| parent | 4fbc400cfc56fb6cb62197ff2244696770251bdf (diff) | |
| parent | d1e61eb443dc7512885dfe89ee2f2a1c29fcb1da (diff) | |
Merge tag 'imx-fixes-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
Merge "ARM: imx: fixes for 3.18" from Shawn Guo:
The i.MX fixes for 3.18:
- Revert one patch which increases I2C bus frequency on imx28-evk
- Fix a typo on imx6q EIM clock name
* tag 'imx-fixes-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: imx28-evk: Let i2c0 run at 100kHz
ARM: i.MX6: Fix "emi" clock name typo
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/imx28-evk.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx28-evk.dts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts index 09664fcf5afb..0e13b4b10a92 100644 --- a/arch/arm/boot/dts/imx28-evk.dts +++ b/arch/arm/boot/dts/imx28-evk.dts | |||
| @@ -193,7 +193,6 @@ | |||
| 193 | i2c0: i2c@80058000 { | 193 | i2c0: i2c@80058000 { |
| 194 | pinctrl-names = "default"; | 194 | pinctrl-names = "default"; |
| 195 | pinctrl-0 = <&i2c0_pins_a>; | 195 | pinctrl-0 = <&i2c0_pins_a>; |
| 196 | clock-frequency = <400000>; | ||
| 197 | status = "okay"; | 196 | status = "okay"; |
| 198 | 197 | ||
| 199 | sgtl5000: codec@0a { | 198 | sgtl5000: codec@0a { |