Commit 1c496784 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'omap-for-linus' of...

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (149 commits)
  arm: omap: Add omap3_defconfig
  AM35xx: Defconfig for AM3517 EVM board
  AM35xx: Add support for AM3517 EVM board
  omap: 3630sdp: defconfig creation
  omap: 3630sdp: introduce 3630 sdp board support
  omap3: Add defconfig for IGEP v2 board
  omap3: Add minimal IGEP v2 support
  omap3: Add CompuLab CM-T35 defconfig
  omap3: Add CompuLab CM-T35 board support
  omap3: rx51: Add wl1251 wlan driver support
  omap3: rx51: Add SDRAM init
  omap1: Add default kernel configuration for Herald
  omap1: Add board support and LCD for HTC Herald
  omap: zoom2: update defconfig for LL_DEBUG_NONE
  omap: zoom3: defconfig creation
  omap3: zoom: Introduce zoom3 board support
  omap3: zoom: Drop i2c-1 speed to 2400
  omap3: zoom: rename zoom2 name to generic zoom
  omap3: zoom: split board file for software reuse
  omap3evm: MIgrate to smsc911x ethernet driver
  ...

Fix trivial conflict (two unrelated config options added next to each
other) in arch/arm/mach-omap2/Makefile
parents adf9904d 9a01609e
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -52,8 +52,8 @@ CONFIG_FAIR_GROUP_SCHED=y ...@@ -52,8 +52,8 @@ CONFIG_FAIR_GROUP_SCHED=y
# CONFIG_RT_GROUP_SCHED is not set # CONFIG_RT_GROUP_SCHED is not set
CONFIG_USER_SCHED=y CONFIG_USER_SCHED=y
# CONFIG_CGROUP_SCHED is not set # CONFIG_CGROUP_SCHED is not set
CONFIG_SYSFS_DEPRECATED=y # CONFIG_SYSFS_DEPRECATED=y is not set
CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_SYSFS_DEPRECATED_V2=y is not set
# CONFIG_RELAY is not set # CONFIG_RELAY is not set
# CONFIG_NAMESPACES is not set # CONFIG_NAMESPACES is not set
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
......
This diff is collapsed.
...@@ -59,8 +59,8 @@ CONFIG_FAIR_GROUP_SCHED=y ...@@ -59,8 +59,8 @@ CONFIG_FAIR_GROUP_SCHED=y
CONFIG_USER_SCHED=y CONFIG_USER_SCHED=y
# CONFIG_CGROUP_SCHED is not set # CONFIG_CGROUP_SCHED is not set
# CONFIG_CGROUPS is not set # CONFIG_CGROUPS is not set
CONFIG_SYSFS_DEPRECATED=y # CONFIG_SYSFS_DEPRECATED=y is not set
CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_SYSFS_DEPRECATED_V2=y is not set
# CONFIG_RELAY is not set # CONFIG_RELAY is not set
# CONFIG_NAMESPACES is not set # CONFIG_NAMESPACES is not set
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
...@@ -617,8 +617,8 @@ CONFIG_MII=y ...@@ -617,8 +617,8 @@ CONFIG_MII=y
# CONFIG_DM9000 is not set # CONFIG_DM9000 is not set
# CONFIG_ENC28J60 is not set # CONFIG_ENC28J60 is not set
# CONFIG_ETHOC is not set # CONFIG_ETHOC is not set
CONFIG_SMC911X=y # CONFIG_SMC911X is not set
# CONFIG_SMSC911X is not set CONFIG_SMSC911X=y
# CONFIG_DNET is not set # CONFIG_DNET is not set
# CONFIG_IBM_NEW_EMAC_ZMII is not set # CONFIG_IBM_NEW_EMAC_ZMII is not set
# CONFIG_IBM_NEW_EMAC_RGMII is not set # CONFIG_IBM_NEW_EMAC_RGMII is not set
...@@ -676,13 +676,19 @@ CONFIG_INPUT_EVDEV=y ...@@ -676,13 +676,19 @@ CONFIG_INPUT_EVDEV=y
# Input Device Drivers # Input Device Drivers
# #
CONFIG_INPUT_KEYBOARD=y CONFIG_INPUT_KEYBOARD=y
# CONFIG_KEYBOARD_ADP5588 is not set
# CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_ATKBD is not set
# CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_QT2160 is not set
# CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_LKKBD is not set
# CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_GPIO is not set
# CONFIG_KEYBOARD_MATRIX is not set
# CONFIG_KEYBOARD_MAX7359 is not set
# CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_OPENCORES is not set
# CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_GPIO is not set # CONFIG_KEYBOARD_SUNKBD is not set
CONFIG_KEYBOARD_TWL4030=y
# CONFIG_KEYBOARD_XTKBD is not set
# CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TABLET is not set
...@@ -1126,7 +1132,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y ...@@ -1126,7 +1132,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
# #
# CONFIG_MMC_SDHCI is not set # CONFIG_MMC_SDHCI is not set
# CONFIG_MMC_OMAP is not set # CONFIG_MMC_OMAP is not set
CONFIG_MMC_OMAP_HS=m CONFIG_MMC_OMAP_HS=y
# CONFIG_MMC_SPI is not set # CONFIG_MMC_SPI is not set
# CONFIG_MEMSTICK is not set # CONFIG_MEMSTICK is not set
# CONFIG_ACCESSIBILITY is not set # CONFIG_ACCESSIBILITY is not set
......
...@@ -51,8 +51,9 @@ CONFIG_FAIR_GROUP_SCHED=y ...@@ -51,8 +51,9 @@ CONFIG_FAIR_GROUP_SCHED=y
# CONFIG_RT_GROUP_SCHED is not set # CONFIG_RT_GROUP_SCHED is not set
CONFIG_USER_SCHED=y CONFIG_USER_SCHED=y
# CONFIG_CGROUP_SCHED is not set # CONFIG_CGROUP_SCHED is not set
CONFIG_SYSFS_DEPRECATED=y # CONFIG_SYSFS_DEPRECATED=y is not set
CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_SYSFS_DEPRECATED_V2=y is not set
# CONFIG_RELAY is not set # CONFIG_RELAY is not set
# CONFIG_NAMESPACES is not set # CONFIG_NAMESPACES is not set
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
......
This diff is collapsed.
This diff is collapsed.
...@@ -52,8 +52,8 @@ CONFIG_FAIR_GROUP_SCHED=y ...@@ -52,8 +52,8 @@ CONFIG_FAIR_GROUP_SCHED=y
CONFIG_USER_SCHED=y CONFIG_USER_SCHED=y
# CONFIG_CGROUP_SCHED is not set # CONFIG_CGROUP_SCHED is not set
# CONFIG_CGROUPS is not set # CONFIG_CGROUPS is not set
CONFIG_SYSFS_DEPRECATED=y # CONFIG_SYSFS_DEPRECATED=y is not set
CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_SYSFS_DEPRECATED_V2=y is not set
# CONFIG_RELAY is not set # CONFIG_RELAY is not set
# CONFIG_NAMESPACES is not set # CONFIG_NAMESPACES is not set
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
......
...@@ -49,8 +49,8 @@ CONFIG_FAIR_GROUP_SCHED=y ...@@ -49,8 +49,8 @@ CONFIG_FAIR_GROUP_SCHED=y
# CONFIG_RT_GROUP_SCHED is not set # CONFIG_RT_GROUP_SCHED is not set
CONFIG_USER_SCHED=y CONFIG_USER_SCHED=y
# CONFIG_CGROUP_SCHED is not set # CONFIG_CGROUP_SCHED is not set
CONFIG_SYSFS_DEPRECATED=y # CONFIG_SYSFS_DEPRECATED=y is not set
CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_SYSFS_DEPRECATED_V2=y is not set
# CONFIG_RELAY is not set # CONFIG_RELAY is not set
# CONFIG_NAMESPACES is not set # CONFIG_NAMESPACES is not set
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
......
...@@ -59,8 +59,8 @@ CONFIG_FAIR_GROUP_SCHED=y ...@@ -59,8 +59,8 @@ CONFIG_FAIR_GROUP_SCHED=y
CONFIG_USER_SCHED=y CONFIG_USER_SCHED=y
# CONFIG_CGROUP_SCHED is not set # CONFIG_CGROUP_SCHED is not set
# CONFIG_CGROUPS is not set # CONFIG_CGROUPS is not set
CONFIG_SYSFS_DEPRECATED=y # CONFIG_SYSFS_DEPRECATED=y is not set
CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_SYSFS_DEPRECATED_V2=y is not set
# CONFIG_RELAY is not set # CONFIG_RELAY is not set
# CONFIG_NAMESPACES is not set # CONFIG_NAMESPACES is not set
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
...@@ -202,7 +202,8 @@ CONFIG_OMAP_32K_TIMER_HZ=128 ...@@ -202,7 +202,8 @@ CONFIG_OMAP_32K_TIMER_HZ=128
CONFIG_OMAP_DM_TIMER=y CONFIG_OMAP_DM_TIMER=y
# CONFIG_OMAP_LL_DEBUG_UART1 is not set # CONFIG_OMAP_LL_DEBUG_UART1 is not set
# CONFIG_OMAP_LL_DEBUG_UART2 is not set # CONFIG_OMAP_LL_DEBUG_UART2 is not set
CONFIG_OMAP_LL_DEBUG_UART3=y # CONFIG_OMAP_LL_DEBUG_UART3 is not set
CONFIG_OMAP_LL_DEBUG_NONE=y
CONFIG_ARCH_OMAP34XX=y CONFIG_ARCH_OMAP34XX=y
CONFIG_ARCH_OMAP3430=y CONFIG_ARCH_OMAP3430=y
......
This diff is collapsed.
...@@ -54,8 +54,8 @@ CONFIG_FAIR_GROUP_SCHED=y ...@@ -54,8 +54,8 @@ CONFIG_FAIR_GROUP_SCHED=y
# CONFIG_RT_GROUP_SCHED is not set # CONFIG_RT_GROUP_SCHED is not set
CONFIG_USER_SCHED=y CONFIG_USER_SCHED=y
# CONFIG_CGROUP_SCHED is not set # CONFIG_CGROUP_SCHED is not set
CONFIG_SYSFS_DEPRECATED=y # CONFIG_SYSFS_DEPRECATED=y is not set
CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_SYSFS_DEPRECATED_V2=y is not set
# CONFIG_RELAY is not set # CONFIG_RELAY is not set
# CONFIG_NAMESPACES is not set # CONFIG_NAMESPACES is not set
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
......
...@@ -784,7 +784,7 @@ CONFIG_INPUT_KEYBOARD=y ...@@ -784,7 +784,7 @@ CONFIG_INPUT_KEYBOARD=y
# CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_XTKBD is not set
# CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_GPIO is not set CONFIG_KEYBOARD_GPIO=m
# CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TABLET is not set
......
...@@ -11,6 +11,7 @@ config ARCH_OMAP850 ...@@ -11,6 +11,7 @@ config ARCH_OMAP850
depends on ARCH_OMAP1 depends on ARCH_OMAP1
bool "OMAP850 Based System" bool "OMAP850 Based System"
select CPU_ARM926T select CPU_ARM926T
select ARCH_OMAP_OTG
config ARCH_OMAP15XX config ARCH_OMAP15XX
depends on ARCH_OMAP1 depends on ARCH_OMAP1
...@@ -56,6 +57,12 @@ config MACH_OMAP_HTCWIZARD ...@@ -56,6 +57,12 @@ config MACH_OMAP_HTCWIZARD
help help
HTC Wizard smartphone support (AKA QTEK 9100, ...) HTC Wizard smartphone support (AKA QTEK 9100, ...)
config MACH_HERALD
bool "HTC Herald"
depends on ARCH_OMAP850
help
HTC Herald smartphone support (AKA T-Mobile Wing, ...)
config MACH_OMAP_OSK config MACH_OMAP_OSK
bool "TI OSK Support" bool "TI OSK Support"
depends on ARCH_OMAP1 && ARCH_OMAP16XX depends on ARCH_OMAP1 && ARCH_OMAP16XX
......
...@@ -34,6 +34,7 @@ obj-$(CONFIG_MACH_OMAP_PALMTT) += board-palmtt.o ...@@ -34,6 +34,7 @@ obj-$(CONFIG_MACH_OMAP_PALMTT) += board-palmtt.o
obj-$(CONFIG_MACH_NOKIA770) += board-nokia770.o obj-$(CONFIG_MACH_NOKIA770) += board-nokia770.o
obj-$(CONFIG_MACH_AMS_DELTA) += board-ams-delta.o obj-$(CONFIG_MACH_AMS_DELTA) += board-ams-delta.o
obj-$(CONFIG_MACH_SX1) += board-sx1.o board-sx1-mmc.o obj-$(CONFIG_MACH_SX1) += board-sx1.o board-sx1-mmc.o
obj-$(CONFIG_MACH_HERALD) += board-htcherald.o
ifeq ($(CONFIG_ARCH_OMAP15XX),y) ifeq ($(CONFIG_ARCH_OMAP15XX),y)
# Innovator-1510 FPGA # Innovator-1510 FPGA
......
...@@ -25,13 +25,13 @@ ...@@ -25,13 +25,13 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/board-ams-delta.h> #include <plat/board-ams-delta.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/common.h> #include <plat/common.h>
static u8 ams_delta_latch1_reg; static u8 ams_delta_latch1_reg;
static u16 ams_delta_latch2_reg; static u16 ams_delta_latch2_reg;
......
...@@ -26,14 +26,14 @@ ...@@ -26,14 +26,14 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/fpga.h> #include <plat/fpga.h>
#include <mach/nand.h> #include <plat/nand.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/board.h> #include <plat/board.h>
/* fsample is pretty close to p2-sample */ /* fsample is pretty close to p2-sample */
...@@ -107,7 +107,7 @@ static struct resource smc91x_resources[] = { ...@@ -107,7 +107,7 @@ static struct resource smc91x_resources[] = {
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
.start = INT_730_MPU_EXT_NIRQ, .start = INT_7XX_MPU_EXT_NIRQ,
.end = 0, .end = 0,
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
}, },
...@@ -196,8 +196,8 @@ static struct platform_device smc91x_device = { ...@@ -196,8 +196,8 @@ static struct platform_device smc91x_device = {
static struct resource kp_resources[] = { static struct resource kp_resources[] = {
[0] = { [0] = {
.start = INT_730_MPUIO_KEYPAD, .start = INT_7XX_MPUIO_KEYPAD,
.end = INT_730_MPUIO_KEYPAD, .end = INT_7XX_MPUIO_KEYPAD,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
}; };
...@@ -309,7 +309,7 @@ static void __init omap_fsample_map_io(void) ...@@ -309,7 +309,7 @@ static void __init omap_fsample_map_io(void)
/* /*
* Hold GSM Reset until needed * Hold GSM Reset until needed
*/ */
omap_writew(omap_readw(OMAP730_DSP_M_CTL) & ~1, OMAP730_DSP_M_CTL); omap_writew(omap_readw(OMAP7XX_DSP_M_CTL) & ~1, OMAP7XX_DSP_M_CTL);
/* /*
* UARTs -> done automagically by 8250 driver * UARTs -> done automagically by 8250 driver
...@@ -320,21 +320,21 @@ static void __init omap_fsample_map_io(void) ...@@ -320,21 +320,21 @@ static void __init omap_fsample_map_io(void)
*/ */
/* Flash: CS0 timings setup */ /* Flash: CS0 timings setup */
omap_writel(0x0000fff3, OMAP730_FLASH_CFG_0); omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_0);
omap_writel(0x00000088, OMAP730_FLASH_ACFG_0); omap_writel(0x00000088, OMAP7XX_FLASH_ACFG_0);
/* /*
* Ethernet support through the debug board * Ethernet support through the debug board
* CS1 timings setup * CS1 timings setup
*/ */
omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1); omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_1);
omap_writel(0x00000000, OMAP730_FLASH_ACFG_1); omap_writel(0x00000000, OMAP7XX_FLASH_ACFG_1);
/* /*
* Configure MPU_EXT_NIRQ IO in IO_CONF9 register, * Configure MPU_EXT_NIRQ IO in IO_CONF9 register,
* It is used as the Ethernet controller interrupt * It is used as the Ethernet controller interrupt
*/ */
omap_writel(omap_readl(OMAP730_IO_CONF_9) & 0x1FFFFFFF, OMAP730_IO_CONF_9); omap_writel(omap_readl(OMAP7XX_IO_CONF_9) & 0x1FFFFFFF, OMAP7XX_IO_CONF_9);
} }
MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample") MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample")
......
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/common.h> #include <plat/common.h>
static void __init omap_generic_init_irq(void) static void __init omap_generic_init_irq(void)
{ {
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/i2c/tps65010.h> #include <linux/i2c/tps65010.h>
#include <mach/mmc.h> #include <plat/mmc.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include "board-h2.h" #include "board-h2.h"
......
...@@ -37,14 +37,14 @@ ...@@ -37,14 +37,14 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/nand.h> #include <plat/nand.h>
#include <mach/irda.h> #include <plat/irda.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/common.h> #include <plat/common.h>
#include "board-h2.h" #include "board-h2.h"
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/i2c/tps65010.h> #include <linux/i2c/tps65010.h>
#include <mach/mmc.h> #include <plat/mmc.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include "board-h3.h" #include "board-h3.h"
......
...@@ -40,13 +40,13 @@ ...@@ -40,13 +40,13 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/nand.h> #include <plat/nand.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/common.h> #include <plat/common.h>
#include "board-h3.h" #include "board-h3.h"
......
/*
* HTC Herald board configuration
* Copyright (C) 2009 Cory Maccarrone <darkstar6262@gmail.com>
* Copyright (C) 2009 Wing Linux
*
* Based on the board-htcwizard.c file from the linwizard project:
* Copyright (C) 2006 Unai Uribarri
* Copyright (C) 2008 linwizard.sourceforge.net
*
* 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.
*
* 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 Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*
*/
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/input.h>
#include <linux/bootmem.h>
#include <linux/io.h>
#include <linux/gpio.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <plat/omap7xx.h>
#include <plat/common.h>
#include <plat/board.h>
#include <plat/keypad.h>
#include <mach/irqs.h>
#include <linux/delay.h>
/* LCD register definition */
#define OMAP_LCDC_CONTROL (0xfffec000 + 0x00)
#define OMAP_LCDC_STATUS (0xfffec000 + 0x10)
#define OMAP_DMA_LCD_CCR (0xfffee300 + 0xc2)
#define OMAP_DMA_LCD_CTRL (0xfffee300 + 0xc4)
#define OMAP_LCDC_CTRL_LCD_EN (1 << 0)
#define OMAP_LCDC_STAT_DONE (1 << 0)
static struct omap_lcd_config htcherald_lcd_config __initdata = {
.ctrl_name = "internal",
};
static struct omap_board_config_kernel htcherald_config[] __initdata = {
{ OMAP_TAG_LCD, &htcherald_lcd_config },
};
/* Keyboard definition */
static int htc_herald_keymap[] = {
KEY(0, 0, KEY_RECORD), /* Mail button */
KEY(0, 1, KEY_CAMERA), /* Camera */
KEY(0, 2, KEY_PHONE), /* Send key */
KEY(0, 3, KEY_VOLUMEUP), /* Volume up */
KEY(0, 4, KEY_F2), /* Right bar (landscape) */
KEY(0, 5, KEY_MAIL), /* Win key (portrait) */
KEY(0, 6, KEY_DIRECTORY), /* Right bar (protrait) */
KEY(1, 0, KEY_LEFTCTRL), /* Windows key */
KEY(1, 1, KEY_COMMA),
KEY(1, 2, KEY_M),
KEY(1, 3, KEY_K),
KEY(1, 4, KEY_SLASH), /* OK key */
KEY(1, 5, KEY_I),
KEY(1, 6, KEY_U),
KEY(2, 0, KEY_LEFTALT),
KEY(2, 1, KEY_TAB),
KEY(2, 2, KEY_N),
KEY(2, 3, KEY_J),
KEY(2, 4, KEY_ENTER),
KEY(2, 5, KEY_H),
KEY(2, 6, KEY_Y),
KEY(3, 0, KEY_SPACE),
KEY(3, 1, KEY_L),
KEY(3, 2, KEY_B),
KEY(3, 3, KEY_V),
KEY(3, 4, KEY_BACKSPACE),
KEY(3, 5, KEY_G),
KEY(3, 6, KEY_T),
KEY(4, 0, KEY_CAPSLOCK), /* Shift */
KEY(4, 1, KEY_C),
KEY(4, 2, KEY_F),
KEY(4, 3, KEY_R),
KEY(4, 4, KEY_O),
KEY(4, 5, KEY_E),
KEY(4, 6, KEY_D),
KEY(5, 0, KEY_X),
KEY(5, 1, KEY_Z),
KEY(5, 2, KEY_S),
KEY(5, 3, KEY_W),
KEY(5, 4, KEY_P),
KEY(5, 5, KEY_Q),
KEY(5, 6, KEY_A),
KEY(6, 0, KEY_CONNECT), /* Voice button */
KEY(6, 2, KEY_CANCEL), /* End key */
KEY(6, 3, KEY_VOLUMEDOWN), /* Volume down */
KEY(6, 4, KEY_F1), /* Left bar (landscape) */
KEY(6, 5, KEY_WWW), /* OK button (portrait) */
KEY(6, 6, KEY_CALENDAR), /* Left bar (portrait) */
0
};
struct omap_kp_platform_data htcherald_kp_data = {
.rows = 7,
.cols = 7,
.delay = 20,
.rep = 1,
.keymap = htc_herald_keymap,
};
static struct resource kp_resources[] = {
[0] = {
.start = INT_7XX_MPUIO_KEYPAD,
.end = INT_7XX_MPUIO_KEYPAD,
.flags = IORESOURCE_IRQ,
},
};
static struct platform_device kp_device = {
.name = "omap-keypad",
.id = -1,
.dev = {
.platform_data = &htcherald_kp_data,
},
.num_resources = ARRAY_SIZE(kp_resources),
.resource = kp_resources,
};
/* LCD Device resources */
static struct platform_device lcd_device = {
.name = "lcd_htcherald",
.id = -1,
};
static struct platform_device *devices[] __initdata = {
&kp_device,
&lcd_device,
};
/*
* Init functions from here on
*/
static void __init htcherald_lcd_init(void)
{
u32 reg;
unsigned int tries = 200;
/* disable controller if active */
reg = omap_readl(OMAP_LCDC_CONTROL);
if (reg & OMAP_LCDC_CTRL_LCD_EN) {
reg &= ~OMAP_LCDC_CTRL_LCD_EN;
omap_writel(reg, OMAP_LCDC_CONTROL);
/* wait for end of frame */
while (!(omap_readl(OMAP_LCDC_STATUS) & OMAP_LCDC_STAT_DONE)) {
tries--;
if (!tries)
break;
}
if (!tries)
printk(KERN_WARNING "Timeout waiting for end of frame "
"-- LCD may not be available\n");
/* turn off DMA */
reg = omap_readw(OMAP_DMA_LCD_CCR);
reg &= ~(1 << 7);
omap_writew(reg, OMAP_DMA_LCD_CCR);
reg = omap_readw(OMAP_DMA_LCD_CTRL);
reg &= ~(1 << 8);
omap_writew(reg, OMAP_DMA_LCD_CTRL);
}
}
static void __init htcherald_map_io(void)
{
omap1_map_common_io();
/*
* The LCD panel must be disabled and DMA turned off here, as doing
* it later causes the LCD never to reinitialize.
*/
htcherald_lcd_init();
printk(KERN_INFO "htcherald_map_io done.\n");
}
static void __init htcherald_disable_watchdog(void)
{
/* Disable watchdog if running */
if (omap_readl(OMAP_WDT_TIMER_MODE) & 0x8000) {
/*
* disable a potentially running watchdog timer before
* it kills us.
*/
printk(KERN_WARNING "OMAP850 Watchdog seems to be activated, disabling it for now.\n");
omap_writel(0xF5, OMAP_WDT_TIMER_MODE);
omap_writel(0xA0, OMAP_WDT_TIMER_MODE);
}
}
static void __init htcherald_init(void)
{
printk(KERN_INFO "HTC Herald init.\n");
omap_gpio_init();
omap_board_config = htcherald_config;
omap_board_config_size = ARRAY_SIZE(htcherald_config);
platform_add_devices(devices, ARRAY_SIZE(devices));
htcherald_disable_watchdog();
}
static void __init htcherald_init_irq(void)
{
printk(KERN_INFO "htcherald_init_irq.\n");
omap1_init_common_hw();
omap_init_irq();
}
MACHINE_START(HERALD, "HTC Herald")
/* Maintainer: Cory Maccarrone <darkstar6262@gmail.com> */
/* Maintainer: wing-linux.sourceforge.net */
.phys_io = 0xfff00000,
.io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
.boot_params = 0x10000100,
.map_io = htcherald_map_io,
.init_irq = htcherald_init_irq,
.init_machine = htcherald_init,
.timer = &omap_timer,
MACHINE_END
...@@ -30,14 +30,14 @@ ...@@ -30,14 +30,14 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/fpga.h> #include <plat/fpga.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/mmc.h> #include <plat/mmc.h>
/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */ /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
#define INNOVATOR1610_ETHR_START 0x04000300 #define INNOVATOR1610_ETHR_START 0x04000300
......
...@@ -26,17 +26,17 @@ ...@@ -26,17 +26,17 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/dsp_common.h> #include <plat/dsp_common.h>
#include <mach/omapfb.h> #include <plat/omapfb.h>
#include <mach/hwa742.h> #include <plat/hwa742.h>
#include <mach/lcd_mipid.h> #include <plat/lcd_mipid.h>
#include <mach/mmc.h> #include <plat/mmc.h>
#include <mach/clock.h> #include <plat/clock.h>
#define ADS7846_PENDOWN_GPIO 15 #define ADS7846_PENDOWN_GPIO 15
......
...@@ -47,10 +47,10 @@ ...@@ -47,10 +47,10 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/common.h> #include <plat/common.h>
/* At OMAP5912 OSK the Ethernet is directly connected to CS1 */ /* At OMAP5912 OSK the Ethernet is directly connected to CS1 */
#define OMAP_OSK_ETHR_START 0x04800300 #define OMAP_OSK_ETHR_START 0x04800300
...@@ -312,7 +312,7 @@ static struct omap_board_config_kernel osk_config[] __initdata = { ...@@ -312,7 +312,7 @@ static struct omap_board_config_kernel osk_config[] __initdata = {
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/ads7846.h> #include <linux/spi/ads7846.h>
#include <mach/keypad.h> #include <plat/keypad.h>
static struct at24_platform_data at24c04 = { static struct at24_platform_data at24c04 = {
.byte_len = SZ_4K / 8, .byte_len = SZ_4K / 8,
......
...@@ -34,14 +34,14 @@ ...@@ -34,14 +34,14 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/irda.h> #include <plat/irda.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/common.h> #include <plat/common.h>
#define PALMTE_USBDETECT_GPIO 0 #define PALMTE_USBDETECT_GPIO 0
#define PALMTE_USB_OR_DC_GPIO 1 #define PALMTE_USB_OR_DC_GPIO 1
......
...@@ -29,16 +29,16 @@ ...@@ -29,16 +29,16 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <mach/led.h> #include <plat/led.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/irda.h> #include <plat/irda.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/common.h> #include <plat/common.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/ads7846.h> #include <linux/spi/ads7846.h>
......
...@@ -33,15 +33,15 @@ ...@@ -33,15 +33,15 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/irda.h> #include <plat/irda.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/omap-alsa.h> #include <plat/omap-alsa.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/ads7846.h> #include <linux/spi/ads7846.h>
......
...@@ -26,14 +26,14 @@ ...@@ -26,14 +26,14 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/fpga.h> #include <plat/fpga.h>
#include <mach/nand.h> #include <plat/nand.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/board.h> #include <plat/board.h>
static int p2_keymap[] = { static int p2_keymap[] = {
KEY(0,0,KEY_UP), KEY(0,0,KEY_UP),
...@@ -74,7 +74,7 @@ static struct resource smc91x_resources[] = { ...@@ -74,7 +74,7 @@ static struct resource smc91x_resources[] = {
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
.start = INT_730_MPU_EXT_NIRQ, .start = INT_7XX_MPU_EXT_NIRQ,
.end = 0, .end = 0,
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
}, },
...@@ -163,8 +163,8 @@ static struct platform_device smc91x_device = { ...@@ -163,8 +163,8 @@ static struct platform_device smc91x_device = {
static struct resource kp_resources[] = { static struct resource kp_resources[] = {
[0] = { [0] = {
.start = INT_730_MPUIO_KEYPAD, .start = INT_7XX_MPUIO_KEYPAD,
.end = INT_730_MPUIO_KEYPAD, .end = INT_7XX_MPUIO_KEYPAD,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
}; };
...@@ -270,7 +270,7 @@ static void __init omap_perseus2_map_io(void) ...@@ -270,7 +270,7 @@ static void __init omap_perseus2_map_io(void)
/* /*
* Hold GSM Reset until needed * Hold GSM Reset until needed
*/ */
omap_writew(omap_readw(OMAP730_DSP_M_CTL) & ~1, OMAP730_DSP_M_CTL); omap_writew(omap_readw(OMAP7XX_DSP_M_CTL) & ~1, OMAP7XX_DSP_M_CTL);
/* /*
* UARTs -> done automagically by 8250 driver * UARTs -> done automagically by 8250 driver
...@@ -281,21 +281,21 @@ static void __init omap_perseus2_map_io(void) ...@@ -281,21 +281,21 @@ static void __init omap_perseus2_map_io(void)
*/ */
/* Flash: CS0 timings setup */ /* Flash: CS0 timings setup */
omap_writel(0x0000fff3, OMAP730_FLASH_CFG_0); omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_0);
omap_writel(0x00000088, OMAP730_FLASH_ACFG_0); omap_writel(0x00000088, OMAP7XX_FLASH_ACFG_0);
/* /*
* Ethernet support through the debug board * Ethernet support through the debug board
* CS1 timings setup * CS1 timings setup
*/ */
omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1); omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_1);
omap_writel(0x00000000, OMAP730_FLASH_ACFG_1); omap_writel(0x00000000, OMAP7XX_FLASH_ACFG_1);
/* /*
* Configure MPU_EXT_NIRQ IO in IO_CONF9 register, * Configure MPU_EXT_NIRQ IO in IO_CONF9 register,
* It is used as the Ethernet controller interrupt * It is used as the Ethernet controller interrupt
*/ */
omap_writel(omap_readl(OMAP730_IO_CONF_9) & 0x1FFFFFFF, OMAP730_IO_CONF_9); omap_writel(omap_readl(OMAP7XX_IO_CONF_9) & 0x1FFFFFFF, OMAP7XX_IO_CONF_9);
} }
MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2") MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/mmc.h> #include <plat/mmc.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/board-sx1.h> #include <plat/board-sx1.h>
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
......
...@@ -33,15 +33,15 @@ ...@@ -33,15 +33,15 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/irda.h> #include <plat/irda.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/board-sx1.h> #include <plat/board-sx1.h>
/* Write to I2C device */ /* Write to I2C device */
int sx1_i2c_write_byte(u8 devaddr, u8 regoffset, u8 value) int sx1_i2c_write_byte(u8 devaddr, u8 regoffset, u8 value)
......
...@@ -29,11 +29,11 @@ ...@@ -29,11 +29,11 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/usb.h> #include <plat/usb.h>
static struct plat_serial8250_port voiceblue_ports[] = { static struct plat_serial8250_port voiceblue_ports[] = {
{ {
......
This diff is collapsed.
...@@ -574,6 +574,16 @@ static struct clk usb_dc_ck = { ...@@ -574,6 +574,16 @@ static struct clk usb_dc_ck = {
.enable_bit = 4, .enable_bit = 4,
}; };
static struct clk usb_dc_ck7xx = {
.name = "usb_dc_ck",
.ops = &clkops_generic,
/* Direct from ULPD, no parent */
.rate = 48000000,
.flags = RATE_FIXED,
.enable_reg = OMAP1_IO_ADDRESS(SOFT_REQ_REG),
.enable_bit = 8,
};
static struct clk mclk_1510 = { static struct clk mclk_1510 = {
.name = "mclk", .name = "mclk",
.ops = &clkops_generic, .ops = &clkops_generic,
...@@ -637,6 +647,18 @@ static struct clk mmc2_ck = { ...@@ -637,6 +647,18 @@ static struct clk mmc2_ck = {
.enable_bit = 20, .enable_bit = 20,
}; };
static struct clk mmc3_ck = {
.name = "mmc_ck",
.id = 2,
.ops = &clkops_generic,
/* Functional clock is direct from ULPD, interface clock is ARMPER */
.parent = &armper_ck.clk,
.rate = 48000000,
.flags = RATE_FIXED | ENABLE_REG_32BIT | CLOCK_NO_IDLE_PARENT,
.enable_reg = OMAP1_IO_ADDRESS(SOFT_REQ_REG),
.enable_bit = 12,
};
static struct clk virtual_ck_mpu = { static struct clk virtual_ck_mpu = {
.name = "mpu", .name = "mpu",
.ops = &clkops_null, .ops = &clkops_null,
......
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mmc.h> #include <plat/mmc.h>
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
...@@ -108,15 +108,22 @@ static inline void omap1_mmc_mux(struct omap_mmc_platform_data *mmc_controller, ...@@ -108,15 +108,22 @@ static inline void omap1_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
int controller_nr) int controller_nr)
{ {
if (controller_nr == 0) { if (controller_nr == 0) {
omap_cfg_reg(MMC_CMD); if (cpu_is_omap7xx()) {
omap_cfg_reg(MMC_CLK); omap_cfg_reg(MMC_7XX_CMD);
omap_cfg_reg(MMC_DAT0); omap_cfg_reg(MMC_7XX_CLK);
omap_cfg_reg(MMC_7XX_DAT0);
} else {
omap_cfg_reg(MMC_CMD);
omap_cfg_reg(MMC_CLK);
omap_cfg_reg(MMC_DAT0);
}
if (cpu_is_omap1710()) { if (cpu_is_omap1710()) {
omap_cfg_reg(M15_1710_MMC_CLKI); omap_cfg_reg(M15_1710_MMC_CLKI);
omap_cfg_reg(P19_1710_MMC_CMDDIR); omap_cfg_reg(P19_1710_MMC_CMDDIR);
omap_cfg_reg(P20_1710_MMC_DATDIR0); omap_cfg_reg(P20_1710_MMC_DATDIR0);
} }
if (mmc_controller->slots[0].wires == 4) { if (mmc_controller->slots[0].wires == 4 && !cpu_is_omap7xx()) {
omap_cfg_reg(MMC_DAT1); omap_cfg_reg(MMC_DAT1);
/* NOTE: DAT2 can be on W10 (here) or M15 */ /* NOTE: DAT2 can be on W10 (here) or M15 */
if (!mmc_controller->slots[0].nomux) if (!mmc_controller->slots[0].nomux)
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <mach/fpga.h> #include <plat/fpga.h>
#include <mach/gpio.h> #include <mach/gpio.h>
static void fpga_mask_irq(unsigned int irq) static void fpga_mask_irq(unsigned int irq)
......
This diff is collapsed.
/*
* arch/arm/mach-omap1/include/mach/clkdev.h
*/
#include <plat/clkdev.h>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment