2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 18:23:53 +08:00
linux-next/arch/arm/mach-kirkwood
Arnd Bergmann e5051b8472 imx soc changes for 3.11:
* New SoCs i.MX6 Sololite and Vybrid VF610 support
 * imx5 and imx6 clock fixes and additions
 * Update clock driver to use of_clk_init() function
 * Refactor restart routine mxc_restart() to get it work for DT boot
   as well
 * Clean up mxc specific ulpi access ops
 * imx defconfig updates
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJRvsJmAAoJEFBXWFqHsHzOHOIH/jjVCaAFdOskPI4d9qPPAt9C
 5o0aJDjerzTm+vH2mbec2507fChaYrLybAypJUj6wDYRf03RhAgPXorY83Y+3WtG
 SYz2UWza7MY8GeZv6e9tdrYS3JUSicFXPf8MsOcINsuyIub3dD96z36OqrnWZLFy
 uH5V81e4gOHECd4PWIxmhdjwawqmwb/Pqzl0V3+vXi2JM07xrn7/SqlZ7VfUwM2q
 DNhu5ugH7FtaFp75YrmTIhp6i+tovguRr0RIt6dnk/9gbJBQnV2Cw2MzdRPT12U5
 bC79P7sojkKRtITcq9c1fnUNhkgc0+hS8HoezcQmzKMin6nFmVAh5wQFSlRJMJE=
 =mZw+
 -----END PGP SIGNATURE-----

Merge tag 'imx-soc-3.11' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc

From Shawn Guo:

imx soc changes for 3.11:

* New SoCs i.MX6 Sololite and Vybrid VF610 support
* imx5 and imx6 clock fixes and additions
* Update clock driver to use of_clk_init() function
* Refactor restart routine mxc_restart() to get it work for DT boot
  as well
* Clean up mxc specific ulpi access ops
* imx defconfig updates

* tag 'imx-soc-3.11' of git://git.linaro.org/people/shawnguo/linux-2.6: (29 commits)
  ARM: imx_v6_v7_defconfig: Enable Vybrid VF610
  ARM: imx_v6_v7_defconfig: Enable imx-wm8962 by default
  ARM: clk-imx6qdl: Add clko1 configuration for imx6qdl-sabresd
  ARM: imx_v6_v7_defconfig: Enable PWM and backlight options
  ARM: imx: Remove mxc specific ulpi access ops
  ARM: imx: add initial support for VF610
  ARM: imx: add VF610 clock support
  ARM: imx_v6_v7_defconfig: enable parallel display
  ARM: imx: clk: No need to initialize phandle struct
  ARM: imx: irq-common: Include header to avoid sparse warning
  ARM: imx: Enable mx6 solo-lite support
  ARM: imx6: use common of_clk_init() call to initialize clocks
  ARM: imx6q: call of_clk_init() to register fixed rate clocks
  ARM: imx: imx_v6_v7_defconfig: Select CONFIG_DRM_IMX_TVE
  ARM: i.MX6: clk: add different DualLite MLB clock config
  ARM i.MX5: Add S/PDIF clocks
  ARM i.MX53: Add SATA clock
  ARM: imx6q: clk: add the eim_slow clock
  ARM: imx: remove MLB PLL from pllv3
  ARM: imx: disable pll8_mlb in mx6q_clks
  ...

Conflicts:
	arch/arm/Kconfig.debug (simple add/add conflict)

Includes an update to 3.10-rc6

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2013-06-20 02:15:45 +02:00
..
include/mach arm: kirkwood: Instantiate cpufreq driver 2013-05-29 19:32:04 +00:00
board-db88f628x-bp.c arm: kirkwood: convert db-88f6281/db-88f6282 to the Device Tree 2013-05-27 16:02:13 +00:00
board-dnskw.c ARM: Kirkwood: Convert dnskw to pinctrl 2012-11-24 02:57:56 +00:00
board-dockstar.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-dreamplug.c arm: kirkwood: dreamplug: use Device Tree to probe SDIO 2013-02-28 18:57:10 +01:00
board-dt.c mvebu clock restructuring for v3.11 2013-05-31 23:23:25 -07:00
board-goflexnet.c Merge branch 'orion/cleanup' into orion/dt 2012-11-26 01:26:49 -08:00
board-guruplug.c ARM: kirkwood: make use of DT mvsdio on guruplug board 2013-03-30 20:47:23 +00:00
board-ib62x0.c ARM: Kirkwood: Cleanup unneeded include files 2013-01-12 21:50:10 +00:00
board-iconnect.c arm: kirkwood: convert Iomega Iconnect to use DT for the PCIe interface 2013-05-27 16:02:11 +00:00
board-iomega_ix2_200.c Fix GE0/GE1 init on ix2-200 as GE0 has no PHY 2013-04-10 16:50:58 +00:00
board-km_kirkwood.c ARM: Kirkwood: Convert km_kirkwood to pinctrl 2012-11-24 02:58:48 +00:00
board-lsxl.c ARM: arm-soc: Board updates for 3.8 2012-12-12 12:14:06 -08:00
board-mplcec4.c arm: kirkwood: convert MPL CEC4 to use DT for the PCIe interface 2013-05-27 16:02:12 +00:00
board-ns2.c ARM: Kirkwood: DT board setup for CloudBox 2013-04-10 18:16:06 +00:00
board-openblocks_a6.c ARM: Kirkwood: Convert openblocks A6 board to pinctrl 2013-02-28 18:57:11 +01:00
board-readynas.c arm: kirkwood: NETGEAR ReadyNAS Duo v2 init PCIe via DT 2013-05-29 11:45:24 +00:00
board-ts219.c ARM: Kirkwood: TS219: Fix crash by double PCIe instantiation 2013-05-28 14:50:06 +00:00
board-usi_topkick.c ARM: kirkwood: topkick: init mvsdio via DT 2013-02-28 18:57:16 +01:00
common.c mvebu pcie driver (kirkwood) for v3.11 2013-05-31 23:17:39 -07:00
common.h mvebu pcie driver (kirkwood) for v3.11 2013-05-31 23:17:39 -07:00
d2net_v2-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
dockstar-setup.c Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
guruplug-setup.c ARM: Kirkwood: fix unused mvsdio gpio pins 2013-03-28 16:56:31 +00:00
irq.c ARM: Kirkwood: Fix sparse warnings. 2012-11-19 03:53:46 +00:00
Kconfig mvebu clock restructuring for v3.11 2013-05-31 23:23:25 -07:00
lacie_v2-common.c ARM: Kirkwood: Fix sparse warnings. 2012-11-19 03:53:46 +00:00
lacie_v2-common.h [ARM] Kirkwood: fix timer initialization for LaCie boards 2010-10-21 14:13:58 -04:00
Makefile arm: kirkwood: convert db-88f6281/db-88f6282 to the Device Tree 2013-05-27 16:02:13 +00:00
Makefile.boot ARM: kirkwood: move new dtbs to common Makefile 2012-09-22 14:24:00 -07:00
mpp.c ARM: Kirkwood: handle mv88f6282 cpu in __kirkwood_variant(). 2013-06-06 18:16:04 +00:00
mpp.h ARM: orion: Fix Orion5x GPIO regression from MPP cleanup 2012-02-09 16:16:31 -08:00
mv88f6281gtw_ge-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
netspace_v2-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
netxbig_v2-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
openrd-setup.c ARM: Kirkwood: fix unused mvsdio gpio pins 2013-03-28 16:56:31 +00:00
pcie.c arm: kirkwood: move PCIe window init to legacy driver 2013-05-27 16:02:10 +00:00
rd88f6192-nas-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
rd88f6281-setup.c ARM: Kirkwood: fix unused mvsdio gpio pins 2013-03-28 16:56:31 +00:00
sheevaplug-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
t5325-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
ts41x-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
ts219-setup.c Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x 2013-05-13 15:57:29 +00:00
tsx1x-common.c ARM: Kirkwood: Fix sparse warnings. 2012-11-19 03:53:46 +00:00
tsx1x-common.h ARM: 6265/1: kirkwood: move qnap_tsx1x_register_flash() to .init.text 2010-07-26 10:33:08 +01:00