Commit 5057bfaf 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: (214 commits)
  omap2: Initialize Menelaus and MMC for N8X0
  AM3517 EVM: correct typo - tca6416 mispelt as tca6516
  AM3517 EVM: Enable I2C support
  AM35x: Enable OMAP_MUX in defconfig
  AM35x: Add missing GPIO mux config for EHCI port
  Zoom3: Defconfig update
  omap: i2c: Fix muxing for command line enabled bus
  OMAP4: clock: Remove clock hacks from timer-gp.c
  OMAP4: clock: Add dummy clock nodes for interface clocks
  OMAP4: clock: Rename leaf clock nodes to end with a _ick or _fck
  OMAP2+ clock: revise omap2_clk_{disable,enable}()
  OMAP2/3 clock: combine OMAP2 & 3 boot-time MPU rate change code
  OMAP clockdomain: if no autodeps exist, don't try to add or remove them
  OMAP hwmod: add hwmod class support
  OMAP hwmod: convert header files with static allocations into C files
  OMAP hwmod: convert hwmod to use hardware clock names rather than clkdev dev+con
  OMAP clock: add omap_clk_get_by_name() for use by OMAP hwmod core code
  OMAP3: clock: add capability to change rate of dpll4_m5_ck_3630
  OMAP4 clock: drop the ALWAYS_ENABLED clock flag
  OMAP clock: drop RATE_FIXED clock flag
  ...
parents 6c0ad5df d702d121
...@@ -201,7 +201,7 @@ CONFIG_ARCH_OMAP3=y ...@@ -201,7 +201,7 @@ CONFIG_ARCH_OMAP3=y
# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set # CONFIG_OMAP_DEBUG_POWERDOMAIN is not set
# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set # CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set
CONFIG_OMAP_RESET_CLOCKS=y CONFIG_OMAP_RESET_CLOCKS=y
# CONFIG_OMAP_MUX is not set CONFIG_OMAP_MUX=y
# CONFIG_OMAP_MCBSP is not set # CONFIG_OMAP_MCBSP is not set
# CONFIG_OMAP_MBOX_FWK is not set # CONFIG_OMAP_MBOX_FWK is not set
# CONFIG_OMAP_MPU_TIMER is not set # CONFIG_OMAP_MPU_TIMER is not set
...@@ -590,7 +590,46 @@ CONFIG_HW_RANDOM=y ...@@ -590,7 +590,46 @@ CONFIG_HW_RANDOM=y
# CONFIG_R3964 is not set # CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set # CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not set # CONFIG_TCG_TPM is not set
# CONFIG_I2C is not set CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_HELPER_AUTO=y
#
# I2C Hardware Bus support
#
#
# I2C system bus drivers (mostly embedded / system-on-chip)
#
# CONFIG_I2C_DESIGNWARE is not set
# CONFIG_I2C_GPIO is not set
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_OMAP=y
# CONFIG_I2C_SIMTEC is not set
#
# External I2C/SMBus adapter drivers
#
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_TAOS_EVM is not set
# CONFIG_I2C_TINY_USB is not set
#
# Other I2C/SMBus bus drivers
#
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_STUB is not set
#
# Miscellaneous I2C Chip support
#
# CONFIG_SENSORS_TSL2550 is not set
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
# CONFIG_I2C_DEBUG_CHIP is not set
# CONFIG_SPI is not set # CONFIG_SPI is not set
# #
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -187,6 +187,8 @@ CONFIG_ARCH_OMAP3=y ...@@ -187,6 +187,8 @@ CONFIG_ARCH_OMAP3=y
# #
# OMAP Feature Selections # OMAP Feature Selections
# #
CONFIG_OMAP_SMARTREFLEX=y
# CONFIG_OMAP_SMARTREFLEX_TESTING is not set
# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set # CONFIG_OMAP_DEBUG_POWERDOMAIN is not set
# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set # CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set
CONFIG_OMAP_RESET_CLOCKS=y CONFIG_OMAP_RESET_CLOCKS=y
...@@ -333,7 +335,7 @@ CONFIG_BINFMT_MISC=y ...@@ -333,7 +335,7 @@ CONFIG_BINFMT_MISC=y
# Power management options # Power management options
# #
CONFIG_PM=y CONFIG_PM=y
# CONFIG_PM_DEBUG is not set CONFIG_PM_DEBUG=y
CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP=y
CONFIG_SUSPEND=y CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y CONFIG_SUSPEND_FREEZER=y
...@@ -1339,7 +1341,7 @@ CONFIG_ENABLE_MUST_CHECK=y ...@@ -1339,7 +1341,7 @@ CONFIG_ENABLE_MUST_CHECK=y
CONFIG_FRAME_WARN=1024 CONFIG_FRAME_WARN=1024
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set # CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_DEBUG_FS is not set CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set # CONFIG_HEADERS_CHECK is not set
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_SHIRQ is not set # CONFIG_DEBUG_SHIRQ is not set
......
This diff is collapsed.
...@@ -199,7 +199,7 @@ CONFIG_ARCH_OMAP4=y ...@@ -199,7 +199,7 @@ CONFIG_ARCH_OMAP4=y
# #
# CONFIG_OMAP_RESET_CLOCKS is not set # CONFIG_OMAP_RESET_CLOCKS is not set
# CONFIG_OMAP_MUX is not set # CONFIG_OMAP_MUX is not set
# CONFIG_OMAP_MCBSP is not set CONFIG_OMAP_MCBSP=y
# CONFIG_OMAP_MBOX_FWK is not set # CONFIG_OMAP_MBOX_FWK is not set
# CONFIG_OMAP_MPU_TIMER is not set # CONFIG_OMAP_MPU_TIMER is not set
CONFIG_OMAP_32K_TIMER=y CONFIG_OMAP_32K_TIMER=y
...@@ -307,7 +307,7 @@ CONFIG_ALIGNMENT_TRAP=y ...@@ -307,7 +307,7 @@ CONFIG_ALIGNMENT_TRAP=y
# #
CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="root=/dev/ram0 rw mem=128M console=ttyS0,115200n8 initrd=0x81600000,20M ramdisk_size=20480" CONFIG_CMDLINE="root=/dev/ram0 rw mem=128M console=ttyS2,115200n8 initrd=0x81600000,20M ramdisk_size=20480"
# CONFIG_XIP_KERNEL is not set # CONFIG_XIP_KERNEL is not set
# CONFIG_KEXEC is not set # CONFIG_KEXEC is not set
...@@ -491,7 +491,8 @@ CONFIG_GPIOLIB=y ...@@ -491,7 +491,8 @@ CONFIG_GPIOLIB=y
# CONFIG_POWER_SUPPLY is not set # CONFIG_POWER_SUPPLY is not set
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
# CONFIG_THERMAL is not set # CONFIG_THERMAL is not set
# CONFIG_WATCHDOG is not set CONFIG_WATCHDOG=y
CONFIG_OMAP_WATCHDOG=y
CONFIG_SSB_POSSIBLE=y CONFIG_SSB_POSSIBLE=y
# #
......
...@@ -1136,7 +1136,7 @@ CONFIG_TWL4030_USB=y ...@@ -1136,7 +1136,7 @@ CONFIG_TWL4030_USB=y
# CONFIG_NOP_USB_XCEIV is not set # CONFIG_NOP_USB_XCEIV is not set
CONFIG_MMC=y CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set # CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set CONFIG_MMC_UNSAFE_RESUME=y
# #
# MMC/SD/SDIO Card Drivers # MMC/SD/SDIO Card Drivers
...@@ -1186,7 +1186,7 @@ CONFIG_RTC_INTF_DEV=y ...@@ -1186,7 +1186,7 @@ CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF8563 is not set
# CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_PCF8583 is not set
# CONFIG_RTC_DRV_M41T80 is not set # CONFIG_RTC_DRV_M41T80 is not set
# CONFIG_RTC_DRV_TWL4030 is not set CONFIG_RTC_DRV_TWL4030=y
# CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_S35390A is not set
# CONFIG_RTC_DRV_FM3130 is not set # CONFIG_RTC_DRV_FM3130 is not set
# CONFIG_RTC_DRV_RX8581 is not set # CONFIG_RTC_DRV_RX8581 is not set
...@@ -1416,7 +1416,7 @@ CONFIG_FRAME_WARN=1024 ...@@ -1416,7 +1416,7 @@ CONFIG_FRAME_WARN=1024
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
# CONFIG_STRIP_ASM_SYMS is not set # CONFIG_STRIP_ASM_SYMS is not set
# CONFIG_UNUSED_SYMBOLS is not set # CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_DEBUG_FS is not set CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set # CONFIG_HEADERS_CHECK is not set
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_SHIRQ is not set # CONFIG_DEBUG_SHIRQ is not set
......
...@@ -1354,7 +1354,7 @@ CONFIG_USB_OTG_UTILS=y ...@@ -1354,7 +1354,7 @@ CONFIG_USB_OTG_UTILS=y
# CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_GPIO_VBUS is not set
# CONFIG_ISP1301_OMAP is not set # CONFIG_ISP1301_OMAP is not set
CONFIG_TWL4030_USB=y CONFIG_TWL4030_USB=y
CONFIG_MMC=y CONFIG_MMC=m
# CONFIG_MMC_DEBUG is not set # CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set # CONFIG_MMC_UNSAFE_RESUME is not set
...@@ -1362,7 +1362,7 @@ CONFIG_MMC=y ...@@ -1362,7 +1362,7 @@ CONFIG_MMC=y
# MMC/SD/SDIO Card Drivers # MMC/SD/SDIO Card Drivers
# #
CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_MMC_BLOCK_BOUNCE is not set
# CONFIG_SDIO_UART is not set # CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set # CONFIG_MMC_TEST is not set
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# Common support # Common support
obj-y := io.o id.o sram.o irq.o mux.o serial.o devices.o obj-y := io.o id.o sram.o irq.o mux.o flash.o serial.o devices.o
obj-y += clock.o clock_data.o opp_data.o obj-y += clock.o clock_data.o opp_data.o
obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
......
...@@ -18,18 +18,19 @@ ...@@ -18,18 +18,19 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/smc91x.h> #include <linux/smc91x.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/flash.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/tc.h> #include <plat/tc.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <plat/mux.h> #include <plat/mux.h>
#include <plat/flash.h>
#include <plat/fpga.h> #include <plat/fpga.h>
#include <plat/keypad.h> #include <plat/keypad.h>
#include <plat/common.h> #include <plat/common.h>
...@@ -150,9 +151,9 @@ static struct mtd_partition nor_partitions[] = { ...@@ -150,9 +151,9 @@ static struct mtd_partition nor_partitions[] = {
}, },
}; };
static struct flash_platform_data nor_data = { static struct physmap_flash_data nor_data = {
.map_name = "cfi_probe",
.width = 2, .width = 2,
.set_vpp = omap1_set_vpp,
.parts = nor_partitions, .parts = nor_partitions,
.nr_parts = ARRAY_SIZE(nor_partitions), .nr_parts = ARRAY_SIZE(nor_partitions),
}; };
...@@ -164,7 +165,7 @@ static struct resource nor_resource = { ...@@ -164,7 +165,7 @@ static struct resource nor_resource = {
}; };
static struct platform_device nor_device = { static struct platform_device nor_device = {
.name = "omapflash", .name = "physmap-flash",
.id = 0, .id = 0,
.dev = { .dev = {
.platform_data = &nor_data, .platform_data = &nor_data,
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/i2c/tps65010.h> #include <linux/i2c/tps65010.h>
#include <linux/smc91x.h> #include <linux/smc91x.h>
...@@ -35,7 +36,6 @@ ...@@ -35,7 +36,6 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/flash.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/mux.h> #include <plat/mux.h>
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include <plat/usb.h> #include <plat/usb.h>
#include <plat/keypad.h> #include <plat/keypad.h>
#include <plat/common.h> #include <plat/common.h>
#include <plat/flash.h>
#include "board-h2.h" #include "board-h2.h"
...@@ -121,9 +122,9 @@ static struct mtd_partition h2_nor_partitions[] = { ...@@ -121,9 +122,9 @@ static struct mtd_partition h2_nor_partitions[] = {
} }
}; };
static struct flash_platform_data h2_nor_data = { static struct physmap_flash_data h2_nor_data = {
.map_name = "cfi_probe",
.width = 2, .width = 2,
.set_vpp = omap1_set_vpp,
.parts = h2_nor_partitions, .parts = h2_nor_partitions,
.nr_parts = ARRAY_SIZE(h2_nor_partitions), .nr_parts = ARRAY_SIZE(h2_nor_partitions),
}; };
...@@ -134,7 +135,7 @@ static struct resource h2_nor_resource = { ...@@ -134,7 +135,7 @@ static struct resource h2_nor_resource = {
}; };
static struct platform_device h2_nor_device = { static struct platform_device h2_nor_device = {
.name = "omapflash", .name = "physmap-flash",
.id = 0, .id = 0,
.dev = { .dev = {
.platform_data = &h2_nor_data, .platform_data = &h2_nor_data,
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/i2c/tps65010.h> #include <linux/i2c/tps65010.h>
...@@ -37,7 +38,6 @@ ...@@ -37,7 +38,6 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/flash.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/irqs.h> #include <mach/irqs.h>
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#include <plat/keypad.h> #include <plat/keypad.h>
#include <plat/dma.h> #include <plat/dma.h>
#include <plat/common.h> #include <plat/common.h>
#include <plat/flash.h>
#include "board-h3.h" #include "board-h3.h"
...@@ -126,9 +127,9 @@ static struct mtd_partition nor_partitions[] = { ...@@ -126,9 +127,9 @@ static struct mtd_partition nor_partitions[] = {
} }
}; };
static struct flash_platform_data nor_data = { static struct physmap_flash_data nor_data = {
.map_name = "cfi_probe",
.width = 2, .width = 2,
.set_vpp = omap1_set_vpp,
.parts = nor_partitions, .parts = nor_partitions,
.nr_parts = ARRAY_SIZE(nor_partitions), .nr_parts = ARRAY_SIZE(nor_partitions),
}; };
...@@ -139,7 +140,7 @@ static struct resource nor_resource = { ...@@ -139,7 +140,7 @@ static struct resource nor_resource = {
}; };
static struct platform_device nor_device = { static struct platform_device nor_device = {
.name = "omapflash", .name = "physmap-flash",
.id = 0, .id = 0,
.dev = { .dev = {
.platform_data = &nor_data, .platform_data = &nor_data,
......
...@@ -22,16 +22,17 @@ ...@@ -22,16 +22,17 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/smc91x.h> #include <linux/smc91x.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/flash.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/mux.h> #include <plat/mux.h>
#include <plat/flash.h>
#include <plat/fpga.h> #include <plat/fpga.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <plat/tc.h> #include <plat/tc.h>
...@@ -94,9 +95,9 @@ static struct mtd_partition innovator_partitions[] = { ...@@ -94,9 +95,9 @@ static struct mtd_partition innovator_partitions[] = {
} }
}; };
static struct flash_platform_data innovator_flash_data = { static struct physmap_flash_data innovator_flash_data = {
.map_name = "cfi_probe",
.width = 2, .width = 2,
.set_vpp = omap1_set_vpp,
.parts = innovator_partitions, .parts = innovator_partitions,
.nr_parts = ARRAY_SIZE(innovator_partitions), .nr_parts = ARRAY_SIZE(innovator_partitions),
}; };
...@@ -108,7 +109,7 @@ static struct resource innovator_flash_resource = { ...@@ -108,7 +109,7 @@ static struct resource innovator_flash_resource = {
}; };
static struct platform_device innovator_flash_device = { static struct platform_device innovator_flash_device = {
.name = "omapflash", .name = "physmap-flash",
.id = 0, .id = 0,
.dev = { .dev = {
.platform_data = &innovator_flash_data, .platform_data = &innovator_flash_data,
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
#include <linux/i2c/tps65010.h> #include <linux/i2c/tps65010.h>
...@@ -46,8 +47,8 @@ ...@@ -46,8 +47,8 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/flash.h>
#include <plat/flash.h>
#include <plat/usb.h> #include <plat/usb.h>
#include <plat/mux.h> #include <plat/mux.h>
#include <plat/tc.h> #include <plat/tc.h>
...@@ -94,9 +95,9 @@ static struct mtd_partition osk_partitions[] = { ...@@ -94,9 +95,9 @@ static struct mtd_partition osk_partitions[] = {
} }
}; };
static struct flash_platform_data osk_flash_data = { static struct physmap_flash_data osk_flash_data = {
.map_name = "cfi_probe",
.width = 2, .width = 2,
.set_vpp = omap1_set_vpp,
.parts = osk_partitions, .parts = osk_partitions,
.nr_parts = ARRAY_SIZE(osk_partitions), .nr_parts = ARRAY_SIZE(osk_partitions),
}; };
...@@ -107,7 +108,7 @@ static struct resource osk_flash_resource = { ...@@ -107,7 +108,7 @@ static struct resource osk_flash_resource = {
}; };
static struct platform_device osk5912_flash_device = { static struct platform_device osk5912_flash_device = {
.name = "omapflash", .name = "physmap-flash",
.id = 0, .id = 0,
.dev = { .dev = {
.platform_data = &osk_flash_data, .platform_data = &osk_flash_data,
......
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.
...@@ -73,7 +73,7 @@ static inline void omap_init_rtc(void) {} ...@@ -73,7 +73,7 @@ static inline void omap_init_rtc(void) {}
# define INT_DSP_MAILBOX1 INT_1610_DSP_MAILBOX1 # define INT_DSP_MAILBOX1 INT_1610_DSP_MAILBOX1
#endif #endif
#define OMAP1_MBOX_BASE OMAP1_IO_ADDRESS(OMAP16XX_MAILBOX_BASE) #define OMAP1_MBOX_BASE OMAP16XX_MAILBOX_BASE
static struct resource mbox_resources[] = { static struct resource mbox_resources[] = {
{ {
......
This diff is collapsed.
...@@ -23,9 +23,7 @@ ...@@ -23,9 +23,7 @@
#include <plat/mux.h> #include <plat/mux.h>
#include <plat/cpu.h> #include <plat/cpu.h>
int __init omap_register_i2c_bus(int bus_id, u32 clkrate, void __init omap1_i2c_mux_pins(int bus_id)
struct i2c_board_info const *info,
unsigned len)
{ {
if (cpu_is_omap7xx()) { if (cpu_is_omap7xx()) {
omap_cfg_reg(I2C_7XX_SDA); omap_cfg_reg(I2C_7XX_SDA);
...@@ -34,6 +32,4 @@ int __init omap_register_i2c_bus(int bus_id, u32 clkrate, ...@@ -34,6 +32,4 @@ int __init omap_register_i2c_bus(int bus_id, u32 clkrate,
omap_cfg_reg(I2C_SDA); omap_cfg_reg(I2C_SDA);
omap_cfg_reg(I2C_SCL); omap_cfg_reg(I2C_SCL);
} }
return omap_plat_register_i2c_bus(bus_id, clkrate, info, len);
} }
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.
...@@ -337,7 +337,7 @@ static void __init omap_apollon_init(void) ...@@ -337,7 +337,7 @@ static void __init omap_apollon_init(void)
static void __init omap_apollon_map_io(void) static void __init omap_apollon_map_io(void)
{ {
omap2_set_globals_242x(); omap2_set_globals_242x();
omap2_map_common_io(); omap242x_map_common_io();
} }
MACHINE_START(OMAP_APOLLON, "OMAP24xx Apollon") MACHINE_START(OMAP_APOLLON, "OMAP24xx Apollon")
......
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