diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-11-20 01:55:53 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-11-20 01:56:06 -0800 |
| commit | 7b2d00b22060031a2fc597c1c654e07a6390d164 (patch) | |
| tree | fb28075a38be75353a5e0b21649d0d84d3ee579e | |
| parent | 9b026ee9e6fc37a3d9b457147622d97daa686e87 (diff) | |
| parent | 29e5b64a5060815716cab8b97f9af35f168848dd (diff) | |
Merge "arm64: dts: qcs405: update i2s gpio functions" into kernel.lnx.4.14.r12-relLE.UM.3.3.1.r1-05300-qcs405.0
| -rw-r--r-- | arch/arm64/boot/dts/qcom/qcs405-pinctrl.dtsi | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/arch/arm64/boot/dts/qcom/qcs405-pinctrl.dtsi b/arch/arm64/boot/dts/qcom/qcs405-pinctrl.dtsi index c8e05ba9cca4..f2cfb87f6d8d 100644 --- a/arch/arm64/boot/dts/qcom/qcs405-pinctrl.dtsi +++ b/arch/arm64/boot/dts/qcom/qcs405-pinctrl.dtsi @@ -1577,7 +1577,7 @@ pri_mi2s_sck_sleep: pri_mi2s_sck_sleep { mux { pins = "gpio87"; - function = "i2s_1"; + function = "i2s_1_sck"; }; config { @@ -1591,7 +1591,7 @@ pri_mi2s_sck_active: pri_mi2s_sck_active { mux { pins = "gpio87"; - function = "i2s_1"; + function = "i2s_1_sck"; }; config { @@ -1607,7 +1607,7 @@ pri_mi2s_ws_sleep: pri_mi2s_ws_sleep { mux { pins = "gpio88"; - function = "i2s_1"; + function = "i2s_1_ws"; }; config { @@ -1621,7 +1621,7 @@ pri_mi2s_ws_active: pri_mi2s_ws_active { mux { pins = "gpio88"; - function = "i2s_1"; + function = "i2s_1_ws"; }; config { @@ -1637,7 +1637,7 @@ pri_mi2s_sd0_sleep: pri_mi2s_sd0_sleep { mux { pins = "gpio89"; - function = "i2s_1"; + function = "i2s_1_data0"; }; config { @@ -1651,7 +1651,7 @@ pri_mi2s_sd0_active: pri_mi2s_sd0_active { mux { pins = "gpio89"; - function = "i2s_1"; + function = "i2s_1_data0"; }; config { @@ -1667,7 +1667,7 @@ pri_mi2s_sd1_sleep: pri_mi2s_sd1_sleep { mux { pins = "gpio90"; - function = "i2s_1"; + function = "i2s_1_data1"; }; config { @@ -1681,7 +1681,7 @@ pri_mi2s_sd1_active: pri_mi2s_sd1_active { mux { pins = "gpio90"; - function = "i2s_1"; + function = "i2s_1_data1"; }; config { @@ -1696,7 +1696,7 @@ pri_mi2s_sd2_sleep: pri_mi2s_sd2_sleep { mux { pins = "gpio91"; - function = "i2s_1"; + function = "i2s_1_data2"; }; config { @@ -1710,7 +1710,7 @@ pri_mi2s_sd2_active: pri_mi2s_sd2_active { mux { pins = "gpio91"; - function = "i2s_1"; + function = "i2s_1_data2"; }; config { @@ -1726,7 +1726,7 @@ pri_mi2s_sd3_sleep: pri_mi2s_sd3_sleep { mux { pins = "gpio92"; - function = "i2s_1"; + function = "i2s_1_data3"; }; config { @@ -1740,7 +1740,7 @@ pri_mi2s_sd3_active: pri_mi2s_sd3_active { mux { pins = "gpio92"; - function = "i2s_1"; + function = "i2s_1_data3"; }; config { @@ -2263,7 +2263,7 @@ quat_mi2s_sck_sleep: quat_mi2s_sck_sleep { mux { pins = "gpio110"; - function = "i2s_4"; + function = "i2s_4_sck"; }; config { @@ -2277,7 +2277,7 @@ quat_mi2s_sck_active: quat_mi2s_sck_active { mux { pins = "gpio110"; - function = "i2s_4"; + function = "i2s_4_sck"; }; config { @@ -2292,7 +2292,7 @@ quat_mi2s_ws_sleep: quat_mi2s_ws_sleep { mux { pins = "gpio111"; - function = "i2s_4"; + function = "i2s_4_ws"; }; config { @@ -2306,7 +2306,7 @@ quat_mi2s_ws_active: quat_mi2s_ws_active { mux { pins = "gpio111"; - function = "i2s_4"; + function = "i2s_4_ws"; }; config { @@ -2321,7 +2321,7 @@ quat_mi2s_sd0_sleep: quat_mi2s_sd0_sleep { mux { pins = "gpio112"; - function = "i2s_4"; + function = "i2s_4_data0"; }; config { @@ -2335,7 +2335,7 @@ quat_mi2s_sd0_active: quat_mi2s_sd0_active { mux { pins = "gpio112"; - function = "i2s_4"; + function = "i2s_4_data0"; }; config { @@ -2350,7 +2350,7 @@ quat_mi2s_sd1_sleep: quat_mi2s_sd1_sleep { mux { pins = "gpio113"; - function = "i2s_4"; + function = "i2s_4_data1"; }; config { @@ -2364,7 +2364,7 @@ quat_mi2s_sd1_active: quat_mi2s_sd1_active { mux { pins = "gpio113"; - function = "i2s_4"; + function = "i2s_4_data1"; }; config { @@ -2378,7 +2378,7 @@ quat_mi2s_sd2_sleep: quat_mi2s_sd2_sleep { mux { pins = "gpio114"; - function = "i2s_4"; + function = "i2s_4_data2"; }; config { @@ -2392,7 +2392,7 @@ quat_mi2s_sd2_active: quat_mi2s_sd2_active { mux { pins = "gpio114"; - function = "i2s_4"; + function = "i2s_4_data2"; }; config { @@ -2407,7 +2407,7 @@ quat_mi2s_sd3_sleep: quat_mi2s_sd3_sleep { mux { pins = "gpio115"; - function = "i2s_4"; + function = "i2s_4_data3"; }; config { @@ -2421,7 +2421,7 @@ quat_mi2s_sd3_active: quat_mi2s_sd3_active { mux { pins = "gpio115"; - function = "i2s_4"; + function = "i2s_4_data3"; }; config { |