Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions arch/arm64/configs/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,7 @@ CONFIG_PINCTRL_SM8750=y
CONFIG_PINCTRL_X1E80100=y
CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
CONFIG_PINCTRL_LPASS_LPI=m
CONFIG_PINCTRL_QCS615_LPASS_LPI=m
CONFIG_PINCTRL_SC7280_LPASS_LPI=m
CONFIG_PINCTRL_SM6115_LPASS_LPI=m
CONFIG_PINCTRL_SM8250_LPASS_LPI=m
Expand Down
10 changes: 10 additions & 0 deletions drivers/pinctrl/qcom/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,16 @@ config PINCTRL_LPASS_LPI
Qualcomm Technologies Inc LPASS (Low Power Audio SubSystem) LPI
(Low Power Island) found on the Qualcomm Technologies Inc SoCs.

config PINCTRL_QCS615_LPASS_LPI
tristate "Qualcomm Technologies Inc QCS615 LPASS LPI pin controller driver"
depends on ARM64 || COMPILE_TEST
depends on PINCTRL_LPASS_LPI
help
This is the pinctrl, pinmux, pinconf and gpiolib driver for the
Qualcomm Technologies Inc LPASS (Low Power Audio SubSystem) LPI
(Low Power Island) found on the Qualcomm Technologies Inc QCS615
platform.

config PINCTRL_SC7280_LPASS_LPI
tristate "Qualcomm Technologies Inc SC7280 and SM8350 LPASS LPI pin controller driver"
depends on ARM64 || COMPILE_TEST
Expand Down
1 change: 1 addition & 0 deletions drivers/pinctrl/qcom/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ obj-$(CONFIG_PINCTRL_MSM8998) += pinctrl-msm8998.o
obj-$(CONFIG_PINCTRL_QCM2290) += pinctrl-qcm2290.o
obj-$(CONFIG_PINCTRL_QCS404) += pinctrl-qcs404.o
obj-$(CONFIG_PINCTRL_QCS615) += pinctrl-qcs615.o
obj-$(CONFIG_PINCTRL_QCS615_LPASS_LPI) += pinctrl-qcs615-lpass-lpi.o
obj-$(CONFIG_PINCTRL_QCS8300) += pinctrl-qcs8300.o
obj-$(CONFIG_PINCTRL_QDF2XXX) += pinctrl-qdf2xxx.o
obj-$(CONFIG_PINCTRL_MDM9607) += pinctrl-mdm9607.o
Expand Down
185 changes: 185 additions & 0 deletions drivers/pinctrl/qcom/pinctrl-qcs615-lpass-lpi.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
* ALSA SoC platform-machine driver for QTi LPASS
*/

#include <linux/gpio/driver.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/pm_clock.h>
#include <linux/pm_runtime.h>

#include "pinctrl-lpass-lpi.h"

enum lpass_lpi_functions {
LPI_MUX_i2s1_clk,
LPI_MUX_i2s1_ws,
LPI_MUX_i2s1_data,
LPI_MUX_spkr_i2s_mclk_a,
LPI_MUX_dmic1_clk,
LPI_MUX_dmic1_data,
LPI_MUX_dmic2_clk,
LPI_MUX_dmic2_data,
LPI_MUX_gpio,
LPI_MUX__,
};

static int gpio8_pins[] = { 8 };
static int gpio9_pins[] = { 9 };
static int gpio10_pins[] = { 10 };
static int gpio11_pins[] = { 11 };
static int gpio19_pins[] = { 19 };
static int gpio26_pins[] = { 26 };
static int gpio27_pins[] = { 27 };
static int gpio28_pins[] = { 28 };
static int gpio29_pins[] = { 29 };
static int gpio0_pins[] = { 0 };
static int gpio1_pins[] = { 1 };
static int gpio2_pins[] = { 2 };
static int gpio3_pins[] = { 3 };
static int gpio4_pins[] = { 4 };
static int gpio5_pins[] = { 5 };
static int gpio6_pins[] = { 6 };
static int gpio7_pins[] = { 7 };
static int gpio12_pins[] = { 12 };
static int gpio13_pins[] = { 13 };
static int gpio14_pins[] = { 14 };
static int gpio15_pins[] = { 15 };
static int gpio16_pins[] = { 16 };
static int gpio17_pins[] = { 17 };
static int gpio18_pins[] = { 18 };
static int gpio20_pins[] = { 20 };
static int gpio21_pins[] = { 21 };
static int gpio22_pins[] = { 22 };
static int gpio23_pins[] = { 23 };
static int gpio24_pins[] = { 24 };
static int gpio25_pins[] = { 25 };
static int gpio30_pins[] = { 30 };
static int gpio31_pins[] = { 31 };

static const struct pinctrl_pin_desc qcs615_lpi_pins[] = {
PINCTRL_PIN(0, "gpio0"),
PINCTRL_PIN(1, "gpio1"),
PINCTRL_PIN(2, "gpio2"),
PINCTRL_PIN(3, "gpio3"),
PINCTRL_PIN(4, "gpio4"),
PINCTRL_PIN(5, "gpio5"),
PINCTRL_PIN(6, "gpio6"),
PINCTRL_PIN(7, "gpio7"),
PINCTRL_PIN(8, "gpio8"),
PINCTRL_PIN(9, "gpio9"),
PINCTRL_PIN(10, "gpio10"),
PINCTRL_PIN(11, "gpio11"),
PINCTRL_PIN(12, "gpio12"),
PINCTRL_PIN(13, "gpio13"),
PINCTRL_PIN(14, "gpio14"),
PINCTRL_PIN(15, "gpio15"),
PINCTRL_PIN(16, "gpio16"),
PINCTRL_PIN(17, "gpio17"),
PINCTRL_PIN(18, "gpio18"),
PINCTRL_PIN(19, "gpio19"),
PINCTRL_PIN(20, "gpio20"),
PINCTRL_PIN(21, "gpio21"),
PINCTRL_PIN(22, "gpio22"),
PINCTRL_PIN(23, "gpio23"),
PINCTRL_PIN(24, "gpio24"),
PINCTRL_PIN(25, "gpio25"),
PINCTRL_PIN(26, "gpio26"),
PINCTRL_PIN(27, "gpio27"),
PINCTRL_PIN(28, "gpio28"),
PINCTRL_PIN(29, "gpio29"),
PINCTRL_PIN(30, "gpio30"),
PINCTRL_PIN(31, "gpio31"),
};

static const char * const i2s1_clk_groups[] = { "gpio8" };
static const char * const i2s1_ws_groups[] = { "gpio9" };
static const char * const i2s1_data_groups[] = { "gpio10", "gpio11" };
static const char * const spkr_i2s_mclk_a_groups[] = { "gpio19" };
static const char * const dmic1_clk_groups[] = { "gpio26" };
static const char * const dmic1_data_groups[] = { "gpio27" };
static const char * const dmic2_clk_groups[] = { "gpio28" };
static const char * const dmic2_data_groups[] = { "gpio29" };

static const struct lpi_pingroup qcs615_groups[] = {
LPI_PINGROUP(0, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(1, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(2, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(3, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(4, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(5, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(6, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(7, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(8, LPI_NO_SLEW, _, _, i2s1_clk, _),
LPI_PINGROUP(9, LPI_NO_SLEW, _, _, i2s1_ws, _),
LPI_PINGROUP(10, LPI_NO_SLEW, _, _, _, i2s1_data),
LPI_PINGROUP(11, LPI_NO_SLEW, _, i2s1_data, _, _),
LPI_PINGROUP(12, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(13, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(14, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(15, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(16, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(17, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(18, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(19, LPI_NO_SLEW, spkr_i2s_mclk_a, _, _, _),
LPI_PINGROUP(20, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(21, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(22, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(23, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(24, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(25, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(26, LPI_NO_SLEW, dmic1_clk, _, _, _),
LPI_PINGROUP(27, LPI_NO_SLEW, dmic1_data, _, _, _),
LPI_PINGROUP(28, LPI_NO_SLEW, dmic2_clk, _, _, _),
LPI_PINGROUP(29, LPI_NO_SLEW, dmic2_data, _, _, _),
LPI_PINGROUP(30, LPI_NO_SLEW, _, _, _, _),
LPI_PINGROUP(31, LPI_NO_SLEW, _, _, _, _),
};

static const struct lpi_function qcs615_functions[] = {
LPI_FUNCTION(i2s1_clk),
LPI_FUNCTION(i2s1_ws),
LPI_FUNCTION(i2s1_data),
LPI_FUNCTION(spkr_i2s_mclk_a),
LPI_FUNCTION(dmic1_clk),
LPI_FUNCTION(dmic1_data),
LPI_FUNCTION(dmic2_clk),
LPI_FUNCTION(dmic2_data),
};

static const struct lpi_pinctrl_variant_data qcs615_lpi_data = {
.pins = qcs615_lpi_pins,
.npins = ARRAY_SIZE(qcs615_lpi_pins),
.groups = qcs615_groups,
.ngroups = ARRAY_SIZE(qcs615_groups),
.functions = qcs615_functions,
.nfunctions = ARRAY_SIZE(qcs615_functions),
};

static const struct of_device_id lpi_pinctrl_of_match[] = {
{
.compatible = "qcom,qcs615-lpass-lpi-pinctrl",
.data = &qcs615_lpi_data,
},
{ }
};
MODULE_DEVICE_TABLE(of, lpi_pinctrl_of_match);

static const struct dev_pm_ops lpi_pinctrl_pm_ops = {
RUNTIME_PM_OPS(pm_clk_suspend, pm_clk_resume, NULL)
};

static struct platform_driver lpi_pinctrl_driver = {
.driver = {
.name = "qcom-qcs615-lpass-lpi-pinctrl",
.of_match_table = lpi_pinctrl_of_match,
.pm = pm_ptr(&lpi_pinctrl_pm_ops),
},
.probe = lpi_pinctrl_probe,
.remove = lpi_pinctrl_remove,
};

module_platform_driver(lpi_pinctrl_driver);
MODULE_DESCRIPTION("QTI QCS615 LPI GPIO pin control driver");
MODULE_LICENSE("GPL");
1 change: 1 addition & 0 deletions sound/soc/qcom/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ config SND_SOC_SC8280XP
depends on QCOM_APR && SOUNDWIRE
depends on COMMON_CLK
select SND_SOC_QDSP6
select SND_SOC_MAX98090
select SND_SOC_QCOM_COMMON
select SND_SOC_QCOM_SDW
help
Expand Down
46 changes: 46 additions & 0 deletions sound/soc/qcom/sc8280xp.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,39 @@ static const struct snd_kcontrol_new shikra_iqs_controls[] = {
SOC_DAPM_PIN_SWITCH("Speaker"),
};

static const struct snd_soc_dapm_widget talos_lyra_dapm_widgets[] = {
SND_SOC_DAPM_HP("Headphone", NULL),
SND_SOC_DAPM_MIC("Headset Mic12", NULL),
SND_SOC_DAPM_MIC("Headset Mic56", NULL),
SND_SOC_DAPM_MIC("Headset Mic34", NULL),
SND_SOC_DAPM_SPK("Receiver", NULL),
SND_SOC_DAPM_SPK("Speaker", NULL),
};

static const struct snd_soc_dapm_route talos_lyra_dapm_routes[] = {
{"IN12", NULL, "Headset Mic12"},
{"Headset Mic12", NULL, "MICBIAS"},
{"IN34", NULL, "Headset Mic34"},
{"Headset Mic34", NULL, "MICBIAS"},
{"IN56", NULL, "Headset Mic56"},
{"Headset Mic56", NULL, "MICBIAS"},
{"Headphone", NULL, "HPL"},
{"Headphone", NULL, "HPR"},
{"Receiver", NULL, "RCVL"},
{"Receiver", NULL, "RCVR"},
{"Speaker", NULL, "SPKL"},
{"Speaker", NULL, "SPKR"},
};

static const struct snd_kcontrol_new talos_lyra_max98090_controls[] = {
SOC_DAPM_PIN_SWITCH("Headset Mic12"),
SOC_DAPM_PIN_SWITCH("Headset Mic34"),
SOC_DAPM_PIN_SWITCH("Headset Mic56"),
SOC_DAPM_PIN_SWITCH("Headphone"),
SOC_DAPM_PIN_SWITCH("Receiver"),
SOC_DAPM_PIN_SWITCH("Speaker"),
};

struct snd_soc_common {
const char *driver_name;
const struct snd_soc_dapm_widget *dapm_widgets;
Expand Down Expand Up @@ -384,6 +417,18 @@ static struct snd_soc_common qcs615_priv_data = {
.num_dapm_widgets = ARRAY_SIZE(sc8280xp_dapm_widgets),
};

static struct snd_soc_common talos_lyra_priv_data = {
.driver_name = "qcs615",
.dapm_widgets = talos_lyra_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(talos_lyra_dapm_widgets),
.dapm_routes = talos_lyra_dapm_routes,
.num_dapm_routes = ARRAY_SIZE(talos_lyra_dapm_routes),
.controls = talos_lyra_max98090_controls,
.num_controls = ARRAY_SIZE(talos_lyra_max98090_controls),
.codec_dai_fmt = SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_BC_FC,
.codec_sysclk_set = true,
};

static struct snd_soc_common qcm6490_priv_data = {
.driver_name = "qcm6490",
.dapm_widgets = sc8280xp_dapm_widgets,
Expand Down Expand Up @@ -463,6 +508,7 @@ static struct snd_soc_common sm8750_priv_data = {
static const struct of_device_id snd_sc8280xp_dt_match[] = {
{.compatible = "qcom,qcm6490-idp-sndcard", .data = &qcm6490_priv_data},
{.compatible = "qcom,qcs615-sndcard", .data = &qcs615_priv_data},
{.compatible = "qcom,talos-lyra-sndcard", .data = &talos_lyra_priv_data},
{.compatible = "qcom,qcs6490-rb3gen2-sndcard", .data = &qcs6490_priv_data},
{.compatible = "qcom,qcs8275-sndcard", .data = &qcs8275_priv_data},
{.compatible = "qcom,qcs9075-sndcard", .data = &qcs9100_priv_data},
Expand Down