evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: Change pinctrl settings for BLSP1 UART3 for msmcobalt"

Browse source
This commit is contained in:
Linux Build Service Account 2016-10-21 17:16:06 -07:00 • committed by Gerrit - the friendly Code Review server
commit 876d57315f
2 changed files with 76 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/boot/dts/qcom/msmcobalt-blsp.dtsi
View file

@ -736,8 +736,10 @@
clocks = <&clock_gcc clk_gcc_blsp1_uart3_apps_clk>,
<&clock_gcc clk_gcc_blsp1_ahb_clk>;
pinctrl-names = "sleep", "default";
pinctrl-0 = <&blsp1_uart3_sleep>;
pinctrl-1 = <&blsp1_uart3_active>;
pinctrl-0 = <&blsp1_uart3_tx_sleep>, <&blsp1_uart3_rxcts_sleep>,
<&blsp1_uart3_rfr_sleep>;
pinctrl-1 = <&blsp1_uart3_tx_active>,
<&blsp1_uart3_rxcts_active>, <&blsp1_uart3_rfr_active>;
qcom,msm-bus,name = "buart3";
qcom,msm-bus,num-cases = <2>;

90
arch/arm/boot/dts/qcom/msmcobalt-pinctrl.dtsi
View file

@ -1223,29 +1223,83 @@
};
};
blsp1_uart3_active: blsp1_uart3_active {
mux {
pins = "gpio45", "gpio46", "gpio47", "gpio48";
function = "blsp_uart3_a";
blsp1_uart3: blsp1_uart3 {
blsp1_uart3_tx_active: blsp1_uart3_tx_active {
mux {
pins = "gpio45";
function = "blsp_uart3_a";
};
config {
pins = "gpio45";
drive-strength = <2>;
bias-disable;
};
};
config {
pins = "gpio45", "gpio46", "gpio47", "gpio48";
drive-strength = <2>;
bias-disable;
};
};
blsp1_uart3_tx_sleep: blsp1_uart3_tx_sleep {
mux {
pins = "gpio45";
function = "gpio";
};
blsp1_uart3_sleep: blsp1_uart3_sleep {
mux {
pins = "gpio45", "gpio46", "gpio47", "gpio48";
function = "gpio";
config {
pins = "gpio45";
drive-strength = <2>;
bias-pull-up;
};
};
config {
pins = "gpio45", "gpio46", "gpio47", "gpio48";
drive-strength = <2>;
bias-pull-up;
blsp1_uart3_rxcts_active: blsp1_uart3_rxcts_active {
mux {
pins = "gpio46", "gpio47";
function = "blsp_uart3_a";
};
config {
pins = "gpio46", "gpio47";
drive-strength = <2>;
bias-disable;
};
};
blsp1_uart3_rxcts_sleep: blsp1_uart3_rxcts_sleep {
mux {
pins = "gpio46", "gpio47";
function = "gpio";
};
config {
pins = "gpio46", "gpio47";
drive-strength = <2>;
bias-no-pull;
};
};
blsp1_uart3_rfr_active: blsp1_uart3_rfr_active {
mux {
pins = "gpio48";
function = "blsp_uart3_a";
};
config {
pins = "gpio48";
drive-strength = <2>;
bias-disable;
};
};
blsp1_uart3_rfr_sleep: blsp1_uart3_rfr_sleep {
mux {
pins = "gpio48";
function = "gpio";
};
config {
pins = "gpio48";
drive-strength = <2>;
bias-no-pull;
};
};
};