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

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

Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes

parents 5611cc45 0e934e22

arch/arm/mach-at91/at91rm9200_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} 
 *  USB Device (Gadget)

 * -------------------------------------------------------------------- */



#ifdef CONFIG_USB_GADGET_AT91

#ifdef CONFIG_USB_AT91

static struct at91_udc_data udc_data;



static struct resource udc_resources[] = {

arch/arm/mach-at91/at91sam9260.c

+3 −3
Original line number Diff line number Diff line
@@ -195,9 +195,9 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk),

	CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk),

	CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk),

	CLKDEV_CON_DEV_ID("t3_clk", "atmel_tcb.1", &tc3_clk),

	CLKDEV_CON_DEV_ID("t4_clk", "atmel_tcb.1", &tc4_clk),

	CLKDEV_CON_DEV_ID("t5_clk", "atmel_tcb.1", &tc5_clk),

	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk),

	CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk),

	CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc_clk),

	/* more usart lookup table for DT entries */

	CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck),

arch/arm/mach-at91/at91sam9260_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} 
 *  USB Device (Gadget)

 * -------------------------------------------------------------------- */



#ifdef CONFIG_USB_GADGET_AT91

#ifdef CONFIG_USB_AT91

static struct at91_udc_data udc_data;



static struct resource udc_resources[] = {

arch/arm/mach-at91/at91sam9261_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} 
 *  USB Device (Gadget)

 * -------------------------------------------------------------------- */



#ifdef CONFIG_USB_GADGET_AT91

#ifdef CONFIG_USB_AT91

static struct at91_udc_data udc_data;



static struct resource udc_resources[] = {

arch/arm/mach-at91/at91sam9263_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} 
 *  USB Device (Gadget)

 * -------------------------------------------------------------------- */



#ifdef CONFIG_USB_GADGET_AT91

#ifdef CONFIG_USB_AT91

static struct at91_udc_data udc_data;



static struct resource udc_resources[] = {