This is a larger set of new functionality for the existing SoC families,
 including:
 
 * vt8500 gains support for new CPU cores, notably the Cortex-A9 based wm8850
 * prima2 gains support for the "marco" SoC family, its SMP based cousin
 * tegra gains support for the new Tegra4 (Tegra114) family
 * socfpga now supports a newer version of the hardware including SMP
 * i.mx31 and bcm2835 are now using DT probing for their clocks
 * lots of updates for sh-mobile
 * OMAP updates for clocks, power management and USB
 * i.mx6q and tegra now support cpuidle
 * kirkwood now supports PCIe hot plugging
 * tegra clock support is updated
 * tegra USB PHY probing gets implemented diffently
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAUSUyPGCrR//JCVInAQI4YA/+Nb0FaA7qMmTPuJhm7aZNfnwBcGxZ7IZp
 s2xByEl3r5zbLKlKGNGE0x7Q7ETHV4y9tohzi9ZduH2b60dMRYgII06CEmDPu6/h
 4vBap2oLzfWfs9hwpCIh7N9wNzxSj/R42vlXHhNmspHlw7cFk1yw5EeJ+ocxmZPq
 H9lyjAxsGErkZyM/xstNQ1Uvhc8XHAFSUzWrg8hvf6AVVR8hwpIqVzfIizv6Vpk6
 ryBoUBHfdTztAOrafK54CdRc7l6kVMomRodKGzMyasnBK3ZfFca3IR7elnxLyEFJ
 uPDu5DKOdYrjXC8X2dPM6kYiE41YFuqOV2ahBt9HqRe6liNBLHQ6NAH7f7+jBWSI
 eeWe84c2vFaqhAGlci/xm4GaP0ud5ZLudtiVPlDY5tYIADqLygNcx1HIt/5sT7QI
 h34LMjc4+/TGVWTVf5yRmIzTrCXZv5YoAak3UWFoM4nVBo/eYVyNLEt5g9YsfjrC
 P/GWrXJJvOCB3gAi31pgGYJzZg8K7kTTAh/dgxjqzU4f6nGRm5PBydiJe18/lWkH
 qtfNE0RbhxCi3JEBnxW48AIEndVSRbd7jf8upC/s9rPURtFSVXp4APTHVyNUKCip
 gojBxcRYtesyG/53nrwdTyiyHx6GocmWnMNZJoDo0UQEkog2dOef+StdC3zhc2Vm
 9EttcFqWJ+E=
 =PRrg
 -----END PGP SIGNATURE-----
Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC-specific updates from Arnd Bergmann:
 "This is a larger set of new functionality for the existing SoC
  families, including:
   - vt8500 gains support for new CPU cores, notably the Cortex-A9 based
     wm8850
   - prima2 gains support for the "marco" SoC family, its SMP based
     cousin
   - tegra gains support for the new Tegra4 (Tegra114) family
   - socfpga now supports a newer version of the hardware including SMP
   - i.mx31 and bcm2835 are now using DT probing for their clocks
   - lots of updates for sh-mobile
   - OMAP updates for clocks, power management and USB
   - i.mx6q and tegra now support cpuidle
   - kirkwood now supports PCIe hot plugging
   - tegra clock support is updated
   - tegra USB PHY probing gets implemented diffently"
* tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (148 commits)
  ARM: prima2: remove duplicate v7_invalidate_l1
  ARM: shmobile: r8a7779: Correct TMU clock support again
  ARM: prima2: fix __init section for cpu hotplug
  ARM: OMAP: Consolidate OMAP USB-HS platform data (part 3/3)
  ARM: OMAP: Consolidate OMAP USB-HS platform data (part 1/3)
  arm: socfpga: Add SMP support for actual socfpga harware
  arm: Add v7_invalidate_l1 to cache-v7.S
  arm: socfpga: Add entries to enable make dtbs socfpga
  arm: socfpga: Add new device tree source for actual socfpga HW
  ARM: tegra: sort Kconfig selects for Tegra114
  ARM: tegra: enable ARCH_REQUIRE_GPIOLIB for Tegra114
  ARM: tegra: Fix build error w/ ARCH_TEGRA_114_SOC w/o ARCH_TEGRA_3x_SOC
  ARM: tegra: Fix build error for gic update
  ARM: tegra: remove empty tegra_smp_init_cpus()
  ARM: shmobile: Register ARM architected timer
  ARM: MARCO: fix the build issue due to gic-vic-to-irqchip move
  ARM: shmobile: r8a7779: Correct TMU clock support
  ARM: mxs_defconfig: Select CONFIG_DEVTMPFS_MOUNT
  ARM: mxs: decrease mxs_clockevent_device.min_delta_ns to 2 clock cycles
  ARM: mxs: use apbx bus clock to drive the timers on timrotv2
  ...
		
	
			
		
			
				
	
	
		
			191 lines
		
	
	
	
		
			5 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			191 lines
		
	
	
	
		
			5 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * 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 "soc.h"
 | 
						|
#include "omap_hwmod.h"
 | 
						|
#include "omap_device.h"
 | 
						|
#include "omap-pm.h"
 | 
						|
 | 
						|
#include "prm.h"
 | 
						|
#include "common.h"
 | 
						|
#include "mux.h"
 | 
						|
#include "i2c.h"
 | 
						|
 | 
						|
/* In register I2C_CON, Bit 15 is the I2C enable bit */
 | 
						|
#define I2C_EN					BIT(15)
 | 
						|
#define OMAP2_I2C_CON_OFFSET			0x24
 | 
						|
#define OMAP4_I2C_CON_OFFSET			0xA4
 | 
						|
 | 
						|
#define MAX_OMAP_I2C_HWMOD_NAME_LEN	16
 | 
						|
 | 
						|
static void __init omap2_i2c_mux_pins(int bus_id)
 | 
						|
{
 | 
						|
	char mux_name[sizeof("i2c2_scl.i2c2_scl")];
 | 
						|
 | 
						|
	/* First I2C bus is not muxable */
 | 
						|
	if (bus_id == 1)
 | 
						|
		return;
 | 
						|
 | 
						|
	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);
 | 
						|
}
 | 
						|
 | 
						|
/**
 | 
						|
 * omap_i2c_reset - reset the omap i2c module.
 | 
						|
 * @oh: struct omap_hwmod *
 | 
						|
 *
 | 
						|
 * The i2c moudle in omap2, omap3 had a special sequence to reset. The
 | 
						|
 * sequence is:
 | 
						|
 * - Disable the I2C.
 | 
						|
 * - Write to SOFTRESET bit.
 | 
						|
 * - Enable the I2C.
 | 
						|
 * - Poll on the RESETDONE bit.
 | 
						|
 * The sequence is implemented in below function. This is called for 2420,
 | 
						|
 * 2430 and omap3.
 | 
						|
 */
 | 
						|
int omap_i2c_reset(struct omap_hwmod *oh)
 | 
						|
{
 | 
						|
	u32 v;
 | 
						|
	u16 i2c_con;
 | 
						|
	int c = 0;
 | 
						|
 | 
						|
	if (oh->class->rev == OMAP_I2C_IP_VERSION_2) {
 | 
						|
		i2c_con = OMAP4_I2C_CON_OFFSET;
 | 
						|
	} else if (oh->class->rev == OMAP_I2C_IP_VERSION_1) {
 | 
						|
		i2c_con = OMAP2_I2C_CON_OFFSET;
 | 
						|
	} else {
 | 
						|
		WARN(1, "Cannot reset I2C block %s: unsupported revision\n",
 | 
						|
		     oh->name);
 | 
						|
		return -EINVAL;
 | 
						|
	}
 | 
						|
 | 
						|
	/* Disable I2C */
 | 
						|
	v = omap_hwmod_read(oh, i2c_con);
 | 
						|
	v &= ~I2C_EN;
 | 
						|
	omap_hwmod_write(v, oh, i2c_con);
 | 
						|
 | 
						|
	/* Write to the SOFTRESET bit */
 | 
						|
	omap_hwmod_softreset(oh);
 | 
						|
 | 
						|
	/* Enable I2C */
 | 
						|
	v = omap_hwmod_read(oh, i2c_con);
 | 
						|
	v |= I2C_EN;
 | 
						|
	omap_hwmod_write(v, oh, i2c_con);
 | 
						|
 | 
						|
	/* Poll on RESETDONE bit */
 | 
						|
	omap_test_timeout((omap_hwmod_read(oh,
 | 
						|
				oh->class->sysc->syss_offs)
 | 
						|
				& SYSS_RESETDONE_MASK),
 | 
						|
				MAX_MODULE_SOFTRESET_WAIT, c);
 | 
						|
 | 
						|
	if (c == MAX_MODULE_SOFTRESET_WAIT)
 | 
						|
		pr_warning("%s: %s: softreset failed (waited %d usec)\n",
 | 
						|
			__func__, oh->name, MAX_MODULE_SOFTRESET_WAIT);
 | 
						|
	else
 | 
						|
		pr_debug("%s: %s: softreset in %d usec\n", __func__,
 | 
						|
			oh->name, c);
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int __init omap_i2c_nr_ports(void)
 | 
						|
{
 | 
						|
	int ports = 0;
 | 
						|
 | 
						|
	if (cpu_is_omap24xx())
 | 
						|
		ports = 2;
 | 
						|
	else if (cpu_is_omap34xx())
 | 
						|
		ports = 3;
 | 
						|
	else if (cpu_is_omap44xx())
 | 
						|
		ports = 4;
 | 
						|
	return ports;
 | 
						|
}
 | 
						|
 | 
						|
/*
 | 
						|
 * XXX This function is a temporary compatibility wrapper - only
 | 
						|
 * needed until the I2C driver can be converted to call
 | 
						|
 * omap_pm_set_max_dev_wakeup_lat() and handle a return code.
 | 
						|
 */
 | 
						|
static void omap_pm_set_max_mpu_wakeup_lat_compat(struct device *dev, long t)
 | 
						|
{
 | 
						|
	omap_pm_set_max_mpu_wakeup_lat(dev, t);
 | 
						|
}
 | 
						|
 | 
						|
static const char name[] = "omap_i2c";
 | 
						|
 | 
						|
int __init omap_i2c_add_bus(struct omap_i2c_bus_platform_data *i2c_pdata,
 | 
						|
				int bus_id)
 | 
						|
{
 | 
						|
	int l;
 | 
						|
	struct omap_hwmod *oh;
 | 
						|
	struct platform_device *pdev;
 | 
						|
	char oh_name[MAX_OMAP_I2C_HWMOD_NAME_LEN];
 | 
						|
	struct omap_i2c_bus_platform_data *pdata;
 | 
						|
	struct omap_i2c_dev_attr *dev_attr;
 | 
						|
 | 
						|
	if (bus_id > omap_i2c_nr_ports())
 | 
						|
		return -EINVAL;
 | 
						|
 | 
						|
	omap2_i2c_mux_pins(bus_id);
 | 
						|
 | 
						|
	l = snprintf(oh_name, MAX_OMAP_I2C_HWMOD_NAME_LEN, "i2c%d", bus_id);
 | 
						|
	WARN(l >= MAX_OMAP_I2C_HWMOD_NAME_LEN,
 | 
						|
		"String buffer overflow in I2C%d device setup\n", bus_id);
 | 
						|
	oh = omap_hwmod_lookup(oh_name);
 | 
						|
	if (!oh) {
 | 
						|
			pr_err("Could not look up %s\n", oh_name);
 | 
						|
			return -EEXIST;
 | 
						|
	}
 | 
						|
 | 
						|
	pdata = i2c_pdata;
 | 
						|
	/*
 | 
						|
	 * pass the hwmod class's CPU-specific knowledge of I2C IP revision in
 | 
						|
	 * use, and functionality implementation flags, up to the OMAP I2C
 | 
						|
	 * driver via platform data
 | 
						|
	 */
 | 
						|
	pdata->rev = oh->class->rev;
 | 
						|
 | 
						|
	dev_attr = (struct omap_i2c_dev_attr *)oh->dev_attr;
 | 
						|
	pdata->flags = dev_attr->flags;
 | 
						|
 | 
						|
	/*
 | 
						|
	 * When waiting for completion of a i2c transfer, we need to
 | 
						|
	 * set a wake up latency constraint for the MPU. This is to
 | 
						|
	 * ensure quick enough wakeup from idle, when transfer
 | 
						|
	 * completes.
 | 
						|
	 * Only omap3 has support for constraints
 | 
						|
	 */
 | 
						|
	if (cpu_is_omap34xx())
 | 
						|
		pdata->set_mpu_wkup_lat = omap_pm_set_max_mpu_wakeup_lat_compat;
 | 
						|
	pdev = omap_device_build(name, bus_id, oh, pdata,
 | 
						|
				 sizeof(struct omap_i2c_bus_platform_data));
 | 
						|
	WARN(IS_ERR(pdev), "Could not build omap_device for %s\n", name);
 | 
						|
 | 
						|
	return PTR_RET(pdev);
 | 
						|
}
 | 
						|
 | 
						|
static  int __init omap_i2c_cmdline(void)
 | 
						|
{
 | 
						|
	return omap_register_i2c_bus_cmdline();
 | 
						|
}
 | 
						|
omap_subsys_initcall(omap_i2c_cmdline);
 |