Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b3c9bf2 authored by Holger Schurig's avatar Holger Schurig Committed by Sascha Hauer
Browse files

imx21: activate i2c 



Set the correct clkdev-name for the i2c clock.

It also get's rid of the ARCH_NR_GPIOS define on the rationale
that isn't an ARCH-wide setting anyway. If a device has two
pca953x devices, the reserved number will be wrong.

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
parent 289a689b

arch/arm/mach-mx2/clock_imx21.c

+1 −1
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ static struct clk_lookup lookups[] __initdata = { 
	_REGISTER_CLOCK(NULL, "slcdc", slcdc_clk[0])

	_REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)

	_REGISTER_CLOCK(NULL, "gpio", gpio_clk)

	_REGISTER_CLOCK(NULL, "i2c", i2c_clk)

	_REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk)

	_REGISTER_CLOCK("mxc-keypad", NULL, kpp_clk)

	_REGISTER_CLOCK(NULL, "owire", owire_clk)

	_REGISTER_CLOCK(NULL, "rtc", rtc_clk)

arch/arm/plat-mxc/include/mach/mx21.h

+0 −3
Original line number Diff line number Diff line
@@ -54,9 +54,6 @@ 


#define IRAM_BASE_ADDR          0xFFFFE800	/* internal ram */



/* this CPU supports up to 192 GPIOs (don't forget the baseboard!) */

#define ARCH_NR_GPIOS		(6*32 + 16)



/* fixed interrupt numbers */

#define MXC_INT_USBCTRL         58

#define MXC_INT_USBCTRL         58