diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2015-09-18 13:31:34 +0100 |
|---|---|---|
| committer | Andy Gross <agross@codeaurora.org> | 2015-10-13 16:39:58 -0500 |
| commit | 7648c7bf33f2af8fd6f51f1c56d21b9ff9b2ee35 (patch) | |
| tree | d0bf92ae409fcdc6bd9a7227b55ac17b3bcdfab0 /arch/arm | |
| parent | 3050c5f5afd409c299cfeba815b6f91753c4c112 (diff) | |
ARM: dts: apq8064: Prefix the gsbi6 uart pins correctly
Usage of generic names like "uart_pins" is confusing to the reader, given
the fact that there could be more than one uart on APQ8064.
This patch adds gsbi prefix to uart pinctrl nodes so as to avoid such
confusion.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Andy Gross <agross@codeaurora.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom-apq8064.dtsi | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts index 2ad2ab87ead5..56eaf5a90035 100644 --- a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts +++ b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts @@ -145,7 +145,7 @@ serial@16540000 { status = "ok"; pinctrl-names = "default"; - pinctrl-0 = <&uart_pins>; + pinctrl-0 = <&gsbi6_uart_4pins>; }; }; diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi index f665a2505940..7aa010d93e79 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -127,7 +127,14 @@ }; }; - uart_pins: uart_pins { + gsbi6_uart_2pins: gsbi6_uart_2pins { + mux { + pins = "gpio14", "gpio15"; + function = "gsbi6"; + }; + }; + + gsbi6_uart_4pins: gsbi6_uart_4pins { mux { pins = "gpio14", "gpio15", "gpio16", "gpio17"; function = "gsbi6"; |