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

Commit 6658d6a5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

From Nicolas Ferre <nicolas.ferre@atmel.com>:

Two little fixes, one related to the move to sparse irq and
another one fixing the check of a GPIO for USB host overcurrent.

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91

:
  ARM: at91/usbh: fix overcurrent gpio setup
  ARM: at91/AT91SAM9G45: fix crypto peripherals irq issue due to sparse irq support

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 57260e40 641f3ce6

arch/arm/mach-at91/at91rm9200_devices.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) 




	/* Enable overcurrent notification */

	/* Enable overcurrent notification */

	for (i = 0; i < data->ports; i++) {

	for (i = 0; i < data->ports; i++) {

		if (data->overcurrent_pin[i])

		if (gpio_is_valid(data->overcurrent_pin[i]))

			at91_set_gpio_input(data->overcurrent_pin[i], 1);

			at91_set_gpio_input(data->overcurrent_pin[i], 1);

	}

	}

arch/arm/mach-at91/at91sam9260_devices.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) 




	/* Enable overcurrent notification */

	/* Enable overcurrent notification */

	for (i = 0; i < data->ports; i++) {

	for (i = 0; i < data->ports; i++) {

		if (data->overcurrent_pin[i])

		if (gpio_is_valid(data->overcurrent_pin[i]))

			at91_set_gpio_input(data->overcurrent_pin[i], 1);

			at91_set_gpio_input(data->overcurrent_pin[i], 1);

	}

	}

arch/arm/mach-at91/at91sam9261_devices.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) 




	/* Enable overcurrent notification */

	/* Enable overcurrent notification */

	for (i = 0; i < data->ports; i++) {

	for (i = 0; i < data->ports; i++) {

		if (data->overcurrent_pin[i])

		if (gpio_is_valid(data->overcurrent_pin[i]))

			at91_set_gpio_input(data->overcurrent_pin[i], 1);

			at91_set_gpio_input(data->overcurrent_pin[i], 1);

	}

	}

arch/arm/mach-at91/at91sam9263_devices.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) 




	/* Enable overcurrent notification */

	/* Enable overcurrent notification */

	for (i = 0; i < data->ports; i++) {

	for (i = 0; i < data->ports; i++) {

		if (data->overcurrent_pin[i])

		if (gpio_is_valid(data->overcurrent_pin[i]))

			at91_set_gpio_input(data->overcurrent_pin[i], 1);

			at91_set_gpio_input(data->overcurrent_pin[i], 1);

	}

	}

arch/arm/mach-at91/at91sam9g45_devices.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -1841,8 +1841,8 @@ static struct resource sha_resources[] = { 
		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,

	},

	},

	[1] = {

	[1] = {

		.start	= AT91SAM9G45_ID_AESTDESSHA,

		.start	= NR_IRQS_LEGACY + AT91SAM9G45_ID_AESTDESSHA,

		.end	= AT91SAM9G45_ID_AESTDESSHA,

		.end	= NR_IRQS_LEGACY + AT91SAM9G45_ID_AESTDESSHA,

		.flags	= IORESOURCE_IRQ,

		.flags	= IORESOURCE_IRQ,

	},

	},

};

};
@@ -1874,8 +1874,8 @@ static struct resource tdes_resources[] = { 
		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,

	},

	},

	[1] = {

	[1] = {

		.start	= AT91SAM9G45_ID_AESTDESSHA,

		.start	= NR_IRQS_LEGACY + AT91SAM9G45_ID_AESTDESSHA,

		.end	= AT91SAM9G45_ID_AESTDESSHA,

		.end	= NR_IRQS_LEGACY + AT91SAM9G45_ID_AESTDESSHA,

		.flags	= IORESOURCE_IRQ,

		.flags	= IORESOURCE_IRQ,

	},

	},

};

};
@@ -1910,8 +1910,8 @@ static struct resource aes_resources[] = { 
		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,

	},

	},

	[1] = {

	[1] = {

		.start	= AT91SAM9G45_ID_AESTDESSHA,

		.start	= NR_IRQS_LEGACY + AT91SAM9G45_ID_AESTDESSHA,

		.end	= AT91SAM9G45_ID_AESTDESSHA,

		.end	= NR_IRQS_LEGACY + AT91SAM9G45_ID_AESTDESSHA,

		.flags	= IORESOURCE_IRQ,

		.flags	= IORESOURCE_IRQ,

	},

	},

};

};