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

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

Merge branch 'drivers/macb-gem-cleanup' into at91/gpio

parents d28bdfc5 c220f8cd

arch/arm/mach-at91/at91cap9.c

+3 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static struct clk pwm_clk = { 
	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk macb_clk = {

	.name		= "macb_clk",

	.name		= "pclk",

	.pmc_mask	= 1 << AT91CAP9_ID_EMAC,

	.type		= CLK_TYPE_PERIPHERAL,

};
@@ -209,6 +209,8 @@ static struct clk *periph_clocks[] __initdata = { 
};



static struct clk_lookup periph_clocks_lookups[] = {

	/* One additional fake clock for macb_hclk */

	CLKDEV_CON_ID("hclk", &macb_clk),

	CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc", &utmi_clk),

	CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc", &udphs_clk),

	CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.0", &mmc0_clk),

arch/arm/mach-at91/at91cap9_devices.c

+3 −3
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data) {} 


#if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE)

static u64 eth_dmamask = DMA_BIT_MASK(32);

static struct at91_eth_data eth_data;

static struct macb_platform_data eth_data;



static struct resource eth_resources[] = {

	[0] = {
@@ -227,7 +227,7 @@ static struct platform_device at91cap9_eth_device = { 
	.num_resources	= ARRAY_SIZE(eth_resources),

};



void __init at91_add_device_eth(struct at91_eth_data *data)

void __init at91_add_device_eth(struct macb_platform_data *data)

{

	if (!data)

		return;
@@ -264,7 +264,7 @@ void __init at91_add_device_eth(struct at91_eth_data *data) 
	platform_device_register(&at91cap9_eth_device);

}

#else

void __init at91_add_device_eth(struct at91_eth_data *data) {}

void __init at91_add_device_eth(struct macb_platform_data *data) {}

#endif

arch/arm/mach-at91/at91rm9200_devices.c

+3 −3
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {} 


#if defined(CONFIG_ARM_AT91_ETHER) || defined(CONFIG_ARM_AT91_ETHER_MODULE)

static u64 eth_dmamask = DMA_BIT_MASK(32);

static struct at91_eth_data eth_data;

static struct macb_platform_data eth_data;



static struct resource eth_resources[] = {

	[0] = {
@@ -162,7 +162,7 @@ static struct platform_device at91rm9200_eth_device = { 
	.num_resources	= ARRAY_SIZE(eth_resources),

};



void __init at91_add_device_eth(struct at91_eth_data *data)

void __init at91_add_device_eth(struct macb_platform_data *data)

{

	if (!data)

		return;
@@ -199,7 +199,7 @@ void __init at91_add_device_eth(struct at91_eth_data *data) 
	platform_device_register(&at91rm9200_eth_device);

}

#else

void __init at91_add_device_eth(struct at91_eth_data *data) {}

void __init at91_add_device_eth(struct macb_platform_data *data) {}

#endif

arch/arm/mach-at91/at91sam9260.c

+3 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static struct clk ohci_clk = { 
	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk macb_clk = {

	.name		= "macb_clk",

	.name		= "pclk",

	.pmc_mask	= 1 << AT91SAM9260_ID_EMAC,

	.type		= CLK_TYPE_PERIPHERAL,

};
@@ -189,6 +189,8 @@ static struct clk *periph_clocks[] __initdata = { 
};



static struct clk_lookup periph_clocks_lookups[] = {

	/* One additional fake clock for macb_hclk */

	CLKDEV_CON_ID("hclk", &macb_clk),

	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk),

	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),

	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk),

arch/arm/mach-at91/at91sam9260_devices.c

+3 −3
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {} 


#if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE)

static u64 eth_dmamask = DMA_BIT_MASK(32);

static struct at91_eth_data eth_data;

static struct macb_platform_data eth_data;



static struct resource eth_resources[] = {

	[0] = {
@@ -163,7 +163,7 @@ static struct platform_device at91sam9260_eth_device = { 
	.num_resources	= ARRAY_SIZE(eth_resources),

};



void __init at91_add_device_eth(struct at91_eth_data *data)

void __init at91_add_device_eth(struct macb_platform_data *data)

{

	if (!data)

		return;
@@ -200,7 +200,7 @@ void __init at91_add_device_eth(struct at91_eth_data *data) 
	platform_device_register(&at91sam9260_eth_device);

}

#else

void __init at91_add_device_eth(struct at91_eth_data *data) {}

void __init at91_add_device_eth(struct macb_platform_data *data) {}

#endif