Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0f607c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (26 commits)
  OMAP2 clock: dynamically allocate CPUFreq frequency table
  OMAP clock/CPUFreq: add clk_exit_cpufreq_table()
  OMAP2xxx OPP: clean up comments in OPP data
  OMAP2xxx clock: clk2xxx.c doesn't compile if CPUFREQ is enabled
  OMAP1 clock: remove __initdata from struct clk_functions to prevent crash
  OMAP1 clock: Add missing clocks for OMAP 7xx
  OMAP clock: remove incorrect EXPORT_SYMBOL()s
  OMAP3 clock: Add capability to change rate of dpll4_m5_ck
  OMAP3 clock: McBSP 2, 3, 4 functional clock parent is PER_96M_FCLK, not CORE_96M_FCLK
  OMAP3: clock: add clockdomains for UART1 & 2
  OMAP2420 IO mapping: move IVA mapping virtual address out of vmalloc space
  OMAP2xxx IO mapping: mark DSP mappings as being 2420-only
  ARM: OMAP3: PM: Fix the Invalid CM_CLKSTCTRL reg access.
  OMAP2: remove duplicated #include
  omap3: EVM: Choose OMAP_PACKAGE_CBB
  omap3: Fix booting if package is uninitialized
  omap3: add missing parentheses
  omap3: add missing parentheses
  omap2/3: ZOOM: Correcting key mapping for few keys
  omap2/3: make serial_in_override() address the right uart port
  ...
parents 598cace0 27dba4bc

arch/arm/mach-omap1/clock_data.c

+7 −3
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static struct clk i2c_ick = { 
static struct omap_clk omap_clks[] = {

	/* non-ULPD clocks */

	CLK(NULL,	"ck_ref",	&ck_ref,	CK_16XX | CK_1510 | CK_310 | CK_7XX),

	CLK(NULL,	"ck_dpll1",	&ck_dpll1,	CK_16XX | CK_1510 | CK_310),

	CLK(NULL,	"ck_dpll1",	&ck_dpll1,	CK_16XX | CK_1510 | CK_310 | CK_7XX),

	/* CK_GEN1 clocks */

	CLK(NULL,	"ck_dpll1out",	&ck_dpll1out.clk, CK_16XX),

	CLK(NULL,	"ck_sossi",	&sossi_ck,	CK_16XX),
@@ -627,7 +627,7 @@ static struct omap_clk omap_clks[] = { 
	CLK(NULL,	"tc2_ck",	&tc2_ck,	CK_16XX),

	CLK(NULL,	"dma_ck",	&dma_ck,	CK_16XX | CK_1510 | CK_310),

	CLK(NULL,	"dma_lcdfree_ck", &dma_lcdfree_ck, CK_16XX),

	CLK(NULL,	"api_ck",	&api_ck.clk,	CK_16XX | CK_1510 | CK_310),

	CLK(NULL,	"api_ck",	&api_ck.clk,	CK_16XX | CK_1510 | CK_310 | CK_7XX),

	CLK(NULL,	"lb_ck",	&lb_ck.clk,	CK_1510 | CK_310),

	CLK(NULL,	"rhea1_ck",	&rhea1_ck,	CK_16XX),

	CLK(NULL,	"rhea2_ck",	&rhea2_ck,	CK_16XX),
@@ -658,6 +658,10 @@ static struct omap_clk omap_clks[] = { 
	CLK("i2c_omap.1", "fck",	&i2c_fck,	CK_16XX | CK_1510 | CK_310 | CK_7XX),

	CLK("i2c_omap.1", "ick",	&i2c_ick,	CK_16XX),

	CLK("i2c_omap.1", "ick",	&dummy_ck,	CK_1510 | CK_310 | CK_7XX),

	CLK("omap1_spi100k.1", "fck",	&dummy_ck,	CK_7XX),

	CLK("omap1_spi100k.1", "ick",	&dummy_ck,	CK_7XX),

	CLK("omap1_spi100k.2", "fck",	&dummy_ck,	CK_7XX),

	CLK("omap1_spi100k.2", "ick",	&dummy_ck,	CK_7XX),

	CLK("omap_uwire", "fck",	&armxor_ck.clk,	CK_16XX | CK_1510 | CK_310),

	CLK("omap-mcbsp.1", "ick",	&dspper_ck,	CK_16XX),

	CLK("omap-mcbsp.1", "ick",	&dummy_ck,	CK_1510 | CK_310),
@@ -674,7 +678,7 @@ static struct omap_clk omap_clks[] = { 
 * init

 */



static struct clk_functions omap1_clk_functions __initdata = {

static struct clk_functions omap1_clk_functions = {

	.clk_enable		= omap1_clk_enable,

	.clk_disable		= omap1_clk_disable,

	.clk_round_rate		= omap1_clk_round_rate,

arch/arm/mach-omap1/devices.c

+35 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/spi/spi.h>



#include <mach/hardware.h>

#include <asm/mach/map.h>
@@ -23,6 +24,7 @@ 
#include <plat/mux.h>

#include <mach/gpio.h>

#include <plat/mmc.h>

#include <plat/omap7xx.h>



/*-------------------------------------------------------------------------*/
@@ -196,6 +198,38 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, 


/*-------------------------------------------------------------------------*/



/* OMAP7xx SPI support */

#if defined(CONFIG_SPI_OMAP_100K) || defined(CONFIG_SPI_OMAP_100K_MODULE)



struct platform_device omap_spi1 = {

	.name           = "omap1_spi100k",

	.id             = 1,

};



struct platform_device omap_spi2 = {

	.name           = "omap1_spi100k",

	.id             = 2,

};



static void omap_init_spi100k(void)

{

	omap_spi1.dev.platform_data = ioremap(OMAP7XX_SPI1_BASE, 0x7ff);

	if (omap_spi1.dev.platform_data)

		platform_device_register(&omap_spi1);



	omap_spi2.dev.platform_data = ioremap(OMAP7XX_SPI2_BASE, 0x7ff);

	if (omap_spi2.dev.platform_data)

		platform_device_register(&omap_spi2);

}



#else

static inline void omap_init_spi100k(void)

{

}

#endif



/*-------------------------------------------------------------------------*/



#if defined(CONFIG_OMAP_STI)



#define OMAP1_STI_BASE		0xfffea000
@@ -263,6 +297,7 @@ static int __init omap1_init_devices(void) 


	omap_init_mbox();

	omap_init_rtc();

	omap_init_spi100k();

	omap_init_sti();



	return 0;

arch/arm/mach-omap1/mux.c

+8 −0
Original line number Diff line number Diff line
@@ -62,6 +62,14 @@ MUX_CFG_7XX("MMC_7XX_DAT0", 2, 17, 0, 16, 1, 0) 
/* I2C interface */

MUX_CFG_7XX("I2C_7XX_SCL",         5,    1,    0,    0,   1, 0)

MUX_CFG_7XX("I2C_7XX_SDA",         5,    5,    0,    0,   1, 0)



/* SPI pins */

MUX_CFG_7XX("SPI_7XX_1",           6,    5,    4,    4,   1, 0)

MUX_CFG_7XX("SPI_7XX_2",           6,    9,    4,    8,   1, 0)

MUX_CFG_7XX("SPI_7XX_3",           6,   13,    4,   12,   1, 0)

MUX_CFG_7XX("SPI_7XX_4",           6,   17,    4,   16,   1, 0)

MUX_CFG_7XX("SPI_7XX_5",           8,   25,    0,   24,   0, 0)

MUX_CFG_7XX("SPI_7XX_6",           9,    5,    0,    4,   0, 0)

};

#define OMAP7XX_PINS_SZ		ARRAY_SIZE(omap7xx_pins)

#else

arch/arm/mach-omap2/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ config MACH_OVERO 
config MACH_OMAP3EVM

	bool "OMAP 3530 EVM board"

	depends on ARCH_OMAP3 && ARCH_OMAP34XX

	select OMAP_PACKAGE_CBB



config MACH_OMAP3517EVM

	bool "OMAP3517/ AM3517 EVM board"

arch/arm/mach-omap2/board-zoom-peripherals.c

+4 −4
Original line number Diff line number Diff line
@@ -63,21 +63,21 @@ static int board_keymap[] = { 
	KEY(5, 1, KEY_H),

	KEY(5, 2, KEY_J),

	KEY(5, 3, KEY_F3),

	KEY(5, 4, KEY_UNKNOWN),

	KEY(5, 5, KEY_VOLUMEDOWN),

	KEY(5, 6, KEY_M),

	KEY(5, 7, KEY_ENTER),

	KEY(5, 7, KEY_RIGHT),

	KEY(6, 0, KEY_Q),

	KEY(6, 1, KEY_A),

	KEY(6, 2, KEY_N),

	KEY(6, 3, KEY_BACKSPACE),

	KEY(6, 6, KEY_P),

	KEY(6, 7, KEY_SELECT),

	KEY(6, 7, KEY_UP),

	KEY(7, 0, KEY_PROG1),	/*MACRO 1 <User defined> */

	KEY(7, 1, KEY_PROG2),	/*MACRO 2 <User defined> */

	KEY(7, 2, KEY_PROG3),	/*MACRO 3 <User defined> */

	KEY(7, 3, KEY_PROG4),	/*MACRO 4 <User defined> */

	KEY(7, 5, KEY_RIGHT),

	KEY(7, 6, KEY_UP),

	KEY(7, 6, KEY_SELECT),

	KEY(7, 7, KEY_DOWN)

};