diff options
| -rw-r--r-- | arch/arm/mach-mx6/platsmp.c | 5 | ||||
| -rwxr-xr-x | arch/arm/plat-mxc/include/mach/devices-common.h | 18 | ||||
| -rwxr-xr-x | arch/arm/plat-mxc/usb_common.c | 5 | ||||
| -rwxr-xr-x | arch/arm/plat-mxc/utmixc.c | 13 | ||||
| -rw-r--r-- | fs/fs-writeback.c | 2 | ||||
| -rw-r--r-- | include/linux/fsl_devices.h | 1 |
6 files changed, 11 insertions, 33 deletions
diff --git a/arch/arm/mach-mx6/platsmp.c b/arch/arm/mach-mx6/platsmp.c index 1ea1200f69a0..19d6fce474e7 100644 --- a/arch/arm/mach-mx6/platsmp.c +++ b/arch/arm/mach-mx6/platsmp.c @@ -24,13 +24,14 @@ #include <linux/smp.h> #include <linux/io.h> #include <asm/cacheflush.h> -#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/localtimer.h> #include <asm/smp_scu.h> +#include <asm/io.h> +#include <mach/hardware.h> #include <mach/mx6.h> +#include <mach/smp.h> #include "src-reg.h" -#include <asm/io.h> static DEFINE_SPINLOCK(boot_lock); diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h index db8a93d032fb..cb73e1e45ec0 100755 --- a/arch/arm/plat-mxc/include/mach/devices-common.h +++ b/arch/arm/plat-mxc/include/mach/devices-common.h @@ -199,7 +199,7 @@ struct imx_imx_udc_data { struct platform_device *__init imx_add_imx_udc( const struct imx_imx_udc_data *data, const struct imxusb_platform_data *pdata); - +#if 0 #include <mach/ipu.h> #include <mach/mx3fb.h> #include <mach/mx3_camera.h> @@ -217,7 +217,7 @@ struct platform_device *__init imx_alloc_mx3_camera( struct platform_device *__init imx_add_mx3_sdc_fb( const struct imx_ipu_core_data *data, struct mx3fb_platform_data *pdata); - +#endif #include <mach/mx1_camera.h> struct imx_mx1_camera_data { resource_size_t iobase; @@ -412,6 +412,8 @@ struct imx_mxc_gpu_data { struct platform_device *__init imx_add_mxc_gpu( const struct imx_mxc_gpu_data *data, + const struct mxc_gpu_platform_data *pdata); + struct imx_perfmon_data { resource_size_t iobase; struct mxs_platform_perfmon_data *pdata; @@ -439,11 +441,6 @@ struct imx_mxc_scc2_data { struct platform_device *__init imx_add_mxc_scc2( const struct imx_mxc_scc2_data *data); -struct imx_perfmon_data { - resource_size_t iobase; - struct mxs_platform_perfmon_data *pdata; -}; - struct imx_pxp_data { resource_size_t iobase; resource_size_t iosize; @@ -503,9 +500,7 @@ struct imx_anatop_thermal_imx_data { struct platform_device *__init imx_add_anatop_thermal_imx( const struct imx_anatop_thermal_imx_data *data, const struct anatop_thermal_platform_data *pdata); -struct platform_device *__init imx_add_perfmon( - const struct imx_perfmon_data *data); - const struct mxc_gpu_platform_data *pdata); + struct imx_otp_data { resource_size_t iobase; struct mxc_otp_platform_data *pdata; @@ -602,7 +597,9 @@ struct imx_mipi_csi2_data { struct platform_device *__init imx_add_mipi_csi2( const struct imx_mipi_csi2_data *data, const struct mipi_csi2_platform_data *pdata); + struct platform_device *__init imx_add_dcp( + const struct imx_dcp_data *data); struct imx_fsl_usb2_otg_data { resource_size_t iobase; @@ -620,7 +617,6 @@ struct imx_fsl_usb2_wakeup_data { struct platform_device *__init imx_add_fsl_usb2_wakeup( const struct imx_fsl_usb2_wakeup_data *data, const struct fsl_usb2_wakeup_platform_data *pdata); - const struct imx_dcp_data *data); /* gpmi-nfc */ #include <mach/gpmi-nfc.h> diff --git a/arch/arm/plat-mxc/usb_common.c b/arch/arm/plat-mxc/usb_common.c index 798aa9afeba5..80e2a958e540 100755 --- a/arch/arm/plat-mxc/usb_common.c +++ b/arch/arm/plat-mxc/usb_common.c @@ -740,11 +740,6 @@ static void otg_set_utmi_xcvr(void) /* Set the PHY clock to 19.2MHz */ USB_PHY_CTR_FUNC2 &= ~USB_UTMI_PHYCTRL2_PLLDIV_MASK; USB_PHY_CTR_FUNC2 |= 0x01; - } else if (machine_is_mx37_3ds()) { - /* Reference voltage for HS disconnect envelope detector */ - /* adjust the Squelch level */ - USB_PHY_CTR_FUNC2 &= ~(USB_UTMI_PHYCTRL2_HSDEVSEL_MASK << - USB_UTMI_PHYCTRL2_HSDEVSEL_SHIFT); } /* Workaround an IC issue for ehci driver: diff --git a/arch/arm/plat-mxc/utmixc.c b/arch/arm/plat-mxc/utmixc.c index ad935fdfa50d..ab475eeac0d3 100755 --- a/arch/arm/plat-mxc/utmixc.c +++ b/arch/arm/plat-mxc/utmixc.c @@ -60,19 +60,6 @@ static void set_power(struct fsl_xcvr_ops *this, struct device *dev = &pdata->pdev->dev; pr_debug("real %s(on=%d) pdata=0x%p\n", __func__, on, pdata); - if (machine_is_mx37_3ds()) { - if (on) { - if (!board_is_rev(IMX_BOARD_REV_2)) - usbotg_regux = regulator_get(dev, "DCDC2"); - else - usbotg_regux = regulator_get(dev, "SWBST"); - - regulator_enable(usbotg_regux); - } else { - regulator_disable(usbotg_regux); - regulator_put(usbotg_regux); - } - } if (pdata && pdata->platform_driver_vbus) pdata->platform_driver_vbus(on); } diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 5df6157e5bce..3bab832a44f2 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -1083,7 +1083,7 @@ void __mark_inode_dirty(struct inode *inode, int flags) bool wakeup_bdi = false; bdi = inode_to_bdi(inode); if (!bdi) - goto out; + goto out_unlock_inode; if (bdi_cap_writeback_dirty(bdi)) { WARN(!test_bit(BDI_registered, &bdi->state), diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index 3c2fa69777a1..d629691ae539 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -107,7 +107,6 @@ struct fsl_usb2_platform_data { u32 phy_regs; /* usb phy register base */ u32 xcvr_type; /* PORTSC_PTS_* */ char *transceiver; /* transceiver name */ - unsigned power_budget; /* for hcd->power_budget */ u32 id_gpio; struct fsl_xcvr_ops *xcvr_ops; |