Merge branches 'fixes-mapphone' and 'fixes-ti-sysc' into fixes (06f114cf) · Commits · git / linux-nf

drivers/bus/ti-sysc.c

+22 −9

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ enum sysc_soc {
		SOC_2420,
		SOC_2430,
		SOC_3430,
		SOC_AM35,
		SOC_3630,
		SOC_4430,
		SOC_4460,
		@@ -1097,6 +1098,11 @@ static int sysc_enable_module(struct device *dev)
		if (ddata->cfg.quirks & (SYSC_QUIRK_SWSUP_SIDLE \|
		SYSC_QUIRK_SWSUP_SIDLE_ACT)) {
		best_mode = SYSC_IDLE_NO;

		/* Clear WAKEUP */
		if (regbits->enwkup_shift >= 0 &&
		ddata->cfg.sysc_val & BIT(regbits->enwkup_shift))
		reg &= ~BIT(regbits->enwkup_shift);
		} else {
		best_mode = fls(ddata->cfg.sidlemodes) - 1;
		if (best_mode > SYSC_IDLE_MASK) {
		@@ -1224,6 +1230,13 @@ static int sysc_disable_module(struct device *dev)
		}
		}

		if (ddata->cfg.quirks & SYSC_QUIRK_SWSUP_SIDLE_ACT) {
		/* Set WAKEUP */
		if (regbits->enwkup_shift >= 0 &&
		ddata->cfg.sysc_val & BIT(regbits->enwkup_shift))
		reg \|= BIT(regbits->enwkup_shift);
		}

		reg &= ~(SYSC_IDLE_MASK << regbits->sidle_shift);
		reg \|= best_mode << regbits->sidle_shift;
		if (regbits->autoidle_shift >= 0 &&
		@@ -1518,16 +1531,16 @@ struct sysc_revision_quirk {
		static const struct sysc_revision_quirk sysc_revision_quirks[] = {
		/* These drivers need to be fixed to not use pm_runtime_irq_safe() */
		SYSC_QUIRK("uart", 0, 0x50, 0x54, 0x58, 0x00000046, 0xffffffff,
		SYSC_QUIRK_SWSUP_SIDLE \| SYSC_QUIRK_LEGACY_IDLE),
		SYSC_QUIRK_SWSUP_SIDLE_ACT \| SYSC_QUIRK_LEGACY_IDLE),
		SYSC_QUIRK("uart", 0, 0x50, 0x54, 0x58, 0x00000052, 0xffffffff,
		SYSC_QUIRK_SWSUP_SIDLE \| SYSC_QUIRK_LEGACY_IDLE),
		SYSC_QUIRK_SWSUP_SIDLE_ACT \| SYSC_QUIRK_LEGACY_IDLE),
		/* Uarts on omap4 and later */
		SYSC_QUIRK("uart", 0, 0x50, 0x54, 0x58, 0x50411e03, 0xffff00ff,
		SYSC_QUIRK_SWSUP_SIDLE \| SYSC_QUIRK_LEGACY_IDLE),
		SYSC_QUIRK_SWSUP_SIDLE_ACT \| SYSC_QUIRK_LEGACY_IDLE),
		SYSC_QUIRK("uart", 0, 0x50, 0x54, 0x58, 0x47422e03, 0xffffffff,
		SYSC_QUIRK_SWSUP_SIDLE \| SYSC_QUIRK_LEGACY_IDLE),
		SYSC_QUIRK_SWSUP_SIDLE_ACT \| SYSC_QUIRK_LEGACY_IDLE),
		SYSC_QUIRK("uart", 0, 0x50, 0x54, 0x58, 0x47424e03, 0xffffffff,
		SYSC_QUIRK_SWSUP_SIDLE \| SYSC_QUIRK_LEGACY_IDLE),
		SYSC_QUIRK_SWSUP_SIDLE_ACT \| SYSC_QUIRK_LEGACY_IDLE),

		/* Quirks that need to be set based on the module address */
		SYSC_QUIRK("mcpdm", 0x40132000, 0, 0x10, -ENODEV, 0x50000800, 0xffffffff,
		@@ -1862,7 +1875,7 @@ static void sysc_pre_reset_quirk_dss(struct sysc *ddata)
		dev_warn(ddata->dev, "%s: timed out %08x !+ %08x\n",
		__func__, val, irq_mask);

		if (sysc_soc->soc == SOC_3430) {
		if (sysc_soc->soc == SOC_3430 \|\| sysc_soc->soc == SOC_AM35) {
		/* Clear DSS_SDI_CONTROL */
		sysc_write(ddata, 0x44, 0);

		@@ -2150,8 +2163,7 @@ static int sysc_reset(struct sysc *ddata)
		}

		if (ddata->cfg.srst_udelay)
		usleep_range(ddata->cfg.srst_udelay,
		ddata->cfg.srst_udelay * 2);
		fsleep(ddata->cfg.srst_udelay);

		if (ddata->post_reset_quirk)
		ddata->post_reset_quirk(ddata);
		@@ -3025,6 +3037,7 @@ static void ti_sysc_idle(struct work_struct *work)
		static const struct soc_device_attribute sysc_soc_match[] = {
		SOC_FLAG("OMAP242*", SOC_2420),
		SOC_FLAG("OMAP243*", SOC_2430),
		SOC_FLAG("AM35*", SOC_AM35),
		SOC_FLAG("OMAP3[45]*", SOC_3430),
		SOC_FLAG("OMAP3[67]*", SOC_3630),
		SOC_FLAG("OMAP443*", SOC_4430),
		@@ -3229,7 +3242,7 @@ static int sysc_check_active_timer(struct sysc *ddata)
		* can be dropped if we stop supporting old beagleboard revisions
		* A to B4 at some point.
		*/
		if (sysc_soc->soc == SOC_3430)
		if (sysc_soc->soc == SOC_3430 \|\| sysc_soc->soc == SOC_AM35)
		error = -ENXIO;
		else
		error = -EBUSY;