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

Merge tag 'davinci-for-v4.7/cleanup' of... 

Merge tag 'davinci-for-v4.7/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/cleanup

Merge "DaVinci cleanups for v4.7" from Sekhar Nori:

It includes removal of some unused macros and data- -structures and use
of helper macros to reduce code.

* tag 'davinci-for-v4.7/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: use IRQCHIP_DECLARE for cp_intc
  ARM: davinci: remove unused DA8XX_NUM_UARTS
  ARM: davinci: simplify call to of populate
  ARM: DaVinci USB: removed deprecated properties from MUSB config
parents f8433ac9 9a7f2fc8

arch/arm/mach-davinci/cp_intc.c

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/export.h>

#include <linux/init.h>

#include <linux/irq.h>

#include <linux/irqchip.h>

#include <linux/irqdomain.h>

#include <linux/io.h>

#include <linux/of.h>
@@ -210,3 +211,5 @@ void __init cp_intc_init(void) 
{

	cp_intc_of_init(NULL, NULL);

}



IRQCHIP_DECLARE(cp_intc, "ti,cp-intc", cp_intc_of_init);

arch/arm/mach-davinci/da8xx-dt.c

+1 −16
Original line number Diff line number Diff line
@@ -18,18 +18,6 @@ 
#include "cp_intc.h"

#include <mach/da8xx.h>



#define DA8XX_NUM_UARTS	3



static const struct of_device_id const da8xx_irq_match[] __initconst = {

	{ .compatible = "ti,cp-intc", .data = cp_intc_of_init, },

	{ }

};



static void __init da8xx_init_irq(void)

{

	of_irq_init(da8xx_irq_match);

}



static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {

	OF_DEV_AUXDATA("ti,davinci-i2c", 0x01c22000, "i2c_davinci.1", NULL),

	OF_DEV_AUXDATA("ti,davinci-wdt", 0x01c21000, "davinci-wdt", NULL),
@@ -54,9 +42,7 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = { 


static void __init da850_init_machine(void)

{

	of_platform_populate(NULL, of_default_bus_match_table,

			     da850_auxdata_lookup, NULL);



	of_platform_default_populate(NULL, da850_auxdata_lookup, NULL);

}



static const char *const da850_boards_compat[] __initconst = {
@@ -68,7 +54,6 @@ static const char *const da850_boards_compat[] __initconst = { 


DT_MACHINE_START(DA850_DT, "Generic DA850/OMAP-L138/AM18x")

	.map_io		= da850_init,

	.init_irq	= da8xx_init_irq,

	.init_time	= davinci_timer_init,

	.init_machine	= da850_init_machine,

	.dt_compat	= da850_boards_compat,

arch/arm/mach-davinci/usb.c

+0 −16
Original line number Diff line number Diff line
@@ -19,27 +19,11 @@ 
#define DA8XX_USB1_BASE 	0x01e25000



#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)

static struct musb_hdrc_eps_bits musb_eps[] = {

	{ "ep1_tx", 8, },

	{ "ep1_rx", 8, },

	{ "ep2_tx", 8, },

	{ "ep2_rx", 8, },

	{ "ep3_tx", 5, },

	{ "ep3_rx", 5, },

	{ "ep4_tx", 5, },

	{ "ep4_rx", 5, },

};



static struct musb_hdrc_config musb_config = {

	.multipoint	= true,

	.dyn_fifo	= true,

	.soft_con	= true,

	.dma		= true,



	.num_eps	= 5,

	.dma_channels	= 8,

	.ram_bits	= 10,

	.eps_bits	= musb_eps,

};



static struct musb_hdrc_platform_data usb_data = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE