Skip to content

Commit 68edb53

Browse files
committed
Merge tag 'tegra-for-5.19-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/drivers
soc/tegra: Changes for v5.19-rc1 This set of changes adds nvmem cell lookup entries for Tegra194 that are used to read calibration data from the SoC fuses, and updates the reset sources for Tegra234. Other than that, included is a minor build fix for a missing dependency that can be encountered very rarely in random config builds. Lastly some kerneldoc comments are added to avoid build warnings. * tag 'tegra-for-5.19-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: soc/tegra: pmc: Document core domain fields soc/tegra: pmc: Select REGMAP soc/tegra: pmc: Update Tegra234 reset sources soc/tegra: fuse: Add nvmem cell lookup entries for Tegra194 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 819ed6f + d3a20dc commit 68edb53

File tree

4 files changed

+48
-13
lines changed

4 files changed

+48
-13
lines changed

drivers/soc/tegra/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ config SOC_TEGRA_PMC
146146
select GENERIC_PINCONF
147147
select PM_OPP
148148
select PM_GENERIC_DOMAINS
149+
select REGMAP
149150

150151
config SOC_TEGRA_POWERGATE_BPMP
151152
def_bool y

drivers/soc/tegra/fuse/fuse-tegra.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-only
22
/*
3-
* Copyright (c) 2013-2021, NVIDIA CORPORATION. All rights reserved.
3+
* Copyright (c) 2013-2022, NVIDIA CORPORATION. All rights reserved.
44
*/
55

66
#include <linux/clk.h>
@@ -162,7 +162,7 @@ static const struct nvmem_cell_info tegra_fuse_cells[] = {
162162
.bit_offset = 0,
163163
.nbits = 32,
164164
}, {
165-
.name = "gcplex-config-fuse",
165+
.name = "gpu-gcplex-config-fuse",
166166
.offset = 0x1c8,
167167
.bytes = 4,
168168
.bit_offset = 0,
@@ -186,13 +186,13 @@ static const struct nvmem_cell_info tegra_fuse_cells[] = {
186186
.bit_offset = 0,
187187
.nbits = 32,
188188
}, {
189-
.name = "pdi0",
189+
.name = "gpu-pdi0",
190190
.offset = 0x300,
191191
.bytes = 4,
192192
.bit_offset = 0,
193193
.nbits = 32,
194194
}, {
195-
.name = "pdi1",
195+
.name = "gpu-pdi1",
196196
.offset = 0x304,
197197
.bytes = 4,
198198
.bit_offset = 0,

drivers/soc/tegra/fuse/fuse-tegra30.c

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-only
22
/*
3-
* Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved.
3+
* Copyright (c) 2013-2022, NVIDIA CORPORATION. All rights reserved.
44
*/
55

66
#include <linux/device.h>
@@ -344,6 +344,21 @@ static const struct nvmem_cell_lookup tegra194_fuse_lookups[] = {
344344
.cell_name = "xusb-pad-calibration-ext",
345345
.dev_id = "3520000.padctl",
346346
.con_id = "calibration-ext",
347+
}, {
348+
.nvmem_name = "fuse",
349+
.cell_name = "gpu-gcplex-config-fuse",
350+
.dev_id = "17000000.gpu",
351+
.con_id = "gcplex-config-fuse",
352+
}, {
353+
.nvmem_name = "fuse",
354+
.cell_name = "gpu-pdi0",
355+
.dev_id = "17000000.gpu",
356+
.con_id = "pdi0",
357+
}, {
358+
.nvmem_name = "fuse",
359+
.cell_name = "gpu-pdi1",
360+
.dev_id = "17000000.gpu",
361+
.con_id = "pdi1",
347362
},
348363
};
349364

drivers/soc/tegra/pmc.c

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,8 @@ struct tegra_pmc_soc {
394394
* @domain: IRQ domain provided by the PMC
395395
* @irq: chip implementation for the IRQ domain
396396
* @clk_nb: pclk clock changes handler
397+
* @core_domain_state_synced: flag marking the core domain's state as synced
398+
* @core_domain_registered: flag marking the core domain as registered
397399
*/
398400
struct tegra_pmc {
399401
struct device *dev;
@@ -3766,27 +3768,44 @@ static const struct tegra_pmc_regs tegra234_pmc_regs = {
37663768
};
37673769

37683770
static const char * const tegra234_reset_sources[] = {
3769-
"SYS_RESET_N",
3771+
"SYS_RESET_N", /* 0x0 */
37703772
"AOWDT",
37713773
"BCCPLEXWDT",
37723774
"BPMPWDT",
37733775
"SCEWDT",
37743776
"SPEWDT",
37753777
"APEWDT",
37763778
"LCCPLEXWDT",
3777-
"SENSOR",
3778-
"AOTAG",
3779-
"VFSENSOR",
3779+
"SENSOR", /* 0x8 */
3780+
NULL,
3781+
NULL,
37803782
"MAINSWRST",
37813783
"SC7",
37823784
"HSM",
3783-
"CSITE",
3785+
NULL,
37843786
"RCEWDT",
3785-
"PVA0WDT",
3786-
"PVA1WDT",
3787-
"L1A_ASYNC",
3787+
NULL, /* 0x10 */
3788+
NULL,
3789+
NULL,
37883790
"BPMPBOOT",
37893791
"FUSECRC",
3792+
"DCEWDT",
3793+
"PSCWDT",
3794+
"PSC",
3795+
"CSITE_SW", /* 0x18 */
3796+
"POD",
3797+
"SCPM",
3798+
"VREFRO_POWERBAD",
3799+
"VMON",
3800+
"FMON",
3801+
"FSI_R5WDT",
3802+
"FSI_THERM",
3803+
"FSI_R52C0WDT", /* 0x20 */
3804+
"FSI_R52C1WDT",
3805+
"FSI_R52C2WDT",
3806+
"FSI_R52C3WDT",
3807+
"FSI_FMON",
3808+
"FSI_VMON", /* 0x25 */
37903809
};
37913810

37923811
static const struct tegra_wake_event tegra234_wake_events[] = {

0 commit comments

Comments
 (0)