omap: Split i2c platform init for mach-omap1 and mach-omap2 (b63128e8) · Commits · 戴 / test

arch/arm/mach-omap1/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,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

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		/*
		* 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

Original line number	Diff line number	Diff line
		@@ -64,6 +64,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

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		/*
		* 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);
		}

arch/arm/plat-omap/i2c.c

+2 −42

Original line number	Diff line number	Diff line
		@@ -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)
		{

Admin message