Commit 29c5cb64 authored by Douglas Anderson's avatar Douglas Anderson Committed by Bjorn Andersson

arm64: dts: qcom: sc7180: Fix I2C/UART numbers 2, 4, 7, and 9

Commit f4a73f5e ("pinctrl: qcom: sc7180: Add new qup functions")
has landed which means that we absolutely need to use the proper names
for the pinmuxing for I2C/UART numbers 2, 4, 7, and 9.  Let's do it.

For reference:
- If you get only one of this commit and the pinctrl commit then none
  of I2C/UART 2, 4, 7, and 9 will work.
- If you get neither of these commits then I2C 2, 4, 7, and 9 will
  work but not UART.

...but despite the above it should be fine for this commit to land in
the Qualcomm tree because sc7180.dtsi only exists there (it hasn't
made it to mainline).
Reviewed-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Reviewed-by: default avatarRajendra Nayak <rnayak@codeaurora.org>
Fixes: ba3fc649 ("arm64: dts: sc7180: Add qupv3_0 and qupv3_1")
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20191217130352.1.Id8562de45e8441cac34699047e25e7424281e9d4@changeidSigned-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 28d647fd
......@@ -708,7 +708,7 @@ pinmux {
qup_i2c2_default: qup-i2c2-default {
pinmux {
pins = "gpio15", "gpio16";
function = "qup02";
function = "qup02_i2c";
};
};
......@@ -722,7 +722,7 @@ pinmux {
qup_i2c4_default: qup-i2c4-default {
pinmux {
pins = "gpio115", "gpio116";
function = "qup04";
function = "qup04_i2c";
};
};
......@@ -743,7 +743,7 @@ pinmux {
qup_i2c7_default: qup-i2c7-default {
pinmux {
pins = "gpio6", "gpio7";
function = "qup11";
function = "qup11_i2c";
};
};
......@@ -757,7 +757,7 @@ pinmux {
qup_i2c9_default: qup-i2c9-default {
pinmux {
pins = "gpio46", "gpio47";
function = "qup13";
function = "qup13_i2c";
};
};
......@@ -858,7 +858,7 @@ pinmux {
qup_uart2_default: qup-uart2-default {
pinmux {
pins = "gpio15", "gpio16";
function = "qup02";
function = "qup02_uart";
};
};
......@@ -873,7 +873,7 @@ pinmux {
qup_uart4_default: qup-uart4-default {
pinmux {
pins = "gpio115", "gpio116";
function = "qup04";
function = "qup04_uart";
};
};
......@@ -896,7 +896,7 @@ pinmux {
qup_uart7_default: qup-uart7-default {
pinmux {
pins = "gpio6", "gpio7";
function = "qup11";
function = "qup11_uart";
};
};
......@@ -910,7 +910,7 @@ pinmux {
qup_uart9_default: qup-uart9-default {
pinmux {
pins = "gpio46", "gpio47";
function = "qup13";
function = "qup13_uart";
};
};
......
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