diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-05-06 23:38:00 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-05-06 23:38:00 +0200 |
commit | 4183bef2e093a2f0aab45f2d5fed82b0e02aeacf (patch) | |
tree | e84c484db3746a0f3ead0fb7a2bb9e5a42b89e85 /arch/arm/boot/dts/imx28-m28evk.dts | |
parent | ARM: dts: add mshc controller node for Exynos4x12 SoCs (diff) | |
parent | Merge tag 'late-exynos-v3-for-v3.10' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
download | linux-4183bef2e093a2f0aab45f2d5fed82b0e02aeacf.tar.xz linux-4183bef2e093a2f0aab45f2d5fed82b0e02aeacf.zip |
Merge branch 'late/dt' into next/dt2
This is support for the ARM Chromebook, originally scheduled
as a "late" pull request. Since it's already late now, we
can combine this into the existing next/dt2 branch.
* late/dt:
ARM: exynos: dts: cros5250: add EC device
ARM: dts: Add sbs-battery for exynos5250-snow
ARM: dts: Add i2c-arbitrator bus for exynos5250-snow
ARM: dts: Add chip-id controller node on Exynos4/5 SoC
ARM: EXYNOS: Create virtual I/O mapping for Chip-ID controller using device tree
Diffstat (limited to 'arch/arm/boot/dts/imx28-m28evk.dts')
-rw-r--r-- | arch/arm/boot/dts/imx28-m28evk.dts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts index 5f0ba99aa809..5aa44e05c9f5 100644 --- a/arch/arm/boot/dts/imx28-m28evk.dts +++ b/arch/arm/boot/dts/imx28-m28evk.dts @@ -177,7 +177,6 @@ i2c0: i2c@80058000 { pinctrl-names = "default"; pinctrl-0 = <&i2c0_pins_a>; - clock-frequency = <400000>; status = "okay"; sgtl5000: codec@0a { |