From 0e0575197259d5de13c51cac0b98336506fd2f85 Mon Sep 17 00:00:00 2001 From: Constantine Shulyupin Date: Mon, 8 Oct 2012 15:17:07 +0200 Subject: ARM: davinci: usb: remove CONFIG_USB_MUSB_HOST etc Remove usage of CONFIG_USB_MUSB_OTG, CONFIG_USB_MUSB_PERIPHERAL and CONFIG_USB_MUSB_HOST in arch/arm/mach-davinci/usb.c since these are not used anymore and set mode configuration by default to MUSB_OTG. Signed-off-by: Constantine Shulyupin [prakash.pm@ti.com: Tested on DM6446-EVM] Acked-by: Manjunathappa, Prakash Acked-by: Felipe Balbi Signed-off-by: Sekhar Nori --- arch/arm/mach-davinci/usb.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'arch/arm/mach-davinci') diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c index f77b953..34509ff 100644 --- a/arch/arm/mach-davinci/usb.c +++ b/arch/arm/mach-davinci/usb.c @@ -42,14 +42,8 @@ static struct musb_hdrc_config musb_config = { }; static struct musb_hdrc_platform_data usb_data = { -#if defined(CONFIG_USB_MUSB_OTG) /* OTG requires a Mini-AB connector */ .mode = MUSB_OTG, -#elif defined(CONFIG_USB_MUSB_PERIPHERAL) - .mode = MUSB_PERIPHERAL, -#elif defined(CONFIG_USB_MUSB_HOST) - .mode = MUSB_HOST, -#endif .clock = "usb", .config = &musb_config, }; -- cgit v1.1 From baad1b33f4d86d223d665fcefa79b4acc832a269 Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Tue, 18 Sep 2012 18:59:59 +0200 Subject: ARM: davinci: board-dm646x-evm.c: Remove unecessary semicolon Found by http://coccinelle.lip6.fr/ Signed-off-by: Peter Senna Tschudin Signed-off-by: Sekhar Nori --- arch/arm/mach-davinci/board-dm646x-evm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-davinci') diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index 1dbf85b..9211e88 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -194,7 +194,7 @@ static int evm_led_setup(struct i2c_client *client, int gpio, while (ngpio--) { leds->gpio = gpio++; leds++; - }; + } evm_led_dev = platform_device_alloc("leds-gpio", 0); platform_device_add_data(evm_led_dev, &evm_led_data, -- cgit v1.1 From 915d6cfab391863aa283c4196f1686d416a6bb05 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Thu, 8 Nov 2012 08:46:19 +0100 Subject: ARM: davinci: remove obsoleted init_consistent_dma_size() Signed-off-by: Marek Szyprowski CC: Sekhar Nori CC: Kevin Hilman --- arch/arm/mach-davinci/common.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'arch/arm/mach-davinci') diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c index 64b0f65..a794f6d 100644 --- a/arch/arm/mach-davinci/common.c +++ b/arch/arm/mach-davinci/common.c @@ -87,8 +87,6 @@ void __init davinci_common_init(struct davinci_soc_info *soc_info) iotable_init(davinci_soc_info.io_desc, davinci_soc_info.io_desc_num); - init_consistent_dma_size(14 << 20); - /* * Normally devicemaps_init() would flush caches and tlb after * mdesc->map_io(), but we must also do it here because of the CPU -- cgit v1.1