omap: Split i2c platform init for mach-omap1 and mach-omap2
Subsystems (4)
Tony Lindgren
maintainerPATCH 1/1 omap: Split i2c platform init for mach-omap1 and mach-omap2
Otherwise we cannot limit new mux code to mach-omap2. The same signal names should eventually work for other omaps under mach-omap2.
Note that these pins don't need to be OMAP_PIN_INPUT_PULLUP, just OMAP_PIN_INPUT is enough.
Cc Jarkko Nikula <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
arch/arm/mach-omap1/Makefile +3 -0
@@ -17,6 +17,9 @@ obj-$(CONFIG_PM) += pm.o sleep.o obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o mailbox_mach-objs := mailbox.o +i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o +obj-y += $(i2c-omap-m) $(i2c-omap-y) + led-y := leds.o # Specific board support
arch/arm/mach-omap1/i2c.c new file +33 -0
@@ -0,0 +1,33 @@ +/* +* Helper module for board specific I2C bus registration +* +* Copyright (C) 2009 Nokia Corporation. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA +* +*/ + +#include <plat/i2c.h> +#include <plat/mux.h> + +int __init omap_register_i2c_bus (int bus_id,u32 clkrate, +struct i2c_board_info const *info, +unsigned len) +{ +omap_cfg_reg (I2C_SDA ); +omap_cfg_reg (I2C_SCL ); + +return omap_plat_register_i2c_bus (bus_id, clkrate, info, len); +}
arch/arm/mach-omap2/Makefile +3 -0
@@ -56,6 +56,9 @@ iommu-$(CONFIG_ARCH_OMAP3) += omap3-iommu.o obj-$(CONFIG_OMAP_IOMMU) += $(iommu-y) +i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o +obj-y += $(i2c-omap-m) $(i2c-omap-y) + # Specific board support obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o
arch/arm/mach-omap2/i2c.c new file +56 -0
56 lines not on this page · raw message
arch/arm/plat-omap/i2c.c +2 -42
70 lines not on this page · raw message
arch/arm/plat-omap/include/plat/common.h +1 -13
@@ -27,7 +27,7 @@#ifndef __ARCH_ARM_MACH_OMAP_COMMON_H#define __ARCH_ARM_MACH_OMAP_COMMON_H -#include <linux/i2c.h> +#include <plat/i2c.h> struct sys_timer ;
@@ -36,18 +36,6 @@ extern void __iomem *gic_cpu_base_addr;extern void omap_map_common_io (void );extern struct sys_timer omap_timer; -#if defined(CONFIG_I2C_OMAP ) || defined(CONFIG_I2C_OMAP_MODULE ) -extern int omap_register_i2c_bus (int bus_id,u32 clkrate, -struct i2c_board_info const *info, -unsigned len); -#else -static inline int omap_register_i2c_bus (int bus_id,u32 clkrate, -struct i2c_board_info const *info, -unsigned len) -{ -return 0 ; -} -#endif /* IO bases for various OMAP processors */ struct omap_globals {
arch/arm/plat-omap/include/plat/i2c.h new file +39 -0
@@ -0,0 +1,39 @@ +/* +* Helper module for board specific I2C bus registration +* +* Copyright (C) 2009 Nokia Corporation. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA +* +*/ + +#include <linux/i2c.h> + +#if defined(CONFIG_I2C_OMAP ) || defined(CONFIG_I2C_OMAP_MODULE ) +extern int omap_register_i2c_bus (int bus_id,u32 clkrate, +struct i2c_board_info const *info, +unsigned len); +#else +static inline int omap_register_i2c_bus (int bus_id,u32 clkrate, +struct i2c_board_info const *info, +unsigned len) +{ +return 0 ; +} +#endif + +int omap_plat_register_i2c_bus (int bus_id,u32 clkrate, +struct i2c_board_info const *info, +unsigned len);
--4SFOXa2GPu3tIq4H--