github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 15:12:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Memory controller drivers for v6.15

Browse Source 
1. Minor cleanup in Nvidia Tegra20 EMC.
 2. Extend support for Mediatek MT8192 to match recommended by vendor and
    improve VENC hardware behavior during stress testing.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmfW4XIQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD1xs9EACJJY9c7ZOI4D1bcgQADePJfp+6Hl4Y8RZP
 O4yymcmRGj20cuqS2axJHY0QP+tAnrE133d02xu7Q1HYeqlWSrtPKLTibTRiwGXd
 gAyMMj9pSSPML1qlL1q5boCbYEifyOUp7XkTBm8N4dh3YN2wqIx8oM43xv08pOXn
 Nghs0JtwcnLwpOD+iRdM+luaONfuxFnwgeUgipUrTMb/ATrC59SaNiVyPJO6fvIi
 dIVaLA9NRcpmQSYTK6mrMn/VHX+F6Y1/I/Jb9ycCI/bGfksPsI51SQr+17NYC0tl
 4qV/ZEprWOq/Zf+SL0kghwhrkhrrlwmxfli1woI7/kjES8hjnl07FCjDGh5zkI6i
 vnDNlTuG1cWhx8RUGVXy4byXTsIdSetk78gGTP83Iuv+DfM4PcvDVP8dBXZVdgNY
 z/Y8JMa+mAbAk5R+qDcSDj3nsbVMZD0Ks1HPfN52RTsfQkCknOqx30ztdkwkY5XN
 sFvyM/mgf1+17oFMHVSjuKmROWYwN8o3FkPjeow8QH5eNjGx/T94+6Waw57r3XIE
 W4008Xl3lPN2AyQfKJCklJJnX4hCkV8eC/CGtsj/aI2b3QaTowJ3cedhyEuq1qnC
 cPUn6k9IX20uJT0SOIHYNMXO815Ur0o4y0CLofno5hu0E/HsxiTaakJMKMkh+dke
 1tEjB5Sk9A==
 =LpnA
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmfbPLUACgkQYKtH/8kJ
 Uid5+RAAxtt0vH12Eu3bLhUsZJPMkYCbu0uguWSA+BWq1Eb+e/r0LAWulmYOTgwx
 Hws0q4S+83DdGjVMOBTRsigaL0WqHGi/pIeXdXpsjo/Z2LENXWQXIcFHV33okasq
 hGkHoL6kDeZQZPHpjaroaTRkClk5DQP9SpDlh+ocGEtlJJu1H06U4BOEoPrPReRb
 LkdGFpsu8LN+v4bFzVCn7A/C4iTCy52SrjulwCp9AcvL5I74TzQHUunliO7DLI9t
 DExf6Akh2BnfEEw09pOBZN70W4emUxh929cmeeY5UVSAsmFthOIEbUmIHqVzJH2d
 cxrk+8yBxmo9oxiWuBceh1bq58xfmwG/dCRtNV44x3yMoaOLBoKvyB25XTaFWiFI
 vpjvR3EKfEAlSP+d3OfhWVElVkiEaXUmJRXX455Nk6lfZjlmFOXPGTBivzffWG02
 l2NErKwteM8KxLK9TmGCkpLf25Z+Bpw4PAXDf38DYBct0QE0PNU/c6f8CoRi/6Fx
 6CTAydN+ch6sFmkpnVdytl3h0JyHrluR+YRs0apvdzC0DWsu6JOH+aWmHgHV/6nO
 5rUtbh8dT3Y+Omih3wMOXunW1tMUJTqe0dWJeTVwlgJCPXr3uBnmL/7YF/W0Fgnu
 79XAjKIJcgN6YOtZtcDdTsW97udRLZ7fg8cGvIFDruQNSlK1+hA=
 =tHIB
 -----END PGP SIGNATURE-----

Merge tag 'memory-controller-drv-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into soc/drivers

Memory controller drivers for v6.15

1. Minor cleanup in Nvidia Tegra20 EMC.
2. Extend support for Mediatek MT8192 to match recommended by vendor and
   improve VENC hardware behavior during stress testing.

* tag 'memory-controller-drv-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
  memory: mtk-smi: Add ostd setting for mt8192
  memory: tegra20-emc: Drop redundant platform_get_irq() error printk

Link: https://lore.kernel.org/r/20250316143503.17620-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2025-03-19 22:52:52 +01:00
commit 3603d920b2
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/memory/mtk-smi.c
View File

@ -332,6 +332,38 @@ static const u8 mtk_smi_larb_mt8188_ostd[][SMI_LARB_PORT_NR_MAX] = {
[25] = {0x01},
};
static const u8 mtk_smi_larb_mt8192_ostd[][SMI_LARB_PORT_NR_MAX] = {
[0] = {0x2, 0x2, 0x28, 0xa, 0xc, 0x28,},
[1] = {0x2, 0x2, 0x18, 0x18, 0x18, 0xa, 0xc, 0x28,},
[2] = {0x5, 0x5, 0x5, 0x5, 0x1,},
[3] = {},
[4] = {0x28, 0x19, 0xb, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x4, 0x1,},
[5] = {0x1, 0x1, 0x4, 0x1, 0x1, 0x1, 0x1, 0x16,},
[6] = {},
[7] = {0x1, 0x3, 0x2, 0x1, 0x1, 0x5, 0x2, 0x12, 0x13, 0x4, 0x4, 0x1,
0x4, 0x2, 0x1,},
[8] = {},
[9] = {0xa, 0x7, 0xf, 0x8, 0x1, 0x8, 0x9, 0x3, 0x3, 0x6, 0x7, 0x4,
0xa, 0x3, 0x4, 0xe, 0x1, 0x7, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1,
0x1, 0x1, 0x1, 0x1, 0x1,},
[10] = {},
[11] = {0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1,
0x1, 0x1, 0x1, 0xe, 0x1, 0x7, 0x8, 0x7, 0x7, 0x1, 0x6, 0x2,
0xf, 0x8, 0x1, 0x1, 0x1,},
[12] = {},
[13] = {0x2, 0xc, 0xc, 0xe, 0x6, 0x6, 0x6, 0x6, 0x6, 0x12, 0x6, 0x28,
0x2, 0xc, 0xc, 0x28, 0x12, 0x6,},
[14] = {},
[15] = {0x28, 0x14, 0x2, 0xc, 0x18, 0x4, 0x28, 0x14, 0x4, 0x4, 0x4, 0x2,
0x4, 0x2, 0x8, 0x4, 0x4,},
[16] = {0x28, 0x14, 0x2, 0xc, 0x18, 0x4, 0x28, 0x14, 0x4, 0x4, 0x4, 0x2,
0x4, 0x2, 0x8, 0x4, 0x4,},
[17] = {0x28, 0x14, 0x2, 0xc, 0x18, 0x4, 0x28, 0x14, 0x4, 0x4, 0x4, 0x2,
0x4, 0x2, 0x8, 0x4, 0x4,},
[18] = {0x2, 0x2, 0x4, 0x2,},
[19] = {0x9, 0x9, 0x5, 0x5, 0x1, 0x1,},
};
static const u8 mtk_smi_larb_mt8195_ostd[][SMI_LARB_PORT_NR_MAX] = {
[0] = {0x0a, 0xc, 0x22, 0x22, 0x01, 0x0a,}, /* larb0 */
[1] = {0x0a, 0xc, 0x22, 0x22, 0x01, 0x0a,}, /* larb1 */
@ -427,6 +459,7 @@ static const struct mtk_smi_larb_gen mtk_smi_larb_mt8188 = {
static const struct mtk_smi_larb_gen mtk_smi_larb_mt8192 = {
.config_port = mtk_smi_larb_config_port_gen2_general,
.ostd = mtk_smi_larb_mt8192_ostd,
};
static const struct mtk_smi_larb_gen mtk_smi_larb_mt8195 = {

4
drivers/memory/tegra/tegra20-emc.c
View File

@ -1191,10 +1191,8 @@ static int tegra_emc_probe(struct platform_device *pdev)
int irq, err;
irq = platform_get_irq(pdev, 0);
if (irq < 0) {
dev_err(&pdev->dev, "please update your device tree\n");
if (irq < 0)
return irq;
}
emc = devm_kzalloc(&pdev->dev, sizeof(*emc), GFP_KERNEL);
if (!emc)