diff options
| author | Sebastian Reichel <sebastian.reichel@collabora.com> | 2023-10-21 01:55:43 +0300 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.com> | 2023-10-21 01:55:43 +0300 |
| commit | e186bd1ac2f984f525b319924cfb0e197051ba47 (patch) | |
| tree | 2b78957a7ef7a98ea6664f067c5906784567648e /drivers/power/reset | |
| parent | afc88dfda013970bb1e214b331e99adca2f98312 (diff) | |
| parent | 8894b432548851f705f72ff135d3dcbd442a18d1 (diff) | |
| download | linux-e186bd1ac2f984f525b319924cfb0e197051ba47.tar.xz | |
Merge power-supply fixes for 6.6 cycle
Merge power-supply fixes for the 6.6 cycle, so that changes
to the vexpress driver apply cleanly.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power/reset')
| -rw-r--r-- | drivers/power/reset/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/power/reset/pwr-mlxbf.c | 2 | ||||
| -rw-r--r-- | drivers/power/reset/vexpress-poweroff.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig index b9733fa40276..fece990af4a7 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -300,7 +300,7 @@ config NVMEM_REBOOT_MODE config POWER_MLXBF tristate "Mellanox BlueField power handling driver" - depends on (GPIO_MLXBF2 && ACPI) + depends on (GPIO_MLXBF2 || GPIO_MLXBF3) && ACPI help This driver supports reset or low power mode handling for Mellanox BlueField. diff --git a/drivers/power/reset/pwr-mlxbf.c b/drivers/power/reset/pwr-mlxbf.c index 12dedf841a44..de35d24bb7ef 100644 --- a/drivers/power/reset/pwr-mlxbf.c +++ b/drivers/power/reset/pwr-mlxbf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0-only or BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause /* * Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. diff --git a/drivers/power/reset/vexpress-poweroff.c b/drivers/power/reset/vexpress-poweroff.c index 447ffdacddf9..17064d7b19f6 100644 --- a/drivers/power/reset/vexpress-poweroff.c +++ b/drivers/power/reset/vexpress-poweroff.c @@ -121,7 +121,7 @@ static int vexpress_reset_probe(struct platform_device *pdev) return PTR_ERR(regmap); dev_set_drvdata(&pdev->dev, regmap); - switch ((enum vexpress_reset_func)match->data) { + switch ((uintptr_t)match->data) { case FUNC_SHUTDOWN: vexpress_power_off_device = &pdev->dev; pm_power_off = vexpress_power_off; |