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

Commit a0c726cc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v3.8/board-v2-signed' of... 

Merge tag 'omap-for-v3.8/board-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards

From Tony Lindgren <tony@atomide.com>:

Board updates for omaps mostly to deal with enabling
display support with device tree until the bindings
are ready.

* tag 'omap-for-v3.8/board-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP1: use BUG_ON where possible
  OMAP: board-generic: enable DSS for panda & sdp boards
  OMAP: omap4sdp: move display init from board file to dss-common.c
  OMAP: panda: move display init from board file to dss-common.c
  ARM: OMAP2+: Nokia N9/N900/N950 -- mention product names

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a46052c1 0449410b

arch/arm/mach-omap1/board-fsample.c

+1 −2
Original line number Diff line number Diff line
@@ -307,8 +307,7 @@ static void __init omap_fsample_init(void) 


	fsample_init_smc91x();



	if (gpio_request(FSAMPLE_NAND_RB_GPIO_PIN, "NAND ready") < 0)

		BUG();

	BUG_ON(gpio_request(FSAMPLE_NAND_RB_GPIO_PIN, "NAND ready") < 0);

	gpio_direction_input(FSAMPLE_NAND_RB_GPIO_PIN);



	omap_cfg_reg(L3_1610_FLASH_CS2B_OE);

arch/arm/mach-omap1/board-h2.c

+1 −2
Original line number Diff line number Diff line
@@ -411,8 +411,7 @@ static void __init h2_init(void) 


	h2_nand_resource.end = h2_nand_resource.start = OMAP_CS2B_PHYS;

	h2_nand_resource.end += SZ_4K - 1;

	if (gpio_request(H2_NAND_RB_GPIO_PIN, "NAND ready") < 0)

		BUG();

	BUG_ON(gpio_request(H2_NAND_RB_GPIO_PIN, "NAND ready") < 0);

	gpio_direction_input(H2_NAND_RB_GPIO_PIN);



	omap_cfg_reg(L3_1610_FLASH_CS2B_OE);

arch/arm/mach-omap1/board-h3.c

+1 −2
Original line number Diff line number Diff line
@@ -406,8 +406,7 @@ static void __init h3_init(void) 


	nand_resource.end = nand_resource.start = OMAP_CS2B_PHYS;

	nand_resource.end += SZ_4K - 1;

	if (gpio_request(H3_NAND_RB_GPIO_PIN, "NAND ready") < 0)

		BUG();

	BUG_ON(gpio_request(H3_NAND_RB_GPIO_PIN, "NAND ready") < 0);

	gpio_direction_input(H3_NAND_RB_GPIO_PIN);



	/* GPIO10 Func_MUX_CTRL reg bit 29:27, Configure V2 to mode1 as GPIO */

arch/arm/mach-omap1/board-perseus2.c

+1 −2
Original line number Diff line number Diff line
@@ -275,8 +275,7 @@ static void __init omap_perseus2_init(void) 


	perseus2_init_smc91x();



	if (gpio_request(P2_NAND_RB_GPIO_PIN, "NAND ready") < 0)

		BUG();

	BUG_ON(gpio_request(P2_NAND_RB_GPIO_PIN, "NAND ready") < 0);

	gpio_direction_input(P2_NAND_RB_GPIO_PIN);



	omap_cfg_reg(L3_1610_FLASH_CS2B_OE);

arch/arm/mach-omap2/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -270,14 +270,14 @@ config MACH_NOKIA_N8X0 
	select OMAP_PACKAGE_ZAC



config MACH_NOKIA_RM680

	bool "Nokia RM-680/696 board"

	bool "Nokia N950 (RM-680) / N9 (RM-696) phones"

	depends on ARCH_OMAP3

	default y

	select MACH_NOKIA_RM696

	select OMAP_PACKAGE_CBB



config MACH_NOKIA_RX51

	bool "Nokia RX-51 board"

	bool "Nokia N900 (RX-51) phone"

	depends on ARCH_OMAP3

	default y

	select OMAP_PACKAGE_CBB