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

Commit 03a2ec64 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'davinci-for-v3.16/board' of... 

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

Merge "DaVinci board changes for v3.16" from Sekhar Nori:

This patch clean-up an unused #define from code.

* tag 'davinci-for-v3.16/board' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: davinci: remove checks for CONFIG_USB_MUSB_PERIPHERAL

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a915dfab ea567856

arch/arm/configs/davinci_all_defconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -160,7 +160,6 @@ CONFIG_USB=m 
CONFIG_USB_DEVICEFS=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_MON=m

CONFIG_USB_MON=m

CONFIG_USB_MUSB_HDRC=m

CONFIG_USB_MUSB_HDRC=m

CONFIG_USB_MUSB_PERIPHERAL=y

CONFIG_USB_GADGET_MUSB_HDRC=y

CONFIG_USB_GADGET_MUSB_HDRC=y

CONFIG_MUSB_PIO_ONLY=y

CONFIG_MUSB_PIO_ONLY=y

CONFIG_USB_STORAGE=m

CONFIG_USB_STORAGE=m

arch/arm/mach-davinci/board-dm355-evm.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -350,11 +350,7 @@ static struct davinci_mmc_config dm355evm_mmc_config = { 
 * you have proper Mini-B or Mini-A cables (or Mini-A adapters)

 * you have proper Mini-B or Mini-A cables (or Mini-A adapters)

 * the ID pin won't need any help.

 * the ID pin won't need any help.

 */

 */

#ifdef CONFIG_USB_MUSB_PERIPHERAL

#define USB_ID_VALUE	0	/* ID pulled high; *should* float */

#else

#define USB_ID_VALUE	1	/* ID pulled low */

#define USB_ID_VALUE	1	/* ID pulled low */

#endif





static struct spi_eeprom at25640a = {

static struct spi_eeprom at25640a = {

	.byte_len	= SZ_64K / 8,

	.byte_len	= SZ_64K / 8,

arch/arm/mach-davinci/board-dm355-leopard.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -208,11 +208,7 @@ static struct davinci_mmc_config dm355leopard_mmc_config = { 
 * you have proper Mini-B or Mini-A cables (or Mini-A adapters)

 * you have proper Mini-B or Mini-A cables (or Mini-A adapters)

 * the ID pin won't need any help.

 * the ID pin won't need any help.

 */

 */

#ifdef CONFIG_USB_MUSB_PERIPHERAL

#define USB_ID_VALUE	0	/* ID pulled high; *should* float */

#else

#define USB_ID_VALUE	1	/* ID pulled low */

#define USB_ID_VALUE	1	/* ID pulled low */

#endif





static struct spi_eeprom at25640a = {

static struct spi_eeprom at25640a = {

	.byte_len	= SZ_64K / 8,

	.byte_len	= SZ_64K / 8,