2011-03-17 08:40:29 +00:00
|
|
|
/*
|
|
|
|
* Copyright (C) 1999,2000 Arm Limited
|
|
|
|
* Copyright (C) 2000 Deep Blue Solutions Ltd
|
|
|
|
* Copyright (C) 2002 Shane Nay (shane@minirl.com)
|
|
|
|
* Copyright 2005-2007 Freescale Semiconductor, Inc. All Rights Reserved.
|
|
|
|
* - add MX31 specific definitions
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/err.h>
|
2012-05-02 11:31:20 +00:00
|
|
|
#include <linux/pinctrl/machine.h>
|
2011-03-17 08:40:29 +00:00
|
|
|
|
|
|
|
#include <asm/pgtable.h>
|
2012-03-30 06:22:44 +00:00
|
|
|
#include <asm/system_misc.h>
|
2011-09-28 09:16:05 +00:00
|
|
|
#include <asm/hardware/cache-l2x0.h>
|
2011-03-17 08:40:29 +00:00
|
|
|
#include <asm/mach/map.h>
|
|
|
|
|
|
|
|
#include <mach/hardware.h>
|
|
|
|
|
2012-09-13 13:01:00 +00:00
|
|
|
#include "common.h"
|
2012-04-03 10:42:27 +00:00
|
|
|
#include "crmregs-imx3.h"
|
2012-09-13 07:51:15 +00:00
|
|
|
#include "devices/devices-common.h"
|
2012-09-13 05:26:00 +00:00
|
|
|
#include "iomux-v3.h"
|
2012-04-03 10:42:27 +00:00
|
|
|
|
|
|
|
void __iomem *mx3_ccm_base;
|
|
|
|
|
2011-09-28 09:16:06 +00:00
|
|
|
static void imx3_idle(void)
|
|
|
|
{
|
|
|
|
unsigned long reg = 0;
|
2011-11-11 05:09:18 +00:00
|
|
|
|
2012-02-02 22:02:32 +00:00
|
|
|
mx3_cpu_lp_set(MX3_WAIT);
|
|
|
|
|
2011-08-03 15:34:59 +00:00
|
|
|
__asm__ __volatile__(
|
|
|
|
/* disable I and D cache */
|
|
|
|
"mrc p15, 0, %0, c1, c0, 0\n"
|
|
|
|
"bic %0, %0, #0x00001000\n"
|
|
|
|
"bic %0, %0, #0x00000004\n"
|
|
|
|
"mcr p15, 0, %0, c1, c0, 0\n"
|
|
|
|
/* invalidate I cache */
|
|
|
|
"mov %0, #0\n"
|
|
|
|
"mcr p15, 0, %0, c7, c5, 0\n"
|
|
|
|
/* clear and invalidate D cache */
|
|
|
|
"mov %0, #0\n"
|
|
|
|
"mcr p15, 0, %0, c7, c14, 0\n"
|
|
|
|
/* WFI */
|
|
|
|
"mov %0, #0\n"
|
|
|
|
"mcr p15, 0, %0, c7, c0, 4\n"
|
|
|
|
"nop\n" "nop\n" "nop\n" "nop\n"
|
|
|
|
"nop\n" "nop\n" "nop\n"
|
|
|
|
/* enable I and D cache */
|
|
|
|
"mrc p15, 0, %0, c1, c0, 0\n"
|
|
|
|
"orr %0, %0, #0x00001000\n"
|
|
|
|
"orr %0, %0, #0x00000004\n"
|
|
|
|
"mcr p15, 0, %0, c1, c0, 0\n"
|
|
|
|
: "=r" (reg));
|
2011-09-28 09:16:06 +00:00
|
|
|
}
|
|
|
|
|
2012-02-13 19:24:15 +00:00
|
|
|
static void __iomem *imx3_ioremap_caller(unsigned long phys_addr, size_t size,
|
|
|
|
unsigned int mtype, void *caller)
|
2011-09-28 09:16:07 +00:00
|
|
|
{
|
|
|
|
if (mtype == MT_DEVICE) {
|
|
|
|
/*
|
|
|
|
* Access all peripherals below 0x80000000 as nonshared device
|
|
|
|
* on mx3, but leave l2cc alone. Otherwise cache corruptions
|
|
|
|
* can occur.
|
|
|
|
*/
|
|
|
|
if (phys_addr < 0x80000000 &&
|
|
|
|
!addr_in_module(phys_addr, MX3x_L2CC))
|
|
|
|
mtype = MT_DEVICE_NONSHARED;
|
|
|
|
}
|
|
|
|
|
2012-02-13 19:24:15 +00:00
|
|
|
return __arm_ioremap_caller(phys_addr, size, mtype, caller);
|
2011-09-28 09:16:07 +00:00
|
|
|
}
|
|
|
|
|
2012-02-26 16:27:04 +00:00
|
|
|
void __init imx3_init_l2x0(void)
|
2011-09-28 09:16:05 +00:00
|
|
|
{
|
2012-05-18 14:58:03 +00:00
|
|
|
#ifdef CONFIG_CACHE_L2X0
|
2011-09-28 09:16:05 +00:00
|
|
|
void __iomem *l2x0_base;
|
|
|
|
void __iomem *clkctl_base;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* First of all, we must repair broken chip settings. There are some
|
|
|
|
* i.MX35 CPUs in the wild, comming with bogus L2 cache settings. These
|
|
|
|
* misconfigured CPUs will run amok immediately when the L2 cache gets enabled.
|
|
|
|
* Workaraound is to setup the correct register setting prior enabling the
|
|
|
|
* L2 cache. This should not hurt already working CPUs, as they are using the
|
|
|
|
* same value.
|
|
|
|
*/
|
|
|
|
#define L2_MEM_VAL 0x10
|
|
|
|
|
|
|
|
clkctl_base = ioremap(MX35_CLKCTL_BASE_ADDR, 4096);
|
|
|
|
if (clkctl_base != NULL) {
|
|
|
|
writel(0x00000515, clkctl_base + L2_MEM_VAL);
|
|
|
|
iounmap(clkctl_base);
|
|
|
|
} else {
|
|
|
|
pr_err("L2 cache: Cannot fix timing. Trying to continue without\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
l2x0_base = ioremap(MX3x_L2CC_BASE_ADDR, 4096);
|
|
|
|
if (IS_ERR(l2x0_base)) {
|
|
|
|
printk(KERN_ERR "remapping L2 cache area failed with %ld\n",
|
|
|
|
PTR_ERR(l2x0_base));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
l2x0_init(l2x0_base, 0x00030024, 0x00000000);
|
2012-05-18 14:58:03 +00:00
|
|
|
#endif
|
2011-09-28 09:16:05 +00:00
|
|
|
}
|
|
|
|
|
2011-11-22 09:07:26 +00:00
|
|
|
#ifdef CONFIG_SOC_IMX31
|
2011-03-17 08:40:29 +00:00
|
|
|
static struct map_desc mx31_io_desc[] __initdata = {
|
|
|
|
imx_map_entry(MX31, X_MEMC, MT_DEVICE),
|
|
|
|
imx_map_entry(MX31, AVIC, MT_DEVICE_NONSHARED),
|
|
|
|
imx_map_entry(MX31, AIPS1, MT_DEVICE_NONSHARED),
|
|
|
|
imx_map_entry(MX31, AIPS2, MT_DEVICE_NONSHARED),
|
|
|
|
imx_map_entry(MX31, SPBA0, MT_DEVICE_NONSHARED),
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This function initializes the memory map. It is called during the
|
|
|
|
* system startup to create static physical to virtual memory mappings
|
|
|
|
* for the IO modules.
|
|
|
|
*/
|
|
|
|
void __init mx31_map_io(void)
|
|
|
|
{
|
|
|
|
iotable_init(mx31_io_desc, ARRAY_SIZE(mx31_io_desc));
|
|
|
|
}
|
|
|
|
|
|
|
|
void __init imx31_init_early(void)
|
|
|
|
{
|
|
|
|
mxc_set_cpu_type(MXC_CPU_MX31);
|
|
|
|
mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR));
|
2012-02-13 19:24:15 +00:00
|
|
|
arch_ioremap_caller = imx3_ioremap_caller;
|
2011-08-03 15:34:59 +00:00
|
|
|
arm_pm_idle = imx3_idle;
|
2012-04-03 10:42:27 +00:00
|
|
|
mx3_ccm_base = MX31_IO_ADDRESS(MX31_CCM_BASE_ADDR);
|
2011-03-17 08:40:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void __init mx31_init_irq(void)
|
|
|
|
{
|
|
|
|
mxc_init_irq(MX31_IO_ADDRESS(MX31_AVIC_BASE_ADDR));
|
2011-06-05 16:07:55 +00:00
|
|
|
}
|
|
|
|
|
2011-06-22 14:41:30 +00:00
|
|
|
static struct sdma_script_start_addrs imx31_to1_sdma_script __initdata = {
|
|
|
|
.per_2_per_addr = 1677,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct sdma_script_start_addrs imx31_to2_sdma_script __initdata = {
|
|
|
|
.ap_2_ap_addr = 423,
|
|
|
|
.ap_2_bp_addr = 829,
|
|
|
|
.bp_2_ap_addr = 1029,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct sdma_platform_data imx31_sdma_pdata __initdata = {
|
2011-06-22 14:41:31 +00:00
|
|
|
.fw_name = "sdma-imx31-to2.bin",
|
2011-06-22 14:41:30 +00:00
|
|
|
.script_addrs = &imx31_to2_sdma_script,
|
|
|
|
};
|
|
|
|
|
2012-03-05 14:30:52 +00:00
|
|
|
static const struct resource imx31_audmux_res[] __initconst = {
|
|
|
|
DEFINE_RES_MEM(MX31_AUDMUX_BASE_ADDR, SZ_16K),
|
|
|
|
};
|
|
|
|
|
2011-06-05 16:07:55 +00:00
|
|
|
void __init imx31_soc_init(void)
|
|
|
|
{
|
2011-06-22 14:41:30 +00:00
|
|
|
int to_version = mx31_revision() >> 4;
|
|
|
|
|
2011-09-28 09:16:05 +00:00
|
|
|
imx3_init_l2x0();
|
|
|
|
|
2011-07-06 16:37:41 +00:00
|
|
|
mxc_register_gpio("imx31-gpio", 0, MX31_GPIO1_BASE_ADDR, SZ_16K, MX31_INT_GPIO1, 0);
|
|
|
|
mxc_register_gpio("imx31-gpio", 1, MX31_GPIO2_BASE_ADDR, SZ_16K, MX31_INT_GPIO2, 0);
|
|
|
|
mxc_register_gpio("imx31-gpio", 2, MX31_GPIO3_BASE_ADDR, SZ_16K, MX31_INT_GPIO3, 0);
|
2011-06-22 14:41:30 +00:00
|
|
|
|
2012-05-20 17:11:24 +00:00
|
|
|
pinctrl_provide_dummies();
|
|
|
|
|
2011-06-22 14:41:31 +00:00
|
|
|
if (to_version == 1) {
|
|
|
|
strncpy(imx31_sdma_pdata.fw_name, "sdma-imx31-to1.bin",
|
|
|
|
strlen(imx31_sdma_pdata.fw_name));
|
2011-06-22 14:41:30 +00:00
|
|
|
imx31_sdma_pdata.script_addrs = &imx31_to1_sdma_script;
|
2011-06-22 14:41:31 +00:00
|
|
|
}
|
|
|
|
|
2011-07-13 13:33:17 +00:00
|
|
|
imx_add_imx_sdma("imx31-sdma", MX31_SDMA_BASE_ADDR, MX31_INT_SDMA, &imx31_sdma_pdata);
|
2012-02-29 13:28:08 +00:00
|
|
|
|
|
|
|
imx_set_aips(MX31_IO_ADDRESS(MX31_AIPS1_BASE_ADDR));
|
|
|
|
imx_set_aips(MX31_IO_ADDRESS(MX31_AIPS2_BASE_ADDR));
|
ARM: SoC specific updates
These changes are all specific to an soc family or the code for
one soc. Lots of work for Tegra3 this time, but also a lot of other
platforms. There will be another (smaller) set of soc patches later in
the merge window for stuff that has dependencies on external trees or
that was sent just before the merge window opened.
The asoc tree added a few devices to the i.mx platform, which conflict
with other devices added in the same place here.
The tegra Makefile conflicts between a number of branches, mostly because
of changes regarding localtimer.c, which was removed in the end.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIVAwUAT24+62CrR//JCVInAQLQBQ/8ClDSFYKTkh3XuzryyO3xkiuuj9wp3/av
oEzro6HmSFDeWlqyQYYM9nKn6n3zFyyumG7oHt3OyRwrtV742rMOpTK+/Ntj2lFB
xUVwKQfu2gEMHvwca3VoXia/pX7knvedEf9bNjeCznkKxQCKCArK2821/2UDGhwx
L3/lD70AhpfK0DInNr6HusnZG2pzCdV1tLXUvgs08I68wL7Ps1TDPOLLyTo9dAgf
k+E1cpRNLahyiVUBfnp+n3Dg0T+/7iD6zrR7bE9i/zhv6XUcLPt2K5XqYnPuQvzK
sHIG8zROmNWzaIzgwYVpJAofi0SHq1OjvA7RtepOq/pGe5QvB9y1RISlpwzBr6Fh
4yuBkeN/Azk0xSHw5w++8L4y/oSSNhB9OWgIZGChZMW33bnHyiZW9mDFJ/PyWD0F
kRl++tTuQqDvT5Wx4DXX8RGekIiFq48+MMx3yJjuGarmVsPEvShQCf8TkBbl/KQY
/AEXMJTaVTED0R/q+NOY/r4oMFC4JtAVo1ZtTga+N5cYWQCwI9HVSgAKw84Yc1Hj
h9r7XjDhmGYFWMfWe9V5NtFNmXl6tAo66fMzSG6+9k+UEXiF1WrhnzBuks5zFU7z
z4WBRL0GmaNBdq58dJoM4lucnuhhQk2m7wz5Lt4o17enw0dAfSXQMstDMnbE7c51
65yZh8o9mxs=
=WdYR
-----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:
"These changes are all specific to an soc family or the code for one
soc. Lots of work for Tegra3 this time, but also a lot of other
platforms. There will be another (smaller) set of soc patches later
in the merge window for stuff that has dependencies on external trees
or that was sent just before the merge window opened.
The asoc tree added a few devices to the i.mx platform, which conflict
with other devices added in the same place here.
The tegra Makefile conflicts between a number of branches, mostly
because of changes regarding localtimer.c, which was removed in the
end.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>"
Fix up some trivial conflicts, including the mentioned Tegra Makefile.
* tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (51 commits)
ARM: EXYNOS: fix cycle count for periodic mode of clock event timers
ARM: EXYNOS: add support JPEG
ARM: EXYNOS: Add DMC1, allow PPMU access for DMC
ARM: SAMSUNG: Correct MIPI-CSIS io memory resource definition
ARM: SAMSUNG: fix __init attribute on regarding s3c_set_platdata()
ARM: SAMSUNG: Add __init attribute to samsung_bl_set()
ARM: S5PV210: Add usb otg phy control
ARM: S3C64XX: Add usb otg phy control
ARM: EXYNOS: Enable l2 configuration through device tree
ARM: EXYNOS: remove useless code to save/restore L2
ARM: EXYNOS: save L2 settings during bootup
ARM: S5P: add L2 early resume code
ARM: EXYNOS: Add support AFTR mode on EXYNOS4210
ARM: mx35: Setup the AIPS registers
ARM: mx5: Use common function for configuring AIPS
ARM: mx3: Setup AIPS registers
ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFI
ARM: defconfig: imx_v6_v7: build in REGULATOR_FIXED_VOLTAGE
ARM: imx: update imx_v6_v7_defconfig
ARM: tegra: Demote EMC clock inconsistency BUG to WARN
...
2012-03-27 23:14:44 +00:00
|
|
|
|
2012-03-05 14:30:52 +00:00
|
|
|
platform_device_register_simple("imx31-audmux", 0, imx31_audmux_res,
|
|
|
|
ARRAY_SIZE(imx31_audmux_res));
|
2011-03-17 08:40:29 +00:00
|
|
|
}
|
2011-11-22 09:07:26 +00:00
|
|
|
#endif /* ifdef CONFIG_SOC_IMX31 */
|
|
|
|
|
|
|
|
#ifdef CONFIG_SOC_IMX35
|
|
|
|
static struct map_desc mx35_io_desc[] __initdata = {
|
|
|
|
imx_map_entry(MX35, X_MEMC, MT_DEVICE),
|
|
|
|
imx_map_entry(MX35, AVIC, MT_DEVICE_NONSHARED),
|
|
|
|
imx_map_entry(MX35, AIPS1, MT_DEVICE_NONSHARED),
|
|
|
|
imx_map_entry(MX35, AIPS2, MT_DEVICE_NONSHARED),
|
|
|
|
imx_map_entry(MX35, SPBA0, MT_DEVICE_NONSHARED),
|
|
|
|
};
|
|
|
|
|
|
|
|
void __init mx35_map_io(void)
|
|
|
|
{
|
|
|
|
iotable_init(mx35_io_desc, ARRAY_SIZE(mx35_io_desc));
|
|
|
|
}
|
|
|
|
|
|
|
|
void __init imx35_init_early(void)
|
|
|
|
{
|
|
|
|
mxc_set_cpu_type(MXC_CPU_MX35);
|
|
|
|
mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR));
|
|
|
|
mxc_arch_reset_init(MX35_IO_ADDRESS(MX35_WDOG_BASE_ADDR));
|
2011-08-03 15:34:59 +00:00
|
|
|
arm_pm_idle = imx3_idle;
|
2012-02-13 19:24:15 +00:00
|
|
|
arch_ioremap_caller = imx3_ioremap_caller;
|
2012-04-03 10:42:27 +00:00
|
|
|
mx3_ccm_base = MX35_IO_ADDRESS(MX35_CCM_BASE_ADDR);
|
2011-11-22 09:07:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void __init mx35_init_irq(void)
|
|
|
|
{
|
|
|
|
mxc_init_irq(MX35_IO_ADDRESS(MX35_AVIC_BASE_ADDR));
|
|
|
|
}
|
2011-09-28 09:16:03 +00:00
|
|
|
|
|
|
|
static struct sdma_script_start_addrs imx35_to1_sdma_script __initdata = {
|
|
|
|
.ap_2_ap_addr = 642,
|
|
|
|
.uart_2_mcu_addr = 817,
|
|
|
|
.mcu_2_app_addr = 747,
|
|
|
|
.uartsh_2_mcu_addr = 1183,
|
|
|
|
.per_2_shp_addr = 1033,
|
|
|
|
.mcu_2_shp_addr = 961,
|
|
|
|
.ata_2_mcu_addr = 1333,
|
|
|
|
.mcu_2_ata_addr = 1252,
|
|
|
|
.app_2_mcu_addr = 683,
|
|
|
|
.shp_2_per_addr = 1111,
|
|
|
|
.shp_2_mcu_addr = 892,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct sdma_script_start_addrs imx35_to2_sdma_script __initdata = {
|
|
|
|
.ap_2_ap_addr = 729,
|
|
|
|
.uart_2_mcu_addr = 904,
|
|
|
|
.per_2_app_addr = 1597,
|
|
|
|
.mcu_2_app_addr = 834,
|
|
|
|
.uartsh_2_mcu_addr = 1270,
|
|
|
|
.per_2_shp_addr = 1120,
|
|
|
|
.mcu_2_shp_addr = 1048,
|
|
|
|
.ata_2_mcu_addr = 1429,
|
|
|
|
.mcu_2_ata_addr = 1339,
|
|
|
|
.app_2_per_addr = 1531,
|
|
|
|
.app_2_mcu_addr = 770,
|
|
|
|
.shp_2_per_addr = 1198,
|
|
|
|
.shp_2_mcu_addr = 979,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct sdma_platform_data imx35_sdma_pdata __initdata = {
|
|
|
|
.fw_name = "sdma-imx35-to2.bin",
|
|
|
|
.script_addrs = &imx35_to2_sdma_script,
|
|
|
|
};
|
|
|
|
|
2012-03-05 14:30:52 +00:00
|
|
|
static const struct resource imx35_audmux_res[] __initconst = {
|
|
|
|
DEFINE_RES_MEM(MX35_AUDMUX_BASE_ADDR, SZ_16K),
|
|
|
|
};
|
|
|
|
|
2011-09-28 09:16:03 +00:00
|
|
|
void __init imx35_soc_init(void)
|
|
|
|
{
|
|
|
|
int to_version = mx35_revision() >> 4;
|
|
|
|
|
2011-09-28 09:16:05 +00:00
|
|
|
imx3_init_l2x0();
|
|
|
|
|
2012-06-22 19:04:06 +00:00
|
|
|
mxc_register_gpio("imx35-gpio", 0, MX35_GPIO1_BASE_ADDR, SZ_16K, MX35_INT_GPIO1, 0);
|
|
|
|
mxc_register_gpio("imx35-gpio", 1, MX35_GPIO2_BASE_ADDR, SZ_16K, MX35_INT_GPIO2, 0);
|
|
|
|
mxc_register_gpio("imx35-gpio", 2, MX35_GPIO3_BASE_ADDR, SZ_16K, MX35_INT_GPIO3, 0);
|
2011-09-28 09:16:03 +00:00
|
|
|
|
2012-05-02 11:31:20 +00:00
|
|
|
pinctrl_provide_dummies();
|
2011-09-28 09:16:03 +00:00
|
|
|
if (to_version == 1) {
|
|
|
|
strncpy(imx35_sdma_pdata.fw_name, "sdma-imx35-to1.bin",
|
|
|
|
strlen(imx35_sdma_pdata.fw_name));
|
|
|
|
imx35_sdma_pdata.script_addrs = &imx35_to1_sdma_script;
|
|
|
|
}
|
|
|
|
|
|
|
|
imx_add_imx_sdma("imx35-sdma", MX35_SDMA_BASE_ADDR, MX35_INT_SDMA, &imx35_sdma_pdata);
|
2012-03-02 10:45:59 +00:00
|
|
|
|
|
|
|
/* Setup AIPS registers */
|
|
|
|
imx_set_aips(MX35_IO_ADDRESS(MX35_AIPS1_BASE_ADDR));
|
|
|
|
imx_set_aips(MX35_IO_ADDRESS(MX35_AIPS2_BASE_ADDR));
|
ARM: SoC specific updates
These changes are all specific to an soc family or the code for
one soc. Lots of work for Tegra3 this time, but also a lot of other
platforms. There will be another (smaller) set of soc patches later in
the merge window for stuff that has dependencies on external trees or
that was sent just before the merge window opened.
The asoc tree added a few devices to the i.mx platform, which conflict
with other devices added in the same place here.
The tegra Makefile conflicts between a number of branches, mostly because
of changes regarding localtimer.c, which was removed in the end.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIVAwUAT24+62CrR//JCVInAQLQBQ/8ClDSFYKTkh3XuzryyO3xkiuuj9wp3/av
oEzro6HmSFDeWlqyQYYM9nKn6n3zFyyumG7oHt3OyRwrtV742rMOpTK+/Ntj2lFB
xUVwKQfu2gEMHvwca3VoXia/pX7knvedEf9bNjeCznkKxQCKCArK2821/2UDGhwx
L3/lD70AhpfK0DInNr6HusnZG2pzCdV1tLXUvgs08I68wL7Ps1TDPOLLyTo9dAgf
k+E1cpRNLahyiVUBfnp+n3Dg0T+/7iD6zrR7bE9i/zhv6XUcLPt2K5XqYnPuQvzK
sHIG8zROmNWzaIzgwYVpJAofi0SHq1OjvA7RtepOq/pGe5QvB9y1RISlpwzBr6Fh
4yuBkeN/Azk0xSHw5w++8L4y/oSSNhB9OWgIZGChZMW33bnHyiZW9mDFJ/PyWD0F
kRl++tTuQqDvT5Wx4DXX8RGekIiFq48+MMx3yJjuGarmVsPEvShQCf8TkBbl/KQY
/AEXMJTaVTED0R/q+NOY/r4oMFC4JtAVo1ZtTga+N5cYWQCwI9HVSgAKw84Yc1Hj
h9r7XjDhmGYFWMfWe9V5NtFNmXl6tAo66fMzSG6+9k+UEXiF1WrhnzBuks5zFU7z
z4WBRL0GmaNBdq58dJoM4lucnuhhQk2m7wz5Lt4o17enw0dAfSXQMstDMnbE7c51
65yZh8o9mxs=
=WdYR
-----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:
"These changes are all specific to an soc family or the code for one
soc. Lots of work for Tegra3 this time, but also a lot of other
platforms. There will be another (smaller) set of soc patches later
in the merge window for stuff that has dependencies on external trees
or that was sent just before the merge window opened.
The asoc tree added a few devices to the i.mx platform, which conflict
with other devices added in the same place here.
The tegra Makefile conflicts between a number of branches, mostly
because of changes regarding localtimer.c, which was removed in the
end.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>"
Fix up some trivial conflicts, including the mentioned Tegra Makefile.
* tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (51 commits)
ARM: EXYNOS: fix cycle count for periodic mode of clock event timers
ARM: EXYNOS: add support JPEG
ARM: EXYNOS: Add DMC1, allow PPMU access for DMC
ARM: SAMSUNG: Correct MIPI-CSIS io memory resource definition
ARM: SAMSUNG: fix __init attribute on regarding s3c_set_platdata()
ARM: SAMSUNG: Add __init attribute to samsung_bl_set()
ARM: S5PV210: Add usb otg phy control
ARM: S3C64XX: Add usb otg phy control
ARM: EXYNOS: Enable l2 configuration through device tree
ARM: EXYNOS: remove useless code to save/restore L2
ARM: EXYNOS: save L2 settings during bootup
ARM: S5P: add L2 early resume code
ARM: EXYNOS: Add support AFTR mode on EXYNOS4210
ARM: mx35: Setup the AIPS registers
ARM: mx5: Use common function for configuring AIPS
ARM: mx3: Setup AIPS registers
ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFI
ARM: defconfig: imx_v6_v7: build in REGULATOR_FIXED_VOLTAGE
ARM: imx: update imx_v6_v7_defconfig
ARM: tegra: Demote EMC clock inconsistency BUG to WARN
...
2012-03-27 23:14:44 +00:00
|
|
|
|
2012-03-05 14:30:52 +00:00
|
|
|
/* i.mx35 has the i.mx31 type audmux */
|
|
|
|
platform_device_register_simple("imx31-audmux", 0, imx35_audmux_res,
|
|
|
|
ARRAY_SIZE(imx35_audmux_res));
|
2011-09-28 09:16:03 +00:00
|
|
|
}
|
2011-11-22 09:07:26 +00:00
|
|
|
#endif /* ifdef CONFIG_SOC_IMX35 */
|