Commit b5121290 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Fix for the TWL4030 PM sleep/wakeup sequence
  mfd: Fix asic3 build error
  mfd: Fixed gpio polarity of omap-usb gpio USB-phy reset
parents 409ab140 c62dd365

drivers/mfd/asic3.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc) 
	int iter, i;

	unsigned long flags;



	data->chip->irq_ack(irq_data);

	data->chip->irq_ack(data);



	for (iter = 0 ; iter < MAX_ASIC_ISR_LOOPS; iter++) {

		u32 status;

drivers/mfd/omap-usb-host.c

+4 −4
Original line number Diff line number Diff line
@@ -717,14 +717,14 @@ static int usbhs_enable(struct device *dev) 
			gpio_request(pdata->ehci_data->reset_gpio_port[0],

						"USB1 PHY reset");

			gpio_direction_output

				(pdata->ehci_data->reset_gpio_port[0], 1);

				(pdata->ehci_data->reset_gpio_port[0], 0);

		}



		if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[1])) {

			gpio_request(pdata->ehci_data->reset_gpio_port[1],

						"USB2 PHY reset");

			gpio_direction_output

				(pdata->ehci_data->reset_gpio_port[1], 1);

				(pdata->ehci_data->reset_gpio_port[1], 0);

		}



		/* Hold the PHY in RESET for enough time till DIR is high */
@@ -904,11 +904,11 @@ static int usbhs_enable(struct device *dev) 


		if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[0]))

			gpio_set_value

				(pdata->ehci_data->reset_gpio_port[0], 0);

				(pdata->ehci_data->reset_gpio_port[0], 1);



		if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[1]))

			gpio_set_value

				(pdata->ehci_data->reset_gpio_port[1], 0);

				(pdata->ehci_data->reset_gpio_port[1], 1);

	}



end_count:

drivers/mfd/twl4030-power.c

+2 −1
Original line number Diff line number Diff line
@@ -447,12 +447,13 @@ static int __init load_twl4030_script(struct twl4030_script *tscript, 
		if (err)

			goto out;

	}

	if (tscript->flags & TWL4030_SLEEP_SCRIPT)

	if (tscript->flags & TWL4030_SLEEP_SCRIPT) {

		if (order)

			pr_warning("TWL4030: Bad order of scripts (sleep "\

					"script before wakeup) Leads to boot"\

					"failure on some boards\n");

		err = twl4030_config_sleep_sequence(address);

	}

out:

	return err;

}