* 'next/devel' of git://git.linaro.org/people/arnd/arm-soc: (50 commits) ARM: tegra: update defconfig arm/tegra: Harmony: Configure PMC for low-level interrupts arm/tegra: device tree support for ventana board arm/tegra: add support for ventana pinmuxing arm/tegra: prepare Seaboard pinmux code for derived boards arm/tegra: pinmux: ioremap registers gpio/tegra: Convert to a platform device arm/tegra: Convert pinmux driver to a platform device arm/dt: Tegra: Add pinmux node to tegra20.dtsi arm/tegra: Prep boards for gpio/pinmux conversion to pdevs ARM: mx5: fix clock usage for suspend ARM i.MX entry-macro.S: remove now unused code ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER ARM i.MX tzic: add handle_irq function ARM i.MX avic: add handle_irq function ARM: mx25: Add the missing IIM base definition ARM i.MX avic: convert to use generic irq chip mx31moboard: Add poweroff support ARM: mach-qong: Add watchdog support ARM: davinci: AM18x: Add wl1271/wlan support ... Fix up conflicts in: arch/arm/mach-at91/at91sam9g45.c arch/arm/mach-mx5/devices-imx53.h arch/arm/plat-mxc/include/mach/memory.htirimbino
Linus Torvalds
13 years ago
commit
16ee792e45
@ -0,0 +1,5 @@ |
||||
NVIDIA Tegra 2 pinmux controller |
||||
|
||||
Required properties: |
||||
- compatible : "nvidia,tegra20-pinmux" |
||||
|
||||
@ -0,0 +1,32 @@ |
||||
/dts-v1/; |
||||
|
||||
/memreserve/ 0x1c000000 0x04000000; |
||||
/include/ "tegra20.dtsi" |
||||
|
||||
/ { |
||||
model = "NVIDIA Tegra2 Ventana evaluation board"; |
||||
compatible = "nvidia,ventana", "nvidia,tegra20"; |
||||
|
||||
chosen { |
||||
bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/ram rdinit=/sbin/init"; |
||||
}; |
||||
|
||||
memory { |
||||
reg = < 0x00000000 0x40000000 >; |
||||
}; |
||||
|
||||
serial@70006300 { |
||||
clock-frequency = < 216000000 >; |
||||
}; |
||||
|
||||
sdhci@c8000400 { |
||||
cd-gpios = <&gpio 69 0>; /* gpio PI5 */ |
||||
wp-gpios = <&gpio 57 0>; /* gpio PH1 */ |
||||
power-gpios = <&gpio 155 0>; /* gpio PT3 */ |
||||
}; |
||||
|
||||
sdhci@c8000600 { |
||||
power-gpios = <&gpio 70 0>; /* gpio PI6 */ |
||||
support-8bit; |
||||
}; |
||||
}; |
||||
@ -1,91 +0,0 @@ |
||||
CONFIG_EXPERIMENTAL=y |
||||
CONFIG_SYSVIPC=y |
||||
CONFIG_IKCONFIG=y |
||||
CONFIG_IKCONFIG_PROC=y |
||||
CONFIG_LOG_BUF_SHIFT=14 |
||||
CONFIG_SYSFS_DEPRECATED_V2=y |
||||
CONFIG_EXPERT=y |
||||
CONFIG_SLAB=y |
||||
CONFIG_MODULES=y |
||||
CONFIG_MODULE_UNLOAD=y |
||||
CONFIG_MODULE_FORCE_UNLOAD=y |
||||
CONFIG_MODVERSIONS=y |
||||
# CONFIG_BLK_DEV_BSG is not set |
||||
CONFIG_ARCH_MXC=y |
||||
CONFIG_ARCH_MX1=y |
||||
CONFIG_ARCH_MX1ADS=y |
||||
CONFIG_MACH_SCB9328=y |
||||
CONFIG_MACH_APF9328=y |
||||
CONFIG_MXC_IRQ_PRIOR=y |
||||
CONFIG_NO_HZ=y |
||||
CONFIG_HIGH_RES_TIMERS=y |
||||
CONFIG_PREEMPT=y |
||||
CONFIG_AEABI=y |
||||
CONFIG_ZBOOT_ROM_TEXT=0x0 |
||||
CONFIG_ZBOOT_ROM_BSS=0x0 |
||||
CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mtdblock2 rw ip=off" |
||||
CONFIG_PM=y |
||||
CONFIG_PM_DEBUG=y |
||||
CONFIG_NET=y |
||||
CONFIG_PACKET=y |
||||
CONFIG_UNIX=y |
||||
CONFIG_INET=y |
||||
CONFIG_IP_PNP=y |
||||
CONFIG_IP_PNP_DHCP=y |
||||
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
||||
# CONFIG_INET_XFRM_MODE_TUNNEL is not set |
||||
# CONFIG_INET_XFRM_MODE_BEET is not set |
||||
# CONFIG_INET_LRO is not set |
||||
# CONFIG_INET_DIAG is not set |
||||
# CONFIG_IPV6 is not set |
||||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
||||
CONFIG_FW_LOADER=m |
||||
CONFIG_MTD=y |
||||
CONFIG_MTD_PARTITIONS=y |
||||
CONFIG_MTD_CMDLINE_PARTS=y |
||||
CONFIG_MTD_CHAR=y |
||||
CONFIG_MTD_BLOCK=y |
||||
CONFIG_MTD_CFI=y |
||||
CONFIG_MTD_PHYSMAP=y |
||||
# CONFIG_BLK_DEV is not set |
||||
# CONFIG_MISC_DEVICES is not set |
||||
CONFIG_NETDEVICES=y |
||||
CONFIG_PHYLIB=y |
||||
CONFIG_SMSC_PHY=y |
||||
CONFIG_NET_ETHERNET=y |
||||
CONFIG_DM9000=y |
||||
# CONFIG_NETDEV_1000 is not set |
||||
# CONFIG_NETDEV_10000 is not set |
||||
# CONFIG_INPUT is not set |
||||
# CONFIG_SERIO is not set |
||||
# CONFIG_VT is not set |
||||
CONFIG_SERIAL_IMX=y |
||||
CONFIG_SERIAL_IMX_CONSOLE=y |
||||
# CONFIG_LEGACY_PTYS is not set |
||||
# CONFIG_HW_RANDOM is not set |
||||
CONFIG_I2C=y |
||||
CONFIG_I2C_CHARDEV=y |
||||
CONFIG_I2C_IMX=y |
||||
CONFIG_W1=y |
||||
CONFIG_W1_MASTER_MXC=y |
||||
CONFIG_W1_SLAVE_THERM=y |
||||
# CONFIG_HWMON is not set |
||||
CONFIG_FB=y |
||||
CONFIG_USB_GADGET=y |
||||
CONFIG_USB_GADGET_IMX=y |
||||
CONFIG_USB_ETH=m |
||||
CONFIG_MMC=y |
||||
CONFIG_MMC_MXC=y |
||||
# CONFIG_DNOTIFY is not set |
||||
CONFIG_INOTIFY=y |
||||
CONFIG_TMPFS=y |
||||
CONFIG_JFFS2_FS=y |
||||
CONFIG_NFS_FS=y |
||||
CONFIG_NFS_V3=y |
||||
CONFIG_NFS_V4=y |
||||
CONFIG_ROOT_NFS=y |
||||
# CONFIG_ENABLE_WARN_DEPRECATED is not set |
||||
# CONFIG_ENABLE_MUST_CHECK is not set |
||||
# CONFIG_RCU_CPU_STALL_DETECTOR is not set |
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y |
||||
# CONFIG_CRYPTO_ANSI_CPRNG is not set |
||||
@ -1,97 +0,0 @@ |
||||
CONFIG_EXPERIMENTAL=y |
||||
# CONFIG_SWAP is not set |
||||
CONFIG_SYSVIPC=y |
||||
CONFIG_LOG_BUF_SHIFT=14 |
||||
CONFIG_SYSFS_DEPRECATED_V2=y |
||||
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
||||
CONFIG_EXPERT=y |
||||
CONFIG_KALLSYMS_EXTRA_PASS=y |
||||
CONFIG_SLAB=y |
||||
CONFIG_MODULES=y |
||||
CONFIG_MODULE_UNLOAD=y |
||||
# CONFIG_BLK_DEV_BSG is not set |
||||
# CONFIG_IOSCHED_DEADLINE is not set |
||||
# CONFIG_IOSCHED_CFQ is not set |
||||
CONFIG_ARCH_MXC=y |
||||
CONFIG_ARCH_MX2=y |
||||
CONFIG_MACH_MX21ADS=y |
||||
CONFIG_MXC_PWM=y |
||||
CONFIG_NO_HZ=y |
||||
CONFIG_HIGH_RES_TIMERS=y |
||||
CONFIG_PREEMPT=y |
||||
CONFIG_AEABI=y |
||||
CONFIG_ZBOOT_ROM_TEXT=0x0 |
||||
CONFIG_ZBOOT_ROM_BSS=0x0 |
||||
CONFIG_NET=y |
||||
CONFIG_INET=y |
||||
CONFIG_IP_PNP=y |
||||
CONFIG_IP_PNP_DHCP=y |
||||
CONFIG_IP_PNP_BOOTP=y |
||||
# CONFIG_INET_XFRM_MODE_TUNNEL is not set |
||||
# CONFIG_INET_XFRM_MODE_BEET is not set |
||||
# CONFIG_INET_LRO is not set |
||||
# CONFIG_INET_DIAG is not set |
||||
# CONFIG_IPV6 is not set |
||||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
||||
# CONFIG_FW_LOADER is not set |
||||
CONFIG_MTD=y |
||||
CONFIG_MTD_DEBUG=y |
||||
CONFIG_MTD_DEBUG_VERBOSE=3 |
||||
CONFIG_MTD_PARTITIONS=y |
||||
CONFIG_MTD_REDBOOT_PARTS=y |
||||
CONFIG_MTD_CMDLINE_PARTS=y |
||||
CONFIG_MTD_CHAR=y |
||||
CONFIG_MTD_BLOCK=y |
||||
CONFIG_MTD_CFI=y |
||||
CONFIG_MTD_CFI_ADV_OPTIONS=y |
||||
CONFIG_MTD_CFI_GEOMETRY=y |
||||
# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set |
||||
CONFIG_MTD_CFI_AMDSTD=y |
||||
CONFIG_MTD_PHYSMAP=y |
||||
CONFIG_MTD_NAND=y |
||||
CONFIG_MTD_NAND_MXC=y |
||||
CONFIG_NETDEVICES=y |
||||
CONFIG_NET_ETHERNET=y |
||||
CONFIG_MII=y |
||||
# CONFIG_NETDEV_1000 is not set |
||||
# CONFIG_NETDEV_10000 is not set |
||||
# CONFIG_INPUT_MOUSEDEV is not set |
||||
CONFIG_INPUT_EVDEV=y |
||||
# CONFIG_INPUT_KEYBOARD is not set |
||||
# CONFIG_INPUT_MOUSE is not set |
||||
CONFIG_INPUT_TOUCHSCREEN=y |
||||
# CONFIG_SERIO is not set |
||||
# CONFIG_CONSOLE_TRANSLATIONS is not set |
||||
CONFIG_SERIAL_8250=y |
||||
CONFIG_SERIAL_8250_CONSOLE=y |
||||
CONFIG_SERIAL_8250_NR_UARTS=1 |
||||
CONFIG_SERIAL_IMX=y |
||||
CONFIG_SERIAL_IMX_CONSOLE=y |
||||
# CONFIG_LEGACY_PTYS is not set |
||||
# CONFIG_HW_RANDOM is not set |
||||
CONFIG_I2C=y |
||||
CONFIG_I2C_CHARDEV=y |
||||
CONFIG_I2C_IMX=y |
||||
CONFIG_SPI=y |
||||
# CONFIG_HWMON is not set |
||||
CONFIG_FB=y |
||||
CONFIG_FB_IMX=y |
||||
# CONFIG_VGA_CONSOLE is not set |
||||
CONFIG_FRAMEBUFFER_CONSOLE=y |
||||
CONFIG_FONTS=y |
||||
CONFIG_FONT_8x8=y |
||||
CONFIG_LOGO=y |
||||
# CONFIG_HID_SUPPORT is not set |
||||
# CONFIG_USB_SUPPORT is not set |
||||
CONFIG_MMC=y |
||||
CONFIG_MMC_MXC=y |
||||
# CONFIG_DNOTIFY is not set |
||||
CONFIG_MSDOS_FS=y |
||||
CONFIG_TMPFS=y |
||||
CONFIG_JFFS2_FS=y |
||||
CONFIG_NFS_FS=y |
||||
CONFIG_NFS_V3=y |
||||
CONFIG_ROOT_NFS=y |
||||
# CONFIG_RCU_CPU_STALL_DETECTOR is not set |
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y |
||||
# CONFIG_CRYPTO_ANSI_CPRNG is not set |
||||
@ -0,0 +1,41 @@ |
||||
/*
|
||||
* MX25 CPU type detection |
||||
* |
||||
* Copyright (c) 2009 Daniel Mack <daniel@caiaq.de> |
||||
* Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved |
||||
* |
||||
* 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. |
||||
*/ |
||||
#include <linux/module.h> |
||||
#include <linux/io.h> |
||||
#include <mach/hardware.h> |
||||
#include <mach/iim.h> |
||||
|
||||
static int mx25_cpu_rev = -1; |
||||
|
||||
static int mx25_read_cpu_rev(void) |
||||
{ |
||||
u32 rev; |
||||
|
||||
rev = __raw_readl(MX25_IO_ADDRESS(MX25_IIM_BASE_ADDR + MXC_IIMSREV)); |
||||
switch (rev) { |
||||
case 0x00: |
||||
return IMX_CHIP_REVISION_1_0; |
||||
case 0x01: |
||||
return IMX_CHIP_REVISION_1_1; |
||||
default: |
||||
return IMX_CHIP_REVISION_UNKNOWN; |
||||
} |
||||
} |
||||
|
||||
int mx25_revision(void) |
||||
{ |
||||
if (mx25_cpu_rev == -1) |
||||
mx25_cpu_rev = mx25_read_cpu_rev(); |
||||
|
||||
return mx25_cpu_rev; |
||||
} |
||||
EXPORT_SYMBOL(mx25_revision); |
||||
@ -0,0 +1,60 @@ |
||||
/*
|
||||
* Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved. |
||||
* |
||||
* 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/compiler.h> |
||||
#include <linux/err.h> |
||||
#include <linux/init.h> |
||||
|
||||
#include <mach/mx23.h> |
||||
#include <mach/mx28.h> |
||||
#include <mach/devices-common.h> |
||||
|
||||
#define mxs_saif_data_entry_single(soc, _id) \ |
||||
{ \
|
||||
.id = _id, \
|
||||
.iobase = soc ## _SAIF ## _id ## _BASE_ADDR, \
|
||||
.irq = soc ## _INT_SAIF ## _id, \
|
||||
.dma = soc ## _DMA_SAIF ## _id, \
|
||||
.dmairq = soc ## _INT_SAIF ## _id ##_DMA, \
|
||||
} |
||||
|
||||
#define mxs_saif_data_entry(soc, _id) \ |
||||
[_id] = mxs_saif_data_entry_single(soc, _id) |
||||
|
||||
#ifdef CONFIG_SOC_IMX28 |
||||
const struct mxs_saif_data mx28_saif_data[] __initconst = { |
||||
mxs_saif_data_entry(MX28, 0), |
||||
mxs_saif_data_entry(MX28, 1), |
||||
}; |
||||
#endif |
||||
|
||||
struct platform_device *__init mxs_add_saif(const struct mxs_saif_data *data) |
||||
{ |
||||
struct resource res[] = { |
||||
{ |
||||
.start = data->iobase, |
||||
.end = data->iobase + SZ_4K - 1, |
||||
.flags = IORESOURCE_MEM, |
||||
}, { |
||||
.start = data->irq, |
||||
.end = data->irq, |
||||
.flags = IORESOURCE_IRQ, |
||||
}, { |
||||
.start = data->dma, |
||||
.end = data->dma, |
||||
.flags = IORESOURCE_DMA, |
||||
}, { |
||||
.start = data->dmairq, |
||||
.end = data->dmairq, |
||||
.flags = IORESOURCE_IRQ, |
||||
}, |
||||
|
||||
}; |
||||
|
||||
return mxs_add_platform_device("mxs-saif", data->id, res, |
||||
ARRAY_SIZE(res), NULL, 0); |
||||
} |
||||
@ -0,0 +1,51 @@ |
||||
/*
|
||||
* Copyright (C) 2011 Pengutronix, Wolfram Sang <w.sang@pengutronix.de> |
||||
* |
||||
* 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 <asm/sizes.h> |
||||
#include <mach/mx23.h> |
||||
#include <mach/mx28.h> |
||||
#include <mach/devices-common.h> |
||||
|
||||
#ifdef CONFIG_SOC_IMX23 |
||||
struct platform_device *__init mx23_add_rtc_stmp3xxx(void) |
||||
{ |
||||
struct resource res[] = { |
||||
{ |
||||
.start = MX23_RTC_BASE_ADDR, |
||||
.end = MX23_RTC_BASE_ADDR + SZ_8K - 1, |
||||
.flags = IORESOURCE_MEM, |
||||
}, { |
||||
.start = MX23_INT_RTC_ALARM, |
||||
.end = MX23_INT_RTC_ALARM, |
||||
.flags = IORESOURCE_IRQ, |
||||
}, |
||||
}; |
||||
|
||||
return mxs_add_platform_device("stmp3xxx-rtc", 0, res, ARRAY_SIZE(res), |
||||
NULL, 0); |
||||
} |
||||
#endif /* CONFIG_SOC_IMX23 */ |
||||
|
||||
#ifdef CONFIG_SOC_IMX28 |
||||
struct platform_device *__init mx28_add_rtc_stmp3xxx(void) |
||||
{ |
||||
struct resource res[] = { |
||||
{ |
||||
.start = MX28_RTC_BASE_ADDR, |
||||
.end = MX28_RTC_BASE_ADDR + SZ_8K - 1, |
||||
.flags = IORESOURCE_MEM, |
||||
}, { |
||||
.start = MX28_INT_RTC_ALARM, |
||||
.end = MX28_INT_RTC_ALARM, |
||||
.flags = IORESOURCE_IRQ, |
||||
}, |
||||
}; |
||||
|
||||
return mxs_add_platform_device("stmp3xxx-rtc", 0, res, ARRAY_SIZE(res), |
||||
NULL, 0); |
||||
} |
||||
#endif /* CONFIG_SOC_IMX28 */ |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue