Commit e28a42f3 authored by Linaro CI's avatar Linaro CI

Merge remote-tracking branch 'msm8996-dt/tracking-qcomlt-msm8996-dt' into integration-linux-qcomlt

# Conflicts:
#	arch/arm64/boot/dts/qcom/msm8996.dtsi
parents abeb88f8 a2ac3835
......@@ -62,4 +62,56 @@
bias-disable;
};
};
hdmi_hpd_active: hdmi_hpd_active {
mux {
pins = "gpio34";
function = "hdmi_hot";
};
config {
pins = "gpio34";
bias-pull-down;
drive-strength = <16>;
};
};
hdmi_hpd_suspend: hdmi_hpd_suspend {
mux {
pins = "gpio34";
function = "hdmi_hot";
};
config {
pins = "gpio34";
bias-pull-down;
drive-strength = <2>;
};
};
hdmi_ddc_active: hdmi_ddc_active {
mux {
pins = "gpio32", "gpio33";
function = "hdmi_ddc";
};
config {
pins = "gpio32", "gpio33";
drive-strength = <2>;
bias-pull-up;
};
};
hdmi_ddc_suspend: hdmi_ddc_suspend {
mux {
pins = "gpio32", "gpio33";
function = "hdmi_ddc";
};
config {
pins = "gpio32", "gpio33";
drive-strength = <2>;
bias-pull-down;
};
};
};
......@@ -36,6 +36,15 @@
};
};
audio_mclk: clk_div1 {
pinconf {
pins = "gpio15";
function = "func1";
power-source = <PM8994_GPIO_S4>; // 1.8V
};
};
volume_up_gpio: pm8996_gpio2 {
pinconf {
pins = "gpio2";
......
......@@ -18,6 +18,8 @@
#include "apq8096-db820c-pmic-pins.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/sound/qcom,q6afe.h>
#include <dt-bindings/sound/qcom,q6asm.h>
/*
* GPIO name legend: proper name = the GPIO line is used as GPIO
......@@ -63,6 +65,7 @@
};
clocks {
compatible = "simple-bus";
divclk4: divclk4 {
compatible = "fixed-clock";
#clock-cells = <0>;
......@@ -72,6 +75,16 @@
pinctrl-names = "default";
pinctrl-0 = <&divclk4_pin_a>;
};
div1_mclk: divclk1 {
compatible = "gpio-gate-clock";
pinctrl-0 = <&audio_mclk>;
pinctrl-names = "default";
clocks = <&rpmcc RPM_SMD_DIV_CLK1>;
#clock-cells = <0>;
enable-gpios = <&pm8994_gpios 15 0>;
};
};
soc {
......@@ -452,6 +465,43 @@
perst-gpio = <&msmgpio 114 GPIO_ACTIVE_LOW>;
};
};
slim_msm: slim@91c0000 {
ngd@1 {
wcd9335: codec@1{
clock-names = "mclk", "slimbus";
clocks = <&div1_mclk>,
<&rpmcc RPM_SMD_BB_CLK1>;
};
};
};
mdss@900000 {
status = "okay";
mdp@901000 {
status = "okay";
};
hdmi-phy@9a0600 {
status = "okay";
vddio-supply = <&pm8994_l12>;
vcca-supply = <&pm8994_l28>;
#phy-cells = <0>;
};
hdmi-tx@9a0000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&hdmi_hpd_active &hdmi_ddc_active>;
pinctrl-1 = <&hdmi_hpd_suspend &hdmi_ddc_suspend>;
core-vdda-supply = <&pm8994_l12>;
core-vcc-supply = <&pm8994_s4>;
};
};
};
......@@ -639,3 +689,102 @@
};
};
};
&sound {
compatible = "qcom,apq8096-sndcard";
model = "DB820c";
audio-routing =
"RX_BIAS", "MCLK",
"MIC BIAS1", "MCLK",
"MIC BIAS2", "MCLK",
"MIC BIAS3", "MCLK",
"MIC BIAS4", "MCLK",
"AMIC1", "MIC BIAS2",
"MIC BIAS2", "Headset Mic",
"AMIC2", "MIC BIAS2",
"MIC BIAS2", "Headset Mic",
"AMIC3", "MIC BIAS2",
"MIC BIAS2", "ANCLeft Headset Mic",
"AMIC4", "MIC BIAS2",
"MIC BIAS2", "ANCRight Headset Mic",
"AMIC5", "MIC BIAS2",
"MIC BIAS2", "Analog Mic6",
"AMIC6", "MIC BIAS2",
"MIC BIAS2", "Analog Mic7",
"DMIC2", "MIC BIAS1",
"MIC BIAS1", "Digital Mic2",
"DMIC3", "MIC BIAS1",
"MIC BIAS1", "Digital Mic3",
"DMIC4", "MIC BIAS3",
"MIC BIAS3", "Digital Mic4",
"DMIC5", "MIC BIAS3",
"MIC BIAS3", "Digital Mic5",
"SpkrLeft IN", "SPK1 OUT",
"SpkrRight IN", "SPK2 OUT";
mm1-dai-link {
link-name = "MultiMedia1";
cpu {
sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>;
};
};
mm2-dai-link {
link-name = "MultiMedia2";
cpu {
sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA2>;
};
};
mm3-dai-link {
link-name = "MultiMedia3";
cpu {
sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA3>;
};
};
hdmi-dai-link {
link-name = "HDMI";
cpu {
sound-dai = <&q6afedai HDMI_RX>;
};
platform {
sound-dai = <&q6routing>;
};
codec {
sound-dai = <&hdmi 0>;
};
};
slim-dai-link {
link-name = "SLIM Playback";
cpu {
sound-dai = <&q6afedai SLIMBUS_6_RX>;
};
platform {
sound-dai = <&q6routing>;
};
codec {
sound-dai = <&wcd9335 6>;
};
};
slimcap-dai-link {
link-name = "SLIM Capture";
cpu {
sound-dai = <&q6afedai SLIMBUS_0_TX>;
};
platform {
sound-dai = <&q6routing>;
};
codec {
sound-dai = <&wcd9335 1>;
};
};
};
......@@ -13,6 +13,52 @@
&msmgpio {
wcd9xxx_intr {
wcd_intr_default: wcd_intr_default{
mux {
pins = "gpio54";
function = "gpio";
};
config {
pins = "gpio54";
drive-strength = <2>; /* 2 mA */
bias-pull-down; /* pull down */
input-enable;
};
};
};
cdc_reset_ctrl {
cdc_reset_sleep: cdc_reset_sleep {
mux {
pins = "gpio64";
function = "gpio";
};
config {
pins = "gpio64";
drive-strength = <16>;
bias-disable;
output-low;
};
};
cdc_reset_active:cdc_reset_active {
mux {
pins = "gpio64";
function = "gpio";
};
config {
pins = "gpio64";
drive-strength = <16>;
bias-pull-down;
output-high;
};
};
};
blsp1_spi0_default: blsp1_spi0_default {
pinmux {
function = "blsp_spi1";
......
This diff is collapsed.
......@@ -25,5 +25,19 @@
reg = <0x3 SPMI_USID>;
#address-cells = <1>;
#size-cells = <0>;
regulators {
compatible = "qcom,pmi8994-regulators";
#address-cells = <1>;
#size-cells = <1>;
pmi8994_s2: [email protected] {
reg = <0x1700 0x100>;
status = "ok";
regulator-min-microvolt = <400000>;
regulator-max-microvolt = <1015000>;
regulator-always-on;
};
};
};
};
Markdown is supported
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