diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-28 15:43:08 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-28 18:01:12 -0400 |
| commit | afcf7924ecab726dab0227188783c4a40d9f0eec (patch) | |
| tree | 606b0883c0ad3fb2ef04f0f036a55ed3875fdc9b /arch/arm/boot/dts/imx28-m28evk.dts | |
| parent | dc9c220304c882f06aaadf427821c6388782aab8 (diff) | |
| parent | d21be237ffa357e55005e2bf9ffef10b23c184d0 (diff) | |
Merge branch 'fixes' into next/cleanup
Merging in fixes since there's a conflict in the omap4 clock tables caused by
it.
* fixes: (245 commits)
ARM: highbank: fix cache flush ordering for cpu hotplug
ARM: OMAP4: hwmod data: make 'ocp2scp_usb_phy_phy_48m" as the main clock
arm: mvebu: Fix the irq map function in SMP mode
Fix GE0/GE1 init on ix2-200 as GE0 has no PHY
ARM: S3C24XX: Fix interrupt pending register offset of the EINT controller
ARM: S3C24XX: Correct NR_IRQS definition for s3c2440
ARM i.MX6: Fix ldb_di clock selection
ARM: imx: provide twd clock lookup from device tree
ARM: imx35 Bugfix admux clock
ARM: clk-imx35: Bugfix iomux clock
+ Linux 3.9-rc6
Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
arch/arm/mach-omap2/cclock44xx_data.c
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 6ce3d17c3a29..fd36e1cca104 100644 --- a/arch/arm/boot/dts/imx28-m28evk.dts +++ b/arch/arm/boot/dts/imx28-m28evk.dts | |||
| @@ -152,7 +152,6 @@ | |||
| 152 | i2c0: i2c@80058000 { | 152 | i2c0: i2c@80058000 { |
| 153 | pinctrl-names = "default"; | 153 | pinctrl-names = "default"; |
| 154 | pinctrl-0 = <&i2c0_pins_a>; | 154 | pinctrl-0 = <&i2c0_pins_a>; |
| 155 | clock-frequency = <400000>; | ||
| 156 | status = "okay"; | 155 | status = "okay"; |
| 157 | 156 | ||
| 158 | sgtl5000: codec@0a { | 157 | sgtl5000: codec@0a { |