diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-16 23:58:49 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-16 23:58:49 (GMT) |
| commit | d0312d7edc84a5b3b2e2106fde644b61dd10fbf9 (patch) | |
| tree | b6d334f6bb6f91b4493bfb36d033411b206fce25 /arch/arm/boot/dts | |
| parent | 025c95a6826ad8acfe871f33c2fa9208beeb38df (diff) | |
| parent | 51f66191cf54ba3d62dd7e4a77dd376cc97de27f (diff) | |
| download | linux-d0312d7edc84a5b3b2e2106fde644b61dd10fbf9.tar.xz | |
Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup
ARM i.MX cleanup patches
* tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM i.MX53 clk: Fix ldb parent clocks
serial/imx: fix IMX UART macro usage to reflect correct processor
ARM: i.MX remove last leftovers from legacy clock support
ARM: i.MX clk pllv1: move mxc_decode_pll code to its user
ARM: imx27-phytec-phycore: Fix I2C EEPROM address
ARM i.MX mx2_camera: Remove MX2_CAMERA_SWAP16 and MX2_CAMERA_PACK_DIR_MSB flags.
ARM i.MX: remove duplicated include from clk-imx21.c
ARM: plat-mxc: Remove unused imx_ioremap
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/imx27-phytec-phycore.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore.dts b/arch/arm/boot/dts/imx27-phytec-phycore.dts index 2b0ff60..2acc86c 100644 --- a/arch/arm/boot/dts/imx27-phytec-phycore.dts +++ b/arch/arm/boot/dts/imx27-phytec-phycore.dts @@ -49,7 +49,7 @@ i2c@1001d000 { clock-frequency = <400000>; status = "okay"; - at24@4c { + at24@52 { compatible = "at,24c32"; pagesize = <32>; reg = <0x52>; |