Skip to content
Snippets Groups Projects
Commit 88489ba6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes Ife562bd4,I01d64178,I96bce22b,I1545082e into kernel.qclinux.1.0.r1-rel 

* changes:
  QCLINUX: ASoC: qcm6490: Add support for QCS9075 RB8
  QCLINUX: arm64: dts: qcom: add audio support for qcs9075-rb8
  PENDING: arm64: dts: qcom: qcs9075: Add displayport device node
  QCLINUX: arm64: dts: qcom: qcs9075: Add UFS support for QCS9075 RB8
parents 57cd5278 4f1d07fd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
arch/arm64/boot/dts/qcom/qcs9075-addons-rb8.dts
+ 256
− 0
View file @ 88489ba6
......@@ -10,4 +10,260 @@
/ {
model = "Qualcomm Technologies, Inc. QCS9075 Addons RB8";
compatible = "qcom,qcs9075-addons-rb8", "qcom,qcs9075", "qcom,sa8775p";
sound {
compatible = "qcom,qcs9075-rb8-sndcard";
model = "qcs9075-rb8-snd-card";
clocks = <&q6prmcc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
<&q6prmcc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>;
clock-names = "macro", "dcodec";
pinctrl-names = "default";
pinctrl-0 = <&lpass_i2s1_data>, <&lpass_i2s1_ws>,
<&hs1_mi2s_data0>, <&mi2s_mclk>, <&hs1_mi2s_sclk>,
<&hs1_mi2s_data1>, <&hs1_mi2s_ws>, <&hs2_mi2s_data0>,
<&hs2_mi2s_data1>, <&hs2_mi2s_sck>,<&hs2_mi2s_ws>;
hs1-mi2s-playback-dai-link {
link-name = "MI2S-LPAIF_SDR-RX-SECONDARY";
cpu {
sound-dai = <&q6apmbedai TERTIARY_MI2S_RX>;
};
codec {
sound-dai = <&max98357a>;
};
};
hs2-mi2s-capture-dai-link {
link-name = "MI2S-LPAIF_SDR-TX-TERTIARY";
cpu {
sound-dai = <&q6apmbedai TERTIARY_MI2S_TX>;
};
codec {
sound-dai = <&dmic_codec>;
};
};
};
};
&lpass_tlmm {
lpass_i2s1_data: i2s1-data-state {
pins = "gpio8", "gpio9";
function = "i2s1_data";
drive-strength = <8>;
bias-disable;
};
lpass_i2s1_data_sleep: i2s1-data-sleep-state {
pins = "gpio8", "gpio9";
function = "i2s1_data";
drive-strength = <2>;
bias-pull-down;
input-enable;
};
lpass_i2s1_ws: i2s1-ws-state {
pins = "gpio7";
function = "i2s1_ws";
drive-strength = <8>;
output-high;
};
lpass_i2s1_ws_sleep: i2s1-ws-sleep-state {
pins = "gpio7";
function = "i2s1_ws";
drive-strength = <2>;
bias-pull-down;
input-enable;
};
};
&soc {
msm_stub_codec: msm-stub-codec {
compatible = "qcom,msm-stub-codec";
#sound-dai-cells = <1>;
};
max98357a: audio-codec-0 {
compatible = "maxim,max98357a";
#sound-dai-cells = <0>;
};
dmic_codec: dmic-codec {
compatible = "dmic-codec";
#sound-dai-cells = <0>;
num-channels = <1>;
};
spf_core_platform: spf-core-platform {
compatible = "qcom,spf-core-platform";
msm_audio_mem: msm-audio-mem {
compatible = "qcom,msm-audio-mem";
qcom,smmu-version = <2>;
qcom,smmu-enabled;
iommus = <&apps_smmu 0x3001 0x0>;
qcom,iommu-dma-addr-pool = <0x10000000 0x10000000>;
qcom,smmu-sid-mask = /bits/ 64 <0xf>;
dma-coherent;
};
msm_audio_mem_cma: msm-audio-mem-cma {
compatible = "qcom,msm-audio-mem";
memory-region = <&audio_cma_mem>;
};
};
};
&tlmm {
hs0_mi2s: hs0-mi2s-state {
pins = "gpio114", "gpio115", "gpio116", "gpio117";
function = "hs0_mi2s";
};
hs1_mi2s_data0: hs1-mi2s-data0-state {
pins = "gpio120";
function = "hs1_mi2s";
drive-strength = <8>;
bias-disable;
};
hs1_mi2s_data0_sleep: hs1-mi2s-data0-sleep-state {
pins = "gpio120";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
input-enable;
};
hs1_mi2s_data1: hs1-mi2s-data1-state {
pins = "gpio121";
function = "hs1_mi2s";
drive-strength = <8>;
bias-disable;
};
hs1_mi2s_data1_sleep: hs1-mi2s-data1-sleep-state {
pins = "gpio121";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
input-enable;
};
hs1_mi2s_sclk: hs1-mi2s-sclk-state {
pins = "gpio119";
function = "hs1_mi2s";
drive-strength = <8>;
bias-disable;
};
hs1_mi2s_sclk_sleep: hs1-mi2s-sclk-sleep-state {
pins = "gpio119";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
input-enable;
};
hs1_mi2s_ws: hs1-mi2s-ws-state {
pins = "gpio118";
function = "hs1_mi2s";
drive-strength = <8>;
bias-disable;
output-high;
};
hs1_mi2s_ws_sleep: hs1-mi2s-ws-sleep-state {
pins = "gpio118";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
input-enable;
};
hs2_mi2s_data0: hs2-mi2s-data0-state {
pins = "gpio124";
function = "hs2_mi2s";
drive-strength = <8>;
input-enable;
bias-disable;
};
hs2_mi2s_data0_sleep: hs2-mi2s-data0-sleep-state {
pins = "gpio124";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
input-enable;
};
hs2_mi2s_data1: hs2-mi2s-data1-state {
pins = "gpio125";
function = "hs2_mi2s";
drive-strength = <8>;
bias-disable;
};
hs2_mi2s_data1_sleep: hs2-mi2s-data1-sleep-state {
pins = "gpio125";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
input-enable;
};
hs2_mi2s_sck: hs2-mi2s-sck-state {
pins = "gpio122";
function = "hs2_mi2s";
drive-strength = <8>;
bias-disable;
output-high;
};
hs2_mi2s_sck_sleep: hs2-mi2s-sck-sleep-state {
pins = "gpio122";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
input-enable;
};
hs2_mi2s_ws: hs2-mi2s-ws-state {
pins = "gpio123";
function = "hs2_mi2s";
drive-strength = <8>;
bias-disable;
output-high;
};
hs2_mi2s_ws_sleep: hs2-mi2s-ws-sleep-state {
pins = "gpio123";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
input-enable;
};
mi2s_mclk: mi2s-mclk-state {
pins = "gpio105";
function = "mi2s_mclk0";
drive-strength = <8>;
bias-disable;
output-high;
};
mi2s_mclk_sleep: mi2s-mclk-sleep-state {
pins = "gpio105";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
input-enable;
};
};
arch/arm64/boot/dts/qcom/qcs9075-rb8.dts
+ 40
− 1
View file @ 88489ba6
......@@ -20,6 +20,7 @@ / {
aliases {
serial0 = &uart10;
serial1 = &uart17;
ufshc1 = &ufs_mem_hc;
};
chosen {
......@@ -407,6 +408,23 @@ &llcc {
status = "okay";
};
&mdss0 {
status = "okay";
};
&mdss0_dp0 {
status = "okay";
};
&mdss0_dp0_out {
data-lanes = <0 1 2 3>;
link-frequencies = /bits/ 64 <1620000000 2700000000 5400000000 8100000000>;
};
&mdss0_edp_phy {
status = "okay";
};
&pmm8654au_1_gpios {
gpio-line-names = "PMIC_C_ID0",
"PMIC_C_ID1",
......@@ -587,7 +605,11 @@ bt_bootstrap_default: bt_bootstrap_default {
};
/* FIXME: mdss0_dp0 is dependent on this so adding a dummy node for now */
dp_hot_plug_det: dp-hot-plug-det-state {};
dp_hot_plug_det: dp-hot-plug-det-state {
pins = "gpio101";
function = "edp0_hot";
bias-disable;
};
/* FIXME: mdss0_dp1 is dependent on this so adding a dummy node for now */
dp1_hot_plug_det: dp1-hot-plug-det-state {};
......@@ -825,6 +847,23 @@ &uart19 {
qcom,xfer-mode = <1>;
};
&ufs_mem_hc {
reset-gpios = <&tlmm 149 GPIO_ACTIVE_LOW>;
vcc-supply = <&vreg_l8a>;
vcc-max-microamp = <1100000>;
vccq-supply = <&vreg_l4c>;
vccq-max-microamp = <1200000>;
status = "okay";
};
&ufs_mem_phy {
vdda-phy-supply = <&vreg_l4a>;
vdda-pll-supply = <&vreg_l1c>;
status = "okay";
};
&usb_0 {
status = "okay";
};
......
sound/soc/qcom/Kconfig
+ 2
− 0
View file @ 88489ba6
......@@ -236,6 +236,8 @@ config SND_SOC_SC7280
config SND_SOC_QCM6490
tristate "SoC Machine driver for QCM6490 boards"
depends on I2C && SOUNDWIRE
select SND_SOC_MAX98357A
select SND_SOC_DMIC
select SND_SOC_QCOM_COMMON
select SND_SOC_LPASS_MACRO_COMMON
imply SND_SOC_LPASS_RX_MACRO
......
sound/soc/qcom/qcm6490.c
+ 5
− 0
View file @ 88489ba6
......@@ -359,6 +359,10 @@ static struct snd_soc_card snd_soc_qcs9100_data = {
.num_dapm_routes = ARRAY_SIZE(qcs9100_dapm_routes),
};
static struct snd_soc_card snd_soc_qcs9075_rb8_data = {
.name = "qcs9075-rb8",
};
static void qcm6490_add_be_ops(struct snd_soc_card *card)
{
struct snd_soc_dai_link *link;
......@@ -424,6 +428,7 @@ static const struct of_device_id snd_qcm6490_dt_match[] = {
{.compatible = "qcom,qcs6490-rb3gen2-vision-sndcard", .data = &qcs6490_rb3gen2_vision_data},
{.compatible = "qcom,qcs8300-sndcard", .data = &snd_soc_qcs8300_data},
{.compatible = "qcom,qcs9100-sndcard", .data = &snd_soc_qcs9100_data},
{.compatible = "qcom,qcs9075-rb8-sndcard", .data = &snd_soc_qcs9075_rb8_data},
{}
};
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment