diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2013-07-12 00:24:07 +0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-15 10:19:36 +0200 |
| commit | d93a43c8fcccdd09355737a1a4d6e5392d5f630d (patch) | |
| tree | 265236e6f9a098a1bafe04dee9dc2c06bc7fedeb /arch/arm | |
| parent | 8c1a4930e1294e41d78b01e5e59007cb2a534236 (diff) | |
| download | barebox-d93a43c8fcccdd09355737a1a4d6e5392d5f630d.tar.gz barebox-d93a43c8fcccdd09355737a1a4d6e5392d5f630d.tar.xz | |
mfd: mc13xxx: Add support for MC34708
This patch moves support for MC34708 PMIC into mc13xxx driver.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boards/freescale-mx53-loco/board.c | 6 | ||||
| -rw-r--r-- | arch/arm/configs/freescale_mx53_loco_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/boards/freescale-mx53-loco/board.c b/arch/arm/boards/freescale-mx53-loco/board.c index 3c8842c300..15dc591aae 100644 --- a/arch/arm/boards/freescale-mx53-loco/board.c +++ b/arch/arm/boards/freescale-mx53-loco/board.c @@ -23,7 +23,7 @@ #include <fs.h> #include <io.h> -#include <mfd/mc34708.h> +#include <mfd/mc13xxx.h> #include <i2c/i2c.h> #include <asm/armlinux.h> @@ -80,7 +80,7 @@ extern char flash_header_imx53_loco_end[]; static int loco_late_init(void) { - struct mc34708 *mc34708; + struct mc13xxx *mc34708; int rev; if (!of_machine_is_compatible("fsl,imx53-qsb")) @@ -90,7 +90,7 @@ static int loco_late_init(void) devfs_add_partition("mmc0", 0x40000, 0x20000, DEVFS_PARTITION_FIXED, "env0"); - mc34708 = mc34708_get(); + mc34708 = mc13xxx_get(); if (mc34708) { /* get the board revision from fuse */ rev = readl(MX53_IIM_BASE_ADDR + 0x878); diff --git a/arch/arm/configs/freescale_mx53_loco_defconfig b/arch/arm/configs/freescale_mx53_loco_defconfig index dbf4f4e890..886394485b 100644 --- a/arch/arm/configs/freescale_mx53_loco_defconfig +++ b/arch/arm/configs/freescale_mx53_loco_defconfig @@ -78,7 +78,7 @@ CONFIG_USB_EHCI=y CONFIG_USB_STORAGE=y CONFIG_MCI=y CONFIG_MCI_IMX_ESDHC=y -CONFIG_MFD_MC34708=y +CONFIG_MFD_MC13XXX=y CONFIG_WATCHDOG=y CONFIG_WATCHDOG_IMX=y CONFIG_FS_TFTP=y diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index e088c2cf7b..9655ac240d 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -110,7 +110,6 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y CONFIG_MCI_IMX_ESDHC=y CONFIG_MFD_MC13XXX=y CONFIG_MFD_MC34704=y -CONFIG_MFD_MC34708=y CONFIG_MFD_MC9SDZ60=y CONFIG_MFD_STMPE=y CONFIG_LED=y |