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

Commit a915dfab authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Merge "ARM: omap board changes for v3.16 merge window" from Tony Lindgren:

Board related changes for omaps.

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

:
  ARM: OMAP: replace checks for CONFIG_USB_GADGET_OMAP
  ARM: OMAP: AM3517EVM: remove check for CONFIG_PANEL_SHARP_LQ043T1DG01
  ARM: OMAP: SX1: remove check for CONFIG_SX1_OLD_FLASH
  ARM: OMAP: remove some dead code
  ARM: OMAP: omap3stalker: remove two Kconfig macros
  ARM: OMAP2+: Add support for RNG on DT booted N900

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 05e46817 77c2f02e

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

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static struct omap_usb_config h2_usb_config __initdata = { 
	/* usb1 has a Mini-AB port and external isp1301 transceiver */

	.otg		= 2,



#ifdef	CONFIG_USB_GADGET_OMAP

#if IS_ENABLED(CONFIG_USB_OMAP)

	.hmc_mode	= 19,	/* 0:host(off) 1:dev|otg 2:disabled */

	/* .hmc_mode	= 21,*/	/* 0:host(off) 1:dev(loopback) 2:host(loopback) */

#elif	defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)

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

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static struct omap_usb_config h3_usb_config __initdata = { 
	/* usb1 has a Mini-AB port and external isp1301 transceiver */

	.otg	    = 2,



#ifdef CONFIG_USB_GADGET_OMAP

#if IS_ENABLED(CONFIG_USB_OMAP)

	.hmc_mode       = 19,   /* 0:host(off) 1:dev|otg 2:disabled */

#elif  defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)

	/* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */

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

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static struct omap_usb_config h2_usb_config __initdata = { 
	/* usb1 has a Mini-AB port and external isp1301 transceiver */

	.otg		= 2,



#ifdef	CONFIG_USB_GADGET_OMAP

#if IS_ENABLED(CONFIG_USB_OMAP)

	.hmc_mode	= 19,	/* 0:host(off) 1:dev|otg 2:disabled */

	/* .hmc_mode	= 21,*/	/* 0:host(off) 1:dev(loopback) 2:host(loopback) */

#elif	defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)

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

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static struct omap_usb_config osk_usb_config __initdata = { 
	 * be used, with a NONSTANDARD gender-bending cable/dongle, as

	 * a peripheral.

	 */

#ifdef	CONFIG_USB_GADGET_OMAP

#if IS_ENABLED(CONFIG_USB_OMAP)

	.register_dev	= 1,

	.hmc_mode	= 0,

#else

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

+0 −26
Original line number Diff line number Diff line
@@ -266,31 +266,6 @@ static struct physmap_flash_data sx1_flash_data = { 
	.nr_parts	= ARRAY_SIZE(sx1_partitions),

};



#ifdef CONFIG_SX1_OLD_FLASH

/* MTD Intel StrataFlash - old flashes */

static struct resource sx1_old_flash_resource[] = {

	[0] = {

		.start	= OMAP_CS0_PHYS,	/* Physical */

		.end	= OMAP_CS0_PHYS + SZ_16M - 1,,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= OMAP_CS1_PHYS,

		.end	= OMAP_CS1_PHYS + SZ_8M - 1,

		.flags	= IORESOURCE_MEM,

	},

};



static struct platform_device sx1_flash_device = {

	.name		= "physmap-flash",

	.id		= 0,

	.dev		= {

		.platform_data	= &sx1_flash_data,

	},

	.num_resources	= 2,

	.resource	= &sx1_old_flash_resource,

};

#else

/* MTD Intel 4000 flash - new flashes */

static struct resource sx1_new_flash_resource = {

	.start		= OMAP_CS0_PHYS,
@@ -307,7 +282,6 @@ static struct platform_device sx1_flash_device = { 
	.num_resources	= 1,

	.resource	= &sx1_new_flash_resource,

};

#endif



/*----------- USB -------------------------*/