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

Commit 2d12a18b authored Jul 05, 2011 by Linus Torvalds

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: Add Makefile and Kconfig Entries for tps65911 comparator
  mfd: Fix build error for tps65911-comparator.c
  Revert "mfd: Add omap-usbhs runtime PM support"
  input: pmic8xxx-pwrkey: Do not use mfd_get_data()
  input: pmic8xxx-keypad: Do not use mfd_get_data()

parents 121782a2 8509e142

drivers/input/keyboard/pmic8xxx-keypad.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -520,7 +520,8 @@ static void pmic8xxx_kp_close(struct input_dev *dev)
		*/
		static int __devinit pmic8xxx_kp_probe(struct platform_device *pdev)
		{
		const struct pm8xxx_keypad_platform_data *pdata = mfd_get_data(pdev);
		const struct pm8xxx_keypad_platform_data *pdata =
		dev_get_platdata(&pdev->dev);
		const struct matrix_keymap_data *keymap_data;
		struct pmic8xxx_kp *kp;
		int rc;

drivers/input/misc/pmic8xxx-pwrkey.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -90,7 +90,8 @@ static int __devinit pmic8xxx_pwrkey_probe(struct platform_device *pdev)
		unsigned int delay;
		u8 pon_cntl;
		struct pmic8xxx_pwrkey *pwrkey;
		const struct pm8xxx_pwrkey_platform_data *pdata = mfd_get_data(pdev);
		const struct pm8xxx_pwrkey_platform_data *pdata =
		dev_get_platdata(&pdev->dev);

		if (!pdata) {
		dev_err(&pdev->dev, "power key platform data not supplied\n");

drivers/mfd/Kconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -728,6 +728,9 @@ config MFD_TPS65910
		if you say yes here you get support for the TPS65910 series of
		Power Management chips.

		config TPS65911_COMPARATOR
		tristate

		endif # MFD_SUPPORT

		menu "Multimedia Capabilities Port drivers"

drivers/mfd/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -94,3 +94,4 @@ obj-$(CONFIG_MFD_OMAP_USB_HOST) += omap-usb-host.o
		obj-$(CONFIG_MFD_PM8921_CORE) += pm8921-core.o
		obj-$(CONFIG_MFD_PM8XXX_IRQ) += pm8xxx-irq.o
		obj-$(CONFIG_MFD_TPS65910) += tps65910.o tps65910-irq.o
		obj-$(CONFIG_TPS65911_COMPARATOR) += tps65911-comparator.o

drivers/mfd/omap-usb-host.c

+122 −9

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@
		#include <linux/spinlock.h>
		#include <linux/gpio.h>
		#include <plat/usb.h>
		#include <linux/pm_runtime.h>

		#define USBHS_DRIVER_NAME "usbhs-omap"
		#define OMAP_EHCI_DEVICE "ehci-omap"
		@@ -147,6 +146,9 @@


		struct usbhs_hcd_omap {
		struct clk *usbhost_ick;
		struct clk *usbhost_hs_fck;
		struct clk *usbhost_fs_fck;
		struct clk *xclk60mhsp1_ck;
		struct clk *xclk60mhsp2_ck;
		struct clk *utmi_p1_fck;
		@@ -156,6 +158,8 @@ struct usbhs_hcd_omap {
		struct clk *usbhost_p2_fck;
		struct clk *usbtll_p2_fck;
		struct clk *init_60m_fclk;
		struct clk *usbtll_fck;
		struct clk *usbtll_ick;

		void __iomem *uhh_base;
		void __iomem *tll_base;
		@@ -349,13 +353,46 @@ static int __devinit usbhs_omap_probe(struct platform_device *pdev)
		omap->platdata.ehci_data = pdata->ehci_data;
		omap->platdata.ohci_data = pdata->ohci_data;

		pm_runtime_enable(&pdev->dev);
		omap->usbhost_ick = clk_get(dev, "usbhost_ick");
		if (IS_ERR(omap->usbhost_ick)) {
		ret = PTR_ERR(omap->usbhost_ick);
		dev_err(dev, "usbhost_ick failed error:%d\n", ret);
		goto err_end;
		}

		omap->usbhost_hs_fck = clk_get(dev, "hs_fck");
		if (IS_ERR(omap->usbhost_hs_fck)) {
		ret = PTR_ERR(omap->usbhost_hs_fck);
		dev_err(dev, "usbhost_hs_fck failed error:%d\n", ret);
		goto err_usbhost_ick;
		}

		omap->usbhost_fs_fck = clk_get(dev, "fs_fck");
		if (IS_ERR(omap->usbhost_fs_fck)) {
		ret = PTR_ERR(omap->usbhost_fs_fck);
		dev_err(dev, "usbhost_fs_fck failed error:%d\n", ret);
		goto err_usbhost_hs_fck;
		}

		omap->usbtll_fck = clk_get(dev, "usbtll_fck");
		if (IS_ERR(omap->usbtll_fck)) {
		ret = PTR_ERR(omap->usbtll_fck);
		dev_err(dev, "usbtll_fck failed error:%d\n", ret);
		goto err_usbhost_fs_fck;
		}

		omap->usbtll_ick = clk_get(dev, "usbtll_ick");
		if (IS_ERR(omap->usbtll_ick)) {
		ret = PTR_ERR(omap->usbtll_ick);
		dev_err(dev, "usbtll_ick failed error:%d\n", ret);
		goto err_usbtll_fck;
		}

		omap->utmi_p1_fck = clk_get(dev, "utmi_p1_gfclk");
		if (IS_ERR(omap->utmi_p1_fck)) {
		ret = PTR_ERR(omap->utmi_p1_fck);
		dev_err(dev, "utmi_p1_gfclk failed error:%d\n", ret);
		goto err_end;
		goto err_usbtll_ick;
		}

		omap->xclk60mhsp1_ck = clk_get(dev, "xclk60mhsp1_ck");
		@@ -485,8 +522,22 @@ static int __devinit usbhs_omap_probe(struct platform_device *pdev)
		err_utmi_p1_fck:
		clk_put(omap->utmi_p1_fck);

		err_usbtll_ick:
		clk_put(omap->usbtll_ick);

		err_usbtll_fck:
		clk_put(omap->usbtll_fck);

		err_usbhost_fs_fck:
		clk_put(omap->usbhost_fs_fck);

		err_usbhost_hs_fck:
		clk_put(omap->usbhost_hs_fck);

		err_usbhost_ick:
		clk_put(omap->usbhost_ick);

		err_end:
		pm_runtime_disable(&pdev->dev);
		kfree(omap);

		end_probe:
		@@ -520,7 +571,11 @@ static int __devexit usbhs_omap_remove(struct platform_device *pdev)
		clk_put(omap->utmi_p2_fck);
		clk_put(omap->xclk60mhsp1_ck);
		clk_put(omap->utmi_p1_fck);
		pm_runtime_disable(&pdev->dev);
		clk_put(omap->usbtll_ick);
		clk_put(omap->usbtll_fck);
		clk_put(omap->usbhost_fs_fck);
		clk_put(omap->usbhost_hs_fck);
		clk_put(omap->usbhost_ick);
		kfree(omap);

		return 0;
		@@ -640,6 +695,7 @@ static int usbhs_enable(struct device *dev)
		struct usbhs_omap_platform_data *pdata = &omap->platdata;
		unsigned long flags = 0;
		int ret = 0;
		unsigned long timeout;
		unsigned reg;

		dev_dbg(dev, "starting TI HSUSB Controller\n");
		@@ -652,7 +708,11 @@ static int usbhs_enable(struct device *dev)
		if (omap->count > 0)
		goto end_count;

		pm_runtime_get_sync(dev);
		clk_enable(omap->usbhost_ick);
		clk_enable(omap->usbhost_hs_fck);
		clk_enable(omap->usbhost_fs_fck);
		clk_enable(omap->usbtll_fck);
		clk_enable(omap->usbtll_ick);

		if (pdata->ehci_data->phy_reset) {
		if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[0])) {
		@@ -676,6 +736,50 @@ static int usbhs_enable(struct device *dev)
		omap->usbhs_rev = usbhs_read(omap->uhh_base, OMAP_UHH_REVISION);
		dev_dbg(dev, "OMAP UHH_REVISION 0x%x\n", omap->usbhs_rev);

		/* perform TLL soft reset, and wait until reset is complete */
		usbhs_write(omap->tll_base, OMAP_USBTLL_SYSCONFIG,
		OMAP_USBTLL_SYSCONFIG_SOFTRESET);

		/* Wait for TLL reset to complete */
		timeout = jiffies + msecs_to_jiffies(1000);
		while (!(usbhs_read(omap->tll_base, OMAP_USBTLL_SYSSTATUS)
		& OMAP_USBTLL_SYSSTATUS_RESETDONE)) {
		cpu_relax();

		if (time_after(jiffies, timeout)) {
		dev_dbg(dev, "operation timed out\n");
		ret = -EINVAL;
		goto err_tll;
		}
		}

		dev_dbg(dev, "TLL RESET DONE\n");

		/* (1<<3) = no idle mode only for initial debugging */
		usbhs_write(omap->tll_base, OMAP_USBTLL_SYSCONFIG,
		OMAP_USBTLL_SYSCONFIG_ENAWAKEUP \|
		OMAP_USBTLL_SYSCONFIG_SIDLEMODE \|
		OMAP_USBTLL_SYSCONFIG_AUTOIDLE);

		/* Put UHH in NoIdle/NoStandby mode */
		reg = usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG);
		if (is_omap_usbhs_rev1(omap)) {
		reg \|= (OMAP_UHH_SYSCONFIG_ENAWAKEUP
		\| OMAP_UHH_SYSCONFIG_SIDLEMODE
		\| OMAP_UHH_SYSCONFIG_CACTIVITY
		\| OMAP_UHH_SYSCONFIG_MIDLEMODE);
		reg &= ~OMAP_UHH_SYSCONFIG_AUTOIDLE;


		} else if (is_omap_usbhs_rev2(omap)) {
		reg &= ~OMAP4_UHH_SYSCONFIG_IDLEMODE_CLEAR;
		reg \|= OMAP4_UHH_SYSCONFIG_NOIDLE;
		reg &= ~OMAP4_UHH_SYSCONFIG_STDBYMODE_CLEAR;
		reg \|= OMAP4_UHH_SYSCONFIG_NOSTDBY;
		}

		usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG, reg);

		reg = usbhs_read(omap->uhh_base, OMAP_UHH_HOSTCONFIG);
		/* setup ULPI bypass and burst configurations */
		reg \|= (OMAP_UHH_HOSTCONFIG_INCR4_BURST_EN
		@@ -815,8 +919,6 @@ static int usbhs_enable(struct device *dev)
		return 0;

		err_tll:
		pm_runtime_put_sync(dev);
		spin_unlock_irqrestore(&omap->lock, flags);
		if (pdata->ehci_data->phy_reset) {
		if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[0]))
		gpio_free(pdata->ehci_data->reset_gpio_port[0]);
		@@ -824,6 +926,13 @@ static int usbhs_enable(struct device *dev)
		if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[1]))
		gpio_free(pdata->ehci_data->reset_gpio_port[1]);
		}

		clk_disable(omap->usbtll_ick);
		clk_disable(omap->usbtll_fck);
		clk_disable(omap->usbhost_fs_fck);
		clk_disable(omap->usbhost_hs_fck);
		clk_disable(omap->usbhost_ick);
		spin_unlock_irqrestore(&omap->lock, flags);
		return ret;
		}

		@@ -896,7 +1005,11 @@ static void usbhs_disable(struct device *dev)
		clk_disable(omap->utmi_p1_fck);
		}

		pm_runtime_put_sync(dev);
		clk_disable(omap->usbtll_ick);
		clk_disable(omap->usbtll_fck);
		clk_disable(omap->usbhost_fs_fck);
		clk_disable(omap->usbhost_hs_fck);
		clk_disable(omap->usbhost_ick);

		/* The gpio_free migh sleep; so unlock the spinlock */
		spin_unlock_irqrestore(&omap->lock, flags);