 bab588fcfb
			
		
	
	
	bab588fcfb
	
	
	
		
			
			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
  ...
		
	
			
		
			
				
	
	
		
			74 lines
		
	
	
	
		
			1.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			74 lines
		
	
	
	
		
			1.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * omap iommu: omap device registration
 | |
|  *
 | |
|  * Copyright (C) 2008-2009 Nokia Corporation
 | |
|  *
 | |
|  * Written by Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
 | |
|  *
 | |
|  * 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.
 | |
|  */
 | |
| 
 | |
| #include <linux/module.h>
 | |
| #include <linux/platform_device.h>
 | |
| #include <linux/err.h>
 | |
| #include <linux/slab.h>
 | |
| 
 | |
| #include <linux/platform_data/iommu-omap.h>
 | |
| #include "soc.h"
 | |
| #include "omap_hwmod.h"
 | |
| #include "omap_device.h"
 | |
| 
 | |
| static int __init omap_iommu_dev_init(struct omap_hwmod *oh, void *unused)
 | |
| {
 | |
| 	struct platform_device *pdev;
 | |
| 	struct iommu_platform_data *pdata;
 | |
| 	struct omap_mmu_dev_attr *a = (struct omap_mmu_dev_attr *)oh->dev_attr;
 | |
| 	static int i;
 | |
| 
 | |
| 	pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
 | |
| 	if (!pdata)
 | |
| 		return -ENOMEM;
 | |
| 
 | |
| 	pdata->name = oh->name;
 | |
| 	pdata->nr_tlb_entries = a->nr_tlb_entries;
 | |
| 	pdata->da_start = a->da_start;
 | |
| 	pdata->da_end = a->da_end;
 | |
| 
 | |
| 	if (oh->rst_lines_cnt == 1) {
 | |
| 		pdata->reset_name = oh->rst_lines->name;
 | |
| 		pdata->assert_reset = omap_device_assert_hardreset;
 | |
| 		pdata->deassert_reset = omap_device_deassert_hardreset;
 | |
| 	}
 | |
| 
 | |
| 	pdev = omap_device_build("omap-iommu", i, oh, pdata, sizeof(*pdata));
 | |
| 
 | |
| 	kfree(pdata);
 | |
| 
 | |
| 	if (IS_ERR(pdev)) {
 | |
| 		pr_err("%s: device build err: %ld\n", __func__, PTR_ERR(pdev));
 | |
| 		return PTR_ERR(pdev);
 | |
| 	}
 | |
| 
 | |
| 	i++;
 | |
| 
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| static int __init omap_iommu_init(void)
 | |
| {
 | |
| 	return omap_hwmod_for_each_by_class("mmu", omap_iommu_dev_init, NULL);
 | |
| }
 | |
| /* must be ready before omap3isp is probed */
 | |
| omap_subsys_initcall(omap_iommu_init);
 | |
| 
 | |
| static void __exit omap_iommu_exit(void)
 | |
| {
 | |
| 	/* Do nothing */
 | |
| }
 | |
| module_exit(omap_iommu_exit);
 | |
| 
 | |
| MODULE_AUTHOR("Hiroshi DOYU");
 | |
| MODULE_DESCRIPTION("omap iommu: omap device registration");
 | |
| MODULE_LICENSE("GPL v2");
 |