diff for duplicates of <20091127174445.GO4348@atomide.com> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 9f45c39..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/x-diff; charset=us-ascii -Content-Disposition: inline; filename="mux-fix-i2c.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 088d426..0000000 --- a/a/2.txt +++ /dev/null @@ -1,299 +0,0 @@ ->From 8cadff260f4212873501bbc4e4d2e62c40668ec9 Mon Sep 17 00:00:00 2001 -From: Tony Lindgren <tony@atomide.com> -Date: Wed, 25 Nov 2009 10:46:07 -0800 -Subject: [PATCH] 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 <jhnikula@gmail.com> -Signed-off-by: Tony Lindgren <tony@atomide.com> - -diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile -index 87e539a..51bc195 100644 ---- a/arch/arm/mach-omap1/Makefile -+++ b/arch/arm/mach-omap1/Makefile -@@ -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 -diff --git a/arch/arm/mach-omap1/i2c.c b/arch/arm/mach-omap1/i2c.c -new file mode 100644 -index 0000000..bc9d12b ---- /dev/null -+++ b/arch/arm/mach-omap1/i2c.c -@@ -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); -+} -diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile -index 34117f2..8b5fea8 100644 ---- a/arch/arm/mach-omap2/Makefile -+++ b/arch/arm/mach-omap2/Makefile -@@ -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 -diff --git a/arch/arm/mach-omap2/i2c.c b/arch/arm/mach-omap2/i2c.c -new file mode 100644 -index 0000000..789ca8c ---- /dev/null -+++ b/arch/arm/mach-omap2/i2c.c -@@ -0,0 +1,56 @@ -+/* -+ * 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/cpu.h> -+#include <plat/i2c.h> -+#include <plat/mux.h> -+ -+#include "mux.h" -+ -+int __init omap_register_i2c_bus(int bus_id, u32 clkrate, -+ struct i2c_board_info const *info, -+ unsigned len) -+{ -+ if (cpu_is_omap24xx()) { -+ const int omap24xx_pins[][2] = { -+ { M19_24XX_I2C1_SCL, L15_24XX_I2C1_SDA }, -+ { J15_24XX_I2C2_SCL, H19_24XX_I2C2_SDA }, -+ }; -+ int scl, sda; -+ -+ scl = omap24xx_pins[bus_id - 1][0]; -+ sda = omap24xx_pins[bus_id - 1][1]; -+ omap_cfg_reg(sda); -+ omap_cfg_reg(scl); -+ } -+ -+ /* First I2C bus is not muxable */ -+ if (cpu_is_omap34xx() && bus_id > 1) { -+ char mux_name[sizeof("i2c2_scl.i2c2_scl")]; -+ -+ sprintf(mux_name, "i2c%i_scl.i2c%i_scl", bus_id, bus_id); -+ omap_mux_init_signal(mux_name, OMAP_PIN_INPUT); -+ sprintf(mux_name, "i2c%i_sda.i2c%i_sda", bus_id, bus_id); -+ omap_mux_init_signal(mux_name, OMAP_PIN_INPUT); -+ } -+ -+ return omap_plat_register_i2c_bus(bus_id, clkrate, info, len); -+} -diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c -index c08362d..33fff4e 100644 ---- a/arch/arm/plat-omap/i2c.c -+++ b/arch/arm/plat-omap/i2c.c -@@ -80,47 +80,8 @@ static struct platform_device omap_i2c_devices[] = { - #endif - }; - --#if defined(CONFIG_ARCH_OMAP24XX) --static const int omap24xx_pins[][2] = { -- { M19_24XX_I2C1_SCL, L15_24XX_I2C1_SDA }, -- { J15_24XX_I2C2_SCL, H19_24XX_I2C2_SDA }, --}; --#else --static const int omap24xx_pins[][2] = {}; --#endif --#if defined(CONFIG_ARCH_OMAP34XX) --static const int omap34xx_pins[][2] = { -- { K21_34XX_I2C1_SCL, J21_34XX_I2C1_SDA}, -- { AF15_34XX_I2C2_SCL, AE15_34XX_I2C2_SDA}, -- { AF14_34XX_I2C3_SCL, AG14_34XX_I2C3_SDA}, --}; --#else --static const int omap34xx_pins[][2] = {}; --#endif -- - #define OMAP_I2C_CMDLINE_SETUP (BIT(31)) - --static void __init omap_i2c_mux_pins(int bus) --{ -- int scl, sda; -- -- if (cpu_class_is_omap1()) { -- scl = I2C_SCL; -- sda = I2C_SDA; -- } else if (cpu_is_omap24xx()) { -- scl = omap24xx_pins[bus][0]; -- sda = omap24xx_pins[bus][1]; -- } else if (cpu_is_omap34xx()) { -- scl = omap34xx_pins[bus][0]; -- sda = omap34xx_pins[bus][1]; -- } else { -- return; -- } -- -- omap_cfg_reg(sda); -- omap_cfg_reg(scl); --} -- - static int __init omap_i2c_nr_ports(void) - { - int ports = 0; -@@ -156,7 +117,6 @@ static int __init omap_i2c_add_bus(int bus_id) - res[1].start = irq; - } - -- omap_i2c_mux_pins(bus_id - 1); - return platform_device_register(pdev); - } - -@@ -209,7 +169,7 @@ out: - subsys_initcall(omap_register_i2c_bus_cmdline); - - /** -- * omap_register_i2c_bus - register I2C bus with device descriptors -+ * omap_plat_register_i2c_bus - register I2C bus with device descriptors - * @bus_id: bus id counting from number 1 - * @clkrate: clock rate of the bus in kHz - * @info: pointer into I2C device descriptor table or NULL -@@ -217,7 +177,7 @@ subsys_initcall(omap_register_i2c_bus_cmdline); - * - * Returns 0 on success or an error code. - */ --int __init omap_register_i2c_bus(int bus_id, u32 clkrate, -+int __init omap_plat_register_i2c_bus(int bus_id, u32 clkrate, - struct i2c_board_info const *info, - unsigned len) - { -diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h -index 064f173..754fbc8 100644 ---- a/arch/arm/plat-omap/include/plat/common.h -+++ b/arch/arm/plat-omap/include/plat/common.h -@@ -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 { -diff --git a/arch/arm/plat-omap/include/plat/i2c.h b/arch/arm/plat-omap/include/plat/i2c.h -new file mode 100644 -index 0000000..585d9ca ---- /dev/null -+++ b/arch/arm/plat-omap/include/plat/i2c.h -@@ -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); diff --git a/a/content_digest b/N1/content_digest index 3532ea5..8d8b74d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,10 @@ "ref\020091126001646.1546.34352.stgit@localhost\0" "ref\020091126001952.1546.21444.stgit@localhost\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 6/8] omap: Split i2c platform init for mach-omap1 and mach-omap2\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 6/8] omap: Split i2c platform init for mach-omap1 and mach-omap2\0" "Date\0Fri, 27 Nov 2009 09:44:46 -0800\0" "To\0linux-arm-kernel@lists.infradead.org\0" - "Cc\0linux-omap@vger.kernel.org" - " Jarkko Nikula <jhnikula@gmail.com>\0" - "\01:1\0" + "\00:1\0" "b\0" "* Tony Lindgren <tony@atomide.com> [091125 16:19]:\n" "> Otherwise we cannot limit new mux code to mach-omap2.\n" @@ -22,307 +20,5 @@ "Regards,\n" "\n" Tony - "\01:2\0" - "fn\0mux-fix-i2c.patch\0" - "b\0" - ">From 8cadff260f4212873501bbc4e4d2e62c40668ec9 Mon Sep 17 00:00:00 2001\n" - "From: Tony Lindgren <tony@atomide.com>\n" - "Date: Wed, 25 Nov 2009 10:46:07 -0800\n" - "Subject: [PATCH] omap: Split i2c platform init for mach-omap1 and mach-omap2\n" - "\n" - "Otherwise we cannot limit new mux code to mach-omap2.\n" - "The same signal names should eventually work for other\n" - "omaps under mach-omap2.\n" - "\n" - "Note that these pins don't need to be OMAP_PIN_INPUT_PULLUP,\n" - "just OMAP_PIN_INPUT is enough.\n" - "\n" - "Cc: Jarkko Nikula <jhnikula@gmail.com>\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile\n" - "index 87e539a..51bc195 100644\n" - "--- a/arch/arm/mach-omap1/Makefile\n" - "+++ b/arch/arm/mach-omap1/Makefile\n" - "@@ -17,6 +17,9 @@ obj-$(CONFIG_PM) += pm.o sleep.o\n" - " obj-$(CONFIG_OMAP_MBOX_FWK)\t+= mailbox_mach.o\n" - " mailbox_mach-objs\t\t:= mailbox.o\n" - " \n" - "+i2c-omap-$(CONFIG_I2C_OMAP)\t\t:= i2c.o\n" - "+obj-y\t\t\t\t\t+= $(i2c-omap-m) $(i2c-omap-y)\n" - "+\n" - " led-y := leds.o\n" - " \n" - " # Specific board support\n" - "diff --git a/arch/arm/mach-omap1/i2c.c b/arch/arm/mach-omap1/i2c.c\n" - "new file mode 100644\n" - "index 0000000..bc9d12b\n" - "--- /dev/null\n" - "+++ b/arch/arm/mach-omap1/i2c.c\n" - "@@ -0,0 +1,33 @@\n" - "+/*\n" - "+ * Helper module for board specific I2C bus registration\n" - "+ *\n" - "+ * Copyright (C) 2009 Nokia Corporation.\n" - "+ *\n" - "+ * This program is free software; you can redistribute it and/or\n" - "+ * modify it under the terms of the GNU General Public License\n" - "+ * version 2 as published by the Free Software Foundation.\n" - "+ *\n" - "+ * This program is distributed in the hope that it will be useful, but\n" - "+ * WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" - "+ * General Public License for more details.\n" - "+ *\n" - "+ * You should have received a copy of the GNU General Public License\n" - "+ * along with this program; if not, write to the Free Software\n" - "+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" - "+ * 02110-1301 USA\n" - "+ *\n" - "+ */\n" - "+\n" - "+#include <plat/i2c.h>\n" - "+#include <plat/mux.h>\n" - "+\n" - "+int __init omap_register_i2c_bus(int bus_id, u32 clkrate,\n" - "+\t\t\t struct i2c_board_info const *info,\n" - "+\t\t\t unsigned len)\n" - "+{\n" - "+\tomap_cfg_reg(I2C_SDA);\n" - "+\tomap_cfg_reg(I2C_SCL);\n" - "+\n" - "+\treturn omap_plat_register_i2c_bus(bus_id, clkrate, info, len);\n" - "+}\n" - "diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile\n" - "index 34117f2..8b5fea8 100644\n" - "--- a/arch/arm/mach-omap2/Makefile\n" - "+++ b/arch/arm/mach-omap2/Makefile\n" - "@@ -56,6 +56,9 @@ iommu-$(CONFIG_ARCH_OMAP3)\t\t+= omap3-iommu.o\n" - " \n" - " obj-$(CONFIG_OMAP_IOMMU)\t\t+= $(iommu-y)\n" - " \n" - "+i2c-omap-$(CONFIG_I2C_OMAP)\t\t:= i2c.o\n" - "+obj-y\t\t\t\t\t+= $(i2c-omap-m) $(i2c-omap-y)\n" - "+\n" - " # Specific board support\n" - " obj-$(CONFIG_MACH_OMAP_GENERIC)\t\t+= board-generic.o\n" - " obj-$(CONFIG_MACH_OMAP_H4)\t\t+= board-h4.o\n" - "diff --git a/arch/arm/mach-omap2/i2c.c b/arch/arm/mach-omap2/i2c.c\n" - "new file mode 100644\n" - "index 0000000..789ca8c\n" - "--- /dev/null\n" - "+++ b/arch/arm/mach-omap2/i2c.c\n" - "@@ -0,0 +1,56 @@\n" - "+/*\n" - "+ * Helper module for board specific I2C bus registration\n" - "+ *\n" - "+ * Copyright (C) 2009 Nokia Corporation.\n" - "+ *\n" - "+ * This program is free software; you can redistribute it and/or\n" - "+ * modify it under the terms of the GNU General Public License\n" - "+ * version 2 as published by the Free Software Foundation.\n" - "+ *\n" - "+ * This program is distributed in the hope that it will be useful, but\n" - "+ * WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" - "+ * General Public License for more details.\n" - "+ *\n" - "+ * You should have received a copy of the GNU General Public License\n" - "+ * along with this program; if not, write to the Free Software\n" - "+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" - "+ * 02110-1301 USA\n" - "+ *\n" - "+ */\n" - "+\n" - "+#include <plat/cpu.h>\n" - "+#include <plat/i2c.h>\n" - "+#include <plat/mux.h>\n" - "+\n" - "+#include \"mux.h\"\n" - "+\n" - "+int __init omap_register_i2c_bus(int bus_id, u32 clkrate,\n" - "+\t\t\t struct i2c_board_info const *info,\n" - "+\t\t\t unsigned len)\n" - "+{\n" - "+\tif (cpu_is_omap24xx()) {\n" - "+\t\tconst int omap24xx_pins[][2] = {\n" - "+\t\t\t{ M19_24XX_I2C1_SCL, L15_24XX_I2C1_SDA },\n" - "+\t\t\t{ J15_24XX_I2C2_SCL, H19_24XX_I2C2_SDA },\n" - "+\t\t};\n" - "+\t\tint scl, sda;\n" - "+\n" - "+\t\tscl = omap24xx_pins[bus_id - 1][0];\n" - "+\t\tsda = omap24xx_pins[bus_id - 1][1];\n" - "+\t\tomap_cfg_reg(sda);\n" - "+\t\tomap_cfg_reg(scl);\n" - "+\t}\n" - "+\n" - "+\t/* First I2C bus is not muxable */\n" - "+\tif (cpu_is_omap34xx() && bus_id > 1) {\n" - "+\t\tchar mux_name[sizeof(\"i2c2_scl.i2c2_scl\")];\n" - "+\n" - "+\t\tsprintf(mux_name, \"i2c%i_scl.i2c%i_scl\", bus_id, bus_id);\n" - "+\t\tomap_mux_init_signal(mux_name, OMAP_PIN_INPUT);\n" - "+\t\tsprintf(mux_name, \"i2c%i_sda.i2c%i_sda\", bus_id, bus_id);\n" - "+\t\tomap_mux_init_signal(mux_name, OMAP_PIN_INPUT);\n" - "+\t}\n" - "+\n" - "+\treturn omap_plat_register_i2c_bus(bus_id, clkrate, info, len);\n" - "+}\n" - "diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c\n" - "index c08362d..33fff4e 100644\n" - "--- a/arch/arm/plat-omap/i2c.c\n" - "+++ b/arch/arm/plat-omap/i2c.c\n" - "@@ -80,47 +80,8 @@ static struct platform_device omap_i2c_devices[] = {\n" - " #endif\n" - " };\n" - " \n" - "-#if defined(CONFIG_ARCH_OMAP24XX)\n" - "-static const int omap24xx_pins[][2] = {\n" - "-\t{ M19_24XX_I2C1_SCL, L15_24XX_I2C1_SDA },\n" - "-\t{ J15_24XX_I2C2_SCL, H19_24XX_I2C2_SDA },\n" - "-};\n" - "-#else\n" - "-static const int omap24xx_pins[][2] = {};\n" - "-#endif\n" - "-#if defined(CONFIG_ARCH_OMAP34XX)\n" - "-static const int omap34xx_pins[][2] = {\n" - "-\t{ K21_34XX_I2C1_SCL, J21_34XX_I2C1_SDA},\n" - "-\t{ AF15_34XX_I2C2_SCL, AE15_34XX_I2C2_SDA},\n" - "-\t{ AF14_34XX_I2C3_SCL, AG14_34XX_I2C3_SDA},\n" - "-};\n" - "-#else\n" - "-static const int omap34xx_pins[][2] = {};\n" - "-#endif\n" - "-\n" - " #define OMAP_I2C_CMDLINE_SETUP\t(BIT(31))\n" - " \n" - "-static void __init omap_i2c_mux_pins(int bus)\n" - "-{\n" - "-\tint scl, sda;\n" - "-\n" - "-\tif (cpu_class_is_omap1()) {\n" - "-\t\tscl = I2C_SCL;\n" - "-\t\tsda = I2C_SDA;\n" - "-\t} else if (cpu_is_omap24xx()) {\n" - "-\t\tscl = omap24xx_pins[bus][0];\n" - "-\t\tsda = omap24xx_pins[bus][1];\n" - "-\t} else if (cpu_is_omap34xx()) {\n" - "-\t\tscl = omap34xx_pins[bus][0];\n" - "-\t\tsda = omap34xx_pins[bus][1];\n" - "-\t} else {\n" - "-\t\treturn;\n" - "-\t}\n" - "-\n" - "-\tomap_cfg_reg(sda);\n" - "-\tomap_cfg_reg(scl);\n" - "-}\n" - "-\n" - " static int __init omap_i2c_nr_ports(void)\n" - " {\n" - " \tint ports = 0;\n" - "@@ -156,7 +117,6 @@ static int __init omap_i2c_add_bus(int bus_id)\n" - " \t\tres[1].start = irq;\n" - " \t}\n" - " \n" - "-\tomap_i2c_mux_pins(bus_id - 1);\n" - " \treturn platform_device_register(pdev);\n" - " }\n" - " \n" - "@@ -209,7 +169,7 @@ out:\n" - " subsys_initcall(omap_register_i2c_bus_cmdline);\n" - " \n" - " /**\n" - "- * omap_register_i2c_bus - register I2C bus with device descriptors\n" - "+ * omap_plat_register_i2c_bus - register I2C bus with device descriptors\n" - " * @bus_id: bus id counting from number 1\n" - " * @clkrate: clock rate of the bus in kHz\n" - " * @info: pointer into I2C device descriptor table or NULL\n" - "@@ -217,7 +177,7 @@ subsys_initcall(omap_register_i2c_bus_cmdline);\n" - " *\n" - " * Returns 0 on success or an error code.\n" - " */\n" - "-int __init omap_register_i2c_bus(int bus_id, u32 clkrate,\n" - "+int __init omap_plat_register_i2c_bus(int bus_id, u32 clkrate,\n" - " \t\t\t struct i2c_board_info const *info,\n" - " \t\t\t unsigned len)\n" - " {\n" - "diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h\n" - "index 064f173..754fbc8 100644\n" - "--- a/arch/arm/plat-omap/include/plat/common.h\n" - "+++ b/arch/arm/plat-omap/include/plat/common.h\n" - "@@ -27,7 +27,7 @@\n" - " #ifndef __ARCH_ARM_MACH_OMAP_COMMON_H\n" - " #define __ARCH_ARM_MACH_OMAP_COMMON_H\n" - " \n" - "-#include <linux/i2c.h>\n" - "+#include <plat/i2c.h>\n" - " \n" - " struct sys_timer;\n" - " \n" - "@@ -36,18 +36,6 @@ extern void __iomem *gic_cpu_base_addr;\n" - " \n" - " extern void omap_map_common_io(void);\n" - " extern struct sys_timer omap_timer;\n" - "-#if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)\n" - "-extern int omap_register_i2c_bus(int bus_id, u32 clkrate,\n" - "-\t\t\t\t struct i2c_board_info const *info,\n" - "-\t\t\t\t unsigned len);\n" - "-#else\n" - "-static inline int omap_register_i2c_bus(int bus_id, u32 clkrate,\n" - "-\t\t\t\t struct i2c_board_info const *info,\n" - "-\t\t\t\t unsigned len)\n" - "-{\n" - "-\treturn 0;\n" - "-}\n" - "-#endif\n" - " \n" - " /* IO bases for various OMAP processors */\n" - " struct omap_globals {\n" - "diff --git a/arch/arm/plat-omap/include/plat/i2c.h b/arch/arm/plat-omap/include/plat/i2c.h\n" - "new file mode 100644\n" - "index 0000000..585d9ca\n" - "--- /dev/null\n" - "+++ b/arch/arm/plat-omap/include/plat/i2c.h\n" - "@@ -0,0 +1,39 @@\n" - "+/*\n" - "+ * Helper module for board specific I2C bus registration\n" - "+ *\n" - "+ * Copyright (C) 2009 Nokia Corporation.\n" - "+ *\n" - "+ * This program is free software; you can redistribute it and/or\n" - "+ * modify it under the terms of the GNU General Public License\n" - "+ * version 2 as published by the Free Software Foundation.\n" - "+ *\n" - "+ * This program is distributed in the hope that it will be useful, but\n" - "+ * WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" - "+ * General Public License for more details.\n" - "+ *\n" - "+ * You should have received a copy of the GNU General Public License\n" - "+ * along with this program; if not, write to the Free Software\n" - "+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n" - "+ * 02110-1301 USA\n" - "+ *\n" - "+ */\n" - "+\n" - "+#include <linux/i2c.h>\n" - "+\n" - "+#if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)\n" - "+extern int omap_register_i2c_bus(int bus_id, u32 clkrate,\n" - "+\t\t\t\t struct i2c_board_info const *info,\n" - "+\t\t\t\t unsigned len);\n" - "+#else\n" - "+static inline int omap_register_i2c_bus(int bus_id, u32 clkrate,\n" - "+\t\t\t\t struct i2c_board_info const *info,\n" - "+\t\t\t\t unsigned len)\n" - "+{\n" - "+\treturn 0;\n" - "+}\n" - "+#endif\n" - "+\n" - "+int omap_plat_register_i2c_bus(int bus_id, u32 clkrate,\n" - "+\t\t\t\t struct i2c_board_info const *info,\n" - "+\t\t\t\t unsigned len);" -221ff57fc64d34a4dfd190ddcf64cd2acf27ca91ceb0120c477039204266b461 +086a9bf8b342a84095387b0887184d0ff4ee562a41fdc9d680226c932268139f
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.