Merge tag 'ti-sysc-fixes' into fixes (df854299) · Commits · 戴 / test

arch/arm/mach-omap2/Kconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@ config ARCH_OMAP2
		depends on ARCH_MULTI_V6
		select ARCH_OMAP2PLUS
		select CPU_V6
		select PM_GENERIC_DOMAINS if PM
		select SOC_HAS_OMAP2_SDRC

		config ARCH_OMAP3
		@@ -106,6 +105,8 @@ config ARCH_OMAP2PLUS
		select OMAP_DM_TIMER
		select OMAP_GPMC
		select PINCTRL
		select PM_GENERIC_DOMAINS if PM
		select PM_GENERIC_DOMAINS_OF if PM
		select RESET_CONTROLLER
		select SOC_BUS
		select TI_SYSC

drivers/bus/ti-sysc.c

+18 −9

Original line number	Diff line number	Diff line
		@@ -227,6 +227,9 @@ static int sysc_wait_softreset(struct sysc *ddata)
		u32 sysc_mask, syss_done, rstval;
		int syss_offset, error = 0;

		if (ddata->cap->regbits->srst_shift < 0)
		return 0;

		syss_offset = ddata->offsets[SYSC_SYSSTATUS];
		sysc_mask = BIT(ddata->cap->regbits->srst_shift);

		@@ -970,9 +973,15 @@ static int sysc_enable_module(struct device *dev)
		return error;
		}
		}
		/*
		* Some modules like i2c and hdq1w have unusable reset status unless
		* the module reset quirk is enabled. Skip status check on enable.
		*/
		if (!(ddata->cfg.quirks & SYSC_MODULE_QUIRK_ENA_RESETDONE)) {
		error = sysc_wait_softreset(ddata);
		if (error)
		dev_warn(ddata->dev, "OCP softreset timed out\n");
		}
		if (ddata->cfg.quirks & SYSC_QUIRK_OPT_CLKS_IN_RESET)
		sysc_disable_opt_clocks(ddata);

		@@ -1373,17 +1382,17 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {
		SYSC_QUIRK("hdmi", 0, 0, 0x10, -ENODEV, 0x50030200, 0xffffffff,
		SYSC_QUIRK_OPT_CLKS_NEEDED),
		SYSC_QUIRK("hdq1w", 0, 0, 0x14, 0x18, 0x00000006, 0xffffffff,
		SYSC_MODULE_QUIRK_HDQ1W),
		SYSC_MODULE_QUIRK_HDQ1W \| SYSC_MODULE_QUIRK_ENA_RESETDONE),
		SYSC_QUIRK("hdq1w", 0, 0, 0x14, 0x18, 0x0000000a, 0xffffffff,
		SYSC_MODULE_QUIRK_HDQ1W),
		SYSC_MODULE_QUIRK_HDQ1W \| SYSC_MODULE_QUIRK_ENA_RESETDONE),
		SYSC_QUIRK("i2c", 0, 0, 0x20, 0x10, 0x00000036, 0x000000ff,
		SYSC_MODULE_QUIRK_I2C),
		SYSC_MODULE_QUIRK_I2C \| SYSC_MODULE_QUIRK_ENA_RESETDONE),
		SYSC_QUIRK("i2c", 0, 0, 0x20, 0x10, 0x0000003c, 0x000000ff,
		SYSC_MODULE_QUIRK_I2C),
		SYSC_MODULE_QUIRK_I2C \| SYSC_MODULE_QUIRK_ENA_RESETDONE),
		SYSC_QUIRK("i2c", 0, 0, 0x20, 0x10, 0x00000040, 0x000000ff,
		SYSC_MODULE_QUIRK_I2C),
		SYSC_MODULE_QUIRK_I2C \| SYSC_MODULE_QUIRK_ENA_RESETDONE),
		SYSC_QUIRK("i2c", 0, 0, 0x10, 0x90, 0x5040000a, 0xfffff0f0,
		SYSC_MODULE_QUIRK_I2C),
		SYSC_MODULE_QUIRK_I2C \| SYSC_MODULE_QUIRK_ENA_RESETDONE),
		SYSC_QUIRK("gpu", 0x50000000, 0x14, -ENODEV, -ENODEV, 0x00010201, 0xffffffff, 0),
		SYSC_QUIRK("gpu", 0x50000000, 0xfe00, 0xfe10, -ENODEV, 0x40000000 , 0xffffffff,
		SYSC_MODULE_QUIRK_SGX),

include/linux/platform_data/ti-sysc.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ struct sysc_regbits {
		s8 emufree_shift;
		};

		#define SYSC_MODULE_QUIRK_ENA_RESETDONE BIT(25)
		#define SYSC_MODULE_QUIRK_PRUSS BIT(24)
		#define SYSC_MODULE_QUIRK_DSS_RESET BIT(23)
		#define SYSC_MODULE_QUIRK_RTC_UNLOCK BIT(22)

Admin message