diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-05 12:59:29 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-05 12:59:29 +0200 |
| commit | 2c8c801c674eb8ad05f54a49b427318fc5ae9d90 (patch) | |
| tree | e98b5d390ef32e510861df0196d48551f7c48e25 /arch | |
| parent | e5a927883ea8f85e2258d5e15ac6ede8f44aeaab (diff) | |
| parent | 7b6529354db5b95341cc57fad859a5a3993c74c6 (diff) | |
| download | barebox-2c8c801c674eb8ad05f54a49b427318fc5ae9d90.tar.gz barebox-2c8c801c674eb8ad05f54a49b427318fc5ae9d90.tar.xz | |
Merge branch 'for-next/mc13xxx'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/ccxmx51/ccxmx51.c | 2 | ||||
| -rw-r--r-- | arch/arm/boards/freescale-mx35-3-stack/3stack.c | 4 | ||||
| -rw-r--r-- | arch/arm/boards/freescale-mx51-pdk/board.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/boards/ccxmx51/ccxmx51.c b/arch/arm/boards/ccxmx51/ccxmx51.c index f309e0c693..0b450d64e7 100644 --- a/arch/arm/boards/ccxmx51/ccxmx51.c +++ b/arch/arm/boards/ccxmx51/ccxmx51.c @@ -307,7 +307,7 @@ static int ccxmx51_power_init(void) mc13xxx_reg_write(mc13xxx_dev, MC13892_REG_SW_2, val); } - if (mc13xxx_dev->revision <= MC13892_REVISION_2_0) { + if (mc13xxx_revision(mc13xxx_dev) <= MC13892_REVISION_2_0) { /* Set switchers in PWM mode for Atlas 2.0 and lower */ /* Setup the switcher mode for SW1 & SW2*/ mc13xxx_reg_read(mc13xxx_dev, MC13892_REG_SW_4, &val); diff --git a/arch/arm/boards/freescale-mx35-3-stack/3stack.c b/arch/arm/boards/freescale-mx35-3-stack/3stack.c index c71e668c93..cfd2c16f0d 100644 --- a/arch/arm/boards/freescale-mx35-3-stack/3stack.c +++ b/arch/arm/boards/freescale-mx35-3-stack/3stack.c @@ -362,7 +362,6 @@ static int f3s_get_rev(struct mc13xxx *mc13xxx) if (err) return err; - dev_info(&mc13xxx->client->dev, "revision: 0x%x\n", rev); if (rev == 0x00ffffff) return -ENODEV; @@ -379,8 +378,7 @@ static int f3s_pmic_init_v2(struct mc13xxx *mc13xxx) err |= mc13xxx_set_bits(mc13xxx, MC13892_REG_SETTING_0, 0x03, 0x03); err |= mc13xxx_set_bits(mc13xxx, MC13892_REG_MODE_0, 0x01, 0x01); if (err) - dev_err(&mc13xxx->client->dev, - "Init sequence failed, the system might not be working!\n"); + printf("mc13892 Init sequence failed, the system might not be working!\n"); return err; } diff --git a/arch/arm/boards/freescale-mx51-pdk/board.c b/arch/arm/boards/freescale-mx51-pdk/board.c index 7c2c8fe71e..b67a509680 100644 --- a/arch/arm/boards/freescale-mx51-pdk/board.c +++ b/arch/arm/boards/freescale-mx51-pdk/board.c @@ -178,7 +178,7 @@ static void babbage_power_init(void) mc13xxx_reg_write(mc13xxx, MC13892_REG_SW_2, val); } - if (mc13xxx->revision < MC13892_REVISION_2_0) { + if (mc13xxx_revision(mc13xxx) < MC13892_REVISION_2_0) { /* Set switchers in PWM mode for Atlas 2.0 and lower */ /* Setup the switcher mode for SW1 & SW2*/ mc13xxx_reg_read(mc13xxx, MC13892_REG_SW_4, &val); |