mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
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: Holger Schurig <hs4233@mail.mn-solutions.de>
This commit is contained in:
parent
289a689b10
commit
1b3c9bf2cd
2 changed files with 1 additions and 4 deletions
|
@ -931,7 +931,7 @@ static struct clk_lookup lookups[] __initdata = {
|
||||||
_REGISTER_CLOCK(NULL, "slcdc", slcdc_clk[0])
|
_REGISTER_CLOCK(NULL, "slcdc", slcdc_clk[0])
|
||||||
_REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)
|
_REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)
|
||||||
_REGISTER_CLOCK(NULL, "gpio", gpio_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("mxc-keypad", NULL, kpp_clk)
|
||||||
_REGISTER_CLOCK(NULL, "owire", owire_clk)
|
_REGISTER_CLOCK(NULL, "owire", owire_clk)
|
||||||
_REGISTER_CLOCK(NULL, "rtc", rtc_clk)
|
_REGISTER_CLOCK(NULL, "rtc", rtc_clk)
|
||||||
|
|
|
@ -54,9 +54,6 @@
|
||||||
|
|
||||||
#define IRAM_BASE_ADDR 0xFFFFE800 /* internal ram */
|
#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 */
|
/* fixed interrupt numbers */
|
||||||
#define MXC_INT_USBCTRL 58
|
#define MXC_INT_USBCTRL 58
|
||||||
#define MXC_INT_USBCTRL 58
|
#define MXC_INT_USBCTRL 58
|
||||||
|
|
Loading…
Reference in a new issue