]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
platform/x86: mlx-platform: Remove PSU EEPROM from MSN274x platform configuration
authorVadim Pasternak <vadimp@nvidia.com>
Wed, 25 Nov 2020 10:10:56 +0000 (12:10 +0200)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 20 Jan 2021 13:25:49 +0000 (14:25 +0100)
BugLink: https://bugs.launchpad.net/bugs/1910822
[ Upstream commit 912b341585e302ee44fc5a2733f7bcf505e2c86f ]

Remove PSU EEPROM configuration for systems class equipped with
Mellanox chip Spectrum and ATOM CPU - system types MSN274x. Till now
all the systems from this class used few types of power units, all
equipped with EEPROM device with address space two bytes. Thus, all
these devices have been handled by EEPROM driver "24c02".

There is a new requirement is to support power unit replacement by "off
the shelf" device, matching electrical required parameters. Such device
can be equipped with different EEPROM type, which could be one byte
address space addressing or even could be not equipped with EEPROM.
In such case "24c02" will not work.

Fixes: ef08e14a3 ("platform/x86: mlx-platform: Add support for new msn274x system type")
Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
Link: https://lore.kernel.org/r/20201125101056.174708-3-vadimp@nvidia.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
drivers/platform/x86/mlx-platform.c

index bd57d3bbaa432271e501805156a991de9296265e..4b3d94c4a939ae2acb53a5ec7ad0c3c68a805e5e 100644 (file)
@@ -442,15 +442,13 @@ static struct mlxreg_core_data mlxplat_mlxcpld_msn274x_psu_items_data[] = {
                .label = "psu1",
                .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET,
                .mask = BIT(0),
-               .hpdev.brdinfo = &mlxplat_mlxcpld_psu[0],
-               .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR,
+               .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
        },
        {
                .label = "psu2",
                .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET,
                .mask = BIT(1),
-               .hpdev.brdinfo = &mlxplat_mlxcpld_psu[1],
-               .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR,
+               .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
        },
 };