Commit 5af5b2ae authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-5.5-soc-fixes' of... 

Merge tag 'tegra-for-5.5-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/fixes

soc/tegra: Fixes for v5.5-rc1

Fixes a regression for wake events on Tegra194 caused by the Tegra210
support that was added in v5.5-rc1 as well as wrong reset sources and
levels on Tegra194.

* tag 'tegra-for-5.5-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  soc/tegra: pmc: Add reset sources and levels on Tegra194
  soc/tegra: pmc: Add missing IRQ callbacks on Tegra194
  soc/tegra: pmc: Use lower-case for hexadecimal literals

Link: https://lore.kernel.org/r/20191204130753.3614278-2-thierry.reding@gmail.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c25f318b 48914c4e

drivers/soc/tegra/pmc.c

+45 −2
Original line number Diff line number Diff line
@@ -2804,7 +2804,7 @@ static const struct tegra_pmc_regs tegra186_pmc_regs = { 
	.dpd2_status = 0x80,

	.rst_status = 0x70,

	.rst_source_shift = 0x2,

	.rst_source_mask = 0x3C,

	.rst_source_mask = 0x3c,

	.rst_level_shift = 0x0,

	.rst_level_mask = 0x3,

};
@@ -2926,6 +2926,43 @@ static const struct tegra_io_pad_soc tegra194_io_pads[] = { 
	{ .id = TEGRA_IO_PAD_AUDIO_HV, .dpd = 61, .voltage = UINT_MAX },

};



static const struct tegra_pmc_regs tegra194_pmc_regs = {

	.scratch0 = 0x2000,

	.dpd_req = 0x74,

	.dpd_status = 0x78,

	.dpd2_req = 0x7c,

	.dpd2_status = 0x80,

	.rst_status = 0x70,

	.rst_source_shift = 0x2,

	.rst_source_mask = 0x7c,

	.rst_level_shift = 0x0,

	.rst_level_mask = 0x3,

};



static const char * const tegra194_reset_sources[] = {

	"SYS_RESET_N",

	"AOWDT",

	"BCCPLEXWDT",

	"BPMPWDT",

	"SCEWDT",

	"SPEWDT",

	"APEWDT",

	"LCCPLEXWDT",

	"SENSOR",

	"AOTAG",

	"VFSENSOR",

	"MAINSWRST",

	"SC7",

	"HSM",

	"CSITE",

	"RCEWDT",

	"PVA0WDT",

	"PVA1WDT",

	"L1A_ASYNC",

	"BPMPBOOT",

	"FUSECRC",

};



static const struct tegra_wake_event tegra194_wake_events[] = {

	TEGRA_WAKE_GPIO("power", 29, 1, TEGRA194_AON_GPIO(EE, 4)),

	TEGRA_WAKE_IRQ("rtc", 73, 10),
@@ -2943,9 +2980,15 @@ static const struct tegra_pmc_soc tegra194_pmc_soc = { 
	.maybe_tz_only = false,

	.num_io_pads = ARRAY_SIZE(tegra194_io_pads),

	.io_pads = tegra194_io_pads,

	.regs = &tegra186_pmc_regs,

	.regs = &tegra194_pmc_regs,

	.init = NULL,

	.setup_irq_polarity = tegra186_pmc_setup_irq_polarity,

	.irq_set_wake = tegra186_pmc_irq_set_wake,

	.irq_set_type = tegra186_pmc_irq_set_type,

	.reset_sources = tegra194_reset_sources,

	.num_reset_sources = ARRAY_SIZE(tegra194_reset_sources),

	.reset_levels = tegra186_reset_levels,

	.num_reset_levels = ARRAY_SIZE(tegra186_reset_levels),

	.num_wake_events = ARRAY_SIZE(tegra194_wake_events),

	.wake_events = tegra194_wake_events,

};