leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pinctrl: qcom: sdm845: Provide ACPI support

Browse Source 
This patch provides basic support for booting with ACPI instead
of the currently supported Device Tree.  When doing so there are a
couple of differences which we need to taken into consideration.

Firstly, the SDM850 ACPI tables omit information pertaining to the
4 reserved GPIOs on the platform.  If Linux attempts to touch/
initialise any of these lines, the firmware will restart the
platform.

Secondly, when booting with ACPI, it is expected that the firmware
will set-up things like; Regulators, Clocks, Pin Functions, etc in
their ideal configuration.  Thus, the possible Pin Functions
available to this platform are not advertised when providing the
higher GPIOD/Pinctrl APIs with pin information.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Lee Jones 2019-06-10 09:42:09 +01:00 committed by Linus Walleij
parent 4c0efbfb26
commit a229105d7a
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pinctrl/qcom/Kconfig
View File

@ -168,7 +168,7 @@ config PINCTRL_SDM660
config PINCTRL_SDM845 config PINCTRL_SDM845
tristate "Qualcomm Technologies Inc SDM845 pin controller driver" tristate "Qualcomm Technologies Inc SDM845 pin controller driver"
depends on GPIOLIB && OF depends on GPIOLIB && (OF || ACPI)
select PINCTRL_MSM select PINCTRL_MSM
help help
This is the pinctrl, pinmux, pinconf and gpiolib driver for the This is the pinctrl, pinmux, pinconf and gpiolib driver for the

36
drivers/pinctrl/qcom/pinctrl-sdm845.c
View File

@ -3,6 +3,7 @@
* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
*/ */
#include <linux/acpi.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
@ -1277,6 +1278,10 @@ static const struct msm_pingroup sdm845_groups[] = {
UFS_RESET(ufs_reset, 0x99f000), UFS_RESET(ufs_reset, 0x99f000),
}; };
static const int sdm845_acpi_reserved_gpios[] = {
0, 1, 2, 3, 81, 82, 83, 84, -1
};
static const struct msm_pinctrl_soc_data sdm845_pinctrl = { static const struct msm_pinctrl_soc_data sdm845_pinctrl = {
.pins = sdm845_pins, .pins = sdm845_pins,
.npins = ARRAY_SIZE(sdm845_pins), .npins = ARRAY_SIZE(sdm845_pins),
@ -1287,11 +1292,39 @@ static const struct msm_pinctrl_soc_data sdm845_pinctrl = {
.ngpios = 150, .ngpios = 150,
}; };
static const struct msm_pinctrl_soc_data sdm845_acpi_pinctrl = {
.pins = sdm845_pins,
.npins = ARRAY_SIZE(sdm845_pins),
.groups = sdm845_groups,
.ngroups = ARRAY_SIZE(sdm845_groups),
.reserved_gpios = sdm845_acpi_reserved_gpios,
.ngpios = 150,
};
static int sdm845_pinctrl_probe(struct platform_device *pdev) static int sdm845_pinctrl_probe(struct platform_device *pdev)
{ {
return msm_pinctrl_probe(pdev, &sdm845_pinctrl); int ret;
if (pdev->dev.of_node) {
ret = msm_pinctrl_probe(pdev, &sdm845_pinctrl);
} else if (has_acpi_companion(&pdev->dev)) {
ret = msm_pinctrl_probe(pdev, &sdm845_acpi_pinctrl);
} else {
dev_err(&pdev->dev, "DT and ACPI disabled\n");
return -EINVAL;
} }
return ret;
}
#if CONFIG_ACPI
static const struct acpi_device_id sdm845_pinctrl_acpi_match[] = {
{ "QCOM0217"},
{ },
};
MODULE_DEVICE_TABLE(acpi, sdm845_pinctrl_acpi_match);
#endif
static const struct of_device_id sdm845_pinctrl_of_match[] = { static const struct of_device_id sdm845_pinctrl_of_match[] = {
{ .compatible = "qcom,sdm845-pinctrl", }, { .compatible = "qcom,sdm845-pinctrl", },
{ }, { },
@ -1302,6 +1335,7 @@ static struct platform_driver sdm845_pinctrl_driver = {
.name = "sdm845-pinctrl", .name = "sdm845-pinctrl",
.pm = &msm_pinctrl_dev_pm_ops, .pm = &msm_pinctrl_dev_pm_ops,
.of_match_table = sdm845_pinctrl_of_match, .of_match_table = sdm845_pinctrl_of_match,
.acpi_match_table = ACPI_PTR(sdm845_pinctrl_acpi_match),
}, },
.probe = sdm845_pinctrl_probe, .probe = sdm845_pinctrl_probe,
.remove = msm_pinctrl_remove, .remove = msm_pinctrl_remove,