openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm64: dts: qcom: msm8916: avoid using _ in node names 

Many nodes in the MSM8916 device trees use '_' in node names
(especially pinctrl), even though (seemingly) '-' is preferred now.
Make this more consistent by replacing '_' with '-' where possible.

Similar naming is used for pinctrl in newer device trees (e.g. sdm845.dtsi).

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20200514112754.148919-1-stephan@gerhold.net
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Stephan Gerhold 2020-05-14 13:27:52 +02:00 committed by Bjorn Andersson
parent 2536bedec6
commit e6717dbaef
7 changed files with 116 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi
View File

@ -4,7 +4,7 @@
&pm8916_gpios { &pm8916_gpios {
usb_hub_reset_pm: usb_hub_reset_pm { usb_hub_reset_pm: usb-hub-reset-pm {
pinconf { pinconf {
pins = "gpio3"; pins = "gpio3";
function = PMIC_GPIO_FUNC_NORMAL; function = PMIC_GPIO_FUNC_NORMAL;
@ -13,7 +13,7 @@ pinconf {
}; };
}; };
usb_hub_reset_pm_device: usb_hub_reset_pm_device { usb_hub_reset_pm_device: usb-hub-reset-pm-device {
pinconf { pinconf {
pins = "gpio3"; pins = "gpio3";
function = PMIC_GPIO_FUNC_NORMAL; function = PMIC_GPIO_FUNC_NORMAL;
@ -21,7 +21,7 @@ pinconf {
}; };
}; };
usb_sw_sel_pm: usb_sw_sel_pm { usb_sw_sel_pm: usb-sw-sel-pm {
pinconf { pinconf {
pins = "gpio4"; pins = "gpio4";
function = PMIC_GPIO_FUNC_NORMAL; function = PMIC_GPIO_FUNC_NORMAL;
@ -31,7 +31,7 @@ pinconf {
}; };
}; };
usb_sw_sel_pm_device: usb_sw_sel_pm_device { usb_sw_sel_pm_device: usb-sw-sel-pm-device {
pinconf { pinconf {
pins = "gpio4"; pins = "gpio4";
function = PMIC_GPIO_FUNC_NORMAL; function = PMIC_GPIO_FUNC_NORMAL;
@ -41,7 +41,7 @@ pinconf {
}; };
}; };
pm8916_gpios_leds: pm8916_gpios_leds { pm8916_gpios_leds: pm8916-gpios-leds {
pinconf { pinconf {
pins = "gpio1", "gpio2"; pins = "gpio1", "gpio2";
function = PMIC_GPIO_FUNC_NORMAL; function = PMIC_GPIO_FUNC_NORMAL;
@ -55,7 +55,7 @@ &pm8916_mpps {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ls_exp_gpio_f>; pinctrl-0 = <&ls_exp_gpio_f>;
ls_exp_gpio_f: pm8916_mpp4 { ls_exp_gpio_f: pm8916-mpp4 {
pinconf { pinconf {
pins = "mpp4"; pins = "mpp4";
function = "digital"; function = "digital";
@ -64,7 +64,7 @@ pinconf {
}; };
}; };
pm8916_mpps_leds: pm8916_mpps_leds { pm8916_mpps_leds: pm8916-mpps-leds {
pinconf { pinconf {
pins = "mpp2", "mpp3"; pins = "mpp2", "mpp3";
function = "digital"; function = "digital";

12
arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi
View File

@ -4,7 +4,7 @@
&msmgpio { &msmgpio {
msmgpio_leds: msmgpio_leds { msmgpio_leds: msmgpio-leds {
pinconf { pinconf {
pins = "gpio21", "gpio120"; pins = "gpio21", "gpio120";
function = "gpio"; function = "gpio";
@ -26,7 +26,7 @@ pinconf {
}; };
}; };
adv7533_int_active: adv533_int_active { adv7533_int_active: adv533-int-active {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio31"; pins = "gpio31";
@ -38,7 +38,7 @@ pinconf {
}; };
}; };
adv7533_int_suspend: adv7533_int_suspend { adv7533_int_suspend: adv7533-int-suspend {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio31"; pins = "gpio31";
@ -50,7 +50,7 @@ pinconf {
}; };
}; };
adv7533_switch_active: adv7533_switch_active { adv7533_switch_active: adv7533-switch-active {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio32"; pins = "gpio32";
@ -62,7 +62,7 @@ pinconf {
}; };
}; };
adv7533_switch_suspend: adv7533_switch_suspend { adv7533_switch_suspend: adv7533-switch-suspend {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio32"; pins = "gpio32";
@ -74,7 +74,7 @@ pinconf {
}; };
}; };
msm_key_volp_n_default: msm_key_volp_n_default { msm_key_volp_n_default: msm-key-volp-n-default {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio107"; pins = "gpio107";

8
arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
View File

@ -51,7 +51,7 @@ chosen {
stdout-path = "serial0"; stdout-path = "serial0";
}; };
camera_vdddo_1v8: camera_vdddo_1v8 { camera_vdddo_1v8: camera-vdddo-1v8 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "camera_vdddo"; regulator-name = "camera_vdddo";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
@ -59,7 +59,7 @@ camera_vdddo_1v8: camera_vdddo_1v8 {
regulator-always-on; regulator-always-on;
}; };
camera_vdda_2v8: camera_vdda_2v8 { camera_vdda_2v8: camera-vdda-2v8 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "camera_vdda"; regulator-name = "camera_vdda";
regulator-min-microvolt = <2800000>; regulator-min-microvolt = <2800000>;
@ -67,7 +67,7 @@ camera_vdda_2v8: camera_vdda_2v8 {
regulator-always-on; regulator-always-on;
}; };
camera_vddd_1v5: camera_vddd_1v5 { camera_vddd_1v5: camera-vddd-1v5 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "camera_vddd"; regulator-name = "camera_vddd";
regulator-min-microvolt = <1500000>; regulator-min-microvolt = <1500000>;
@ -566,7 +566,7 @@ hdmi_con: endpoint {
}; };
}; };
gpio_keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;

2
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
View File

@ -109,7 +109,7 @@ volume-up {
}; };
&msmgpio { &msmgpio {
gpio_keys_default: gpio_keys_default { gpio_keys_default: gpio-keys-default {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio107"; pins = "gpio107";

181
arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
View File

@ -5,7 +5,7 @@
&msmgpio { &msmgpio {
blsp1_uart1_default: blsp1_uart1_default { blsp1_uart1_default: blsp1-uart1-default {
pinmux { pinmux {
function = "blsp_uart1"; function = "blsp_uart1";
// TX, RX, CTS_N, RTS_N // TX, RX, CTS_N, RTS_N
@ -20,7 +20,7 @@ pinconf {
}; };
}; };
blsp1_uart1_sleep: blsp1_uart1_sleep { blsp1_uart1_sleep: blsp1-uart1-sleep {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio0", "gpio1", pins = "gpio0", "gpio1",
@ -34,7 +34,7 @@ pinconf {
}; };
}; };
blsp1_uart2_default: blsp1_uart2_default { blsp1_uart2_default: blsp1-uart2-default {
pinmux { pinmux {
function = "blsp_uart2"; function = "blsp_uart2";
pins = "gpio4", "gpio5"; pins = "gpio4", "gpio5";
@ -46,7 +46,7 @@ pinconf {
}; };
}; };
blsp1_uart2_sleep: blsp1_uart2_sleep { blsp1_uart2_sleep: blsp1-uart2-sleep {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio4", "gpio5"; pins = "gpio4", "gpio5";
@ -58,12 +58,12 @@ pinconf {
}; };
}; };
spi1_default: spi1_default { spi1_default: spi1-default {
pinmux { pinmux {
function = "blsp_spi1"; function = "blsp_spi1";
pins = "gpio0", "gpio1", "gpio3"; pins = "gpio0", "gpio1", "gpio3";
}; };
pinmux_cs { pinmux-cs {
function = "gpio"; function = "gpio";
pins = "gpio2"; pins = "gpio2";
}; };
@ -72,7 +72,7 @@ pinconf {
drive-strength = <12>; drive-strength = <12>;
bias-disable; bias-disable;
}; };
pinconf_cs { pinconf-cs {
pins = "gpio2"; pins = "gpio2";
drive-strength = <16>; drive-strength = <16>;
bias-disable; bias-disable;
@ -80,7 +80,7 @@ pinconf_cs {
}; };
}; };
spi1_sleep: spi1_sleep { spi1_sleep: spi1-sleep {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio0", "gpio1", "gpio2", "gpio3"; pins = "gpio0", "gpio1", "gpio2", "gpio3";
@ -92,12 +92,12 @@ pinconf {
}; };
}; };
spi2_default: spi2_default { spi2_default: spi2-default {
pinmux { pinmux {
function = "blsp_spi2"; function = "blsp_spi2";
pins = "gpio4", "gpio5", "gpio7"; pins = "gpio4", "gpio5", "gpio7";
}; };
pinmux_cs { pinmux-cs {
function = "gpio"; function = "gpio";
pins = "gpio6"; pins = "gpio6";
}; };
@ -106,7 +106,7 @@ pinconf {
drive-strength = <12>; drive-strength = <12>;
bias-disable; bias-disable;
}; };
pinconf_cs { pinconf-cs {
pins = "gpio6"; pins = "gpio6";
drive-strength = <16>; drive-strength = <16>;
bias-disable; bias-disable;
@ -114,7 +114,7 @@ pinconf_cs {
}; };
}; };
spi2_sleep: spi2_sleep { spi2_sleep: spi2-sleep {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio4", "gpio5", "gpio6", "gpio7"; pins = "gpio4", "gpio5", "gpio6", "gpio7";
@ -126,12 +126,12 @@ pinconf {
}; };
}; };
spi3_default: spi3_default { spi3_default: spi3-default {
pinmux { pinmux {
function = "blsp_spi3"; function = "blsp_spi3";
pins = "gpio8", "gpio9", "gpio11"; pins = "gpio8", "gpio9", "gpio11";
}; };
pinmux_cs { pinmux-cs {
function = "gpio"; function = "gpio";
pins = "gpio10"; pins = "gpio10";
}; };
@ -140,7 +140,7 @@ pinconf {
drive-strength = <12>; drive-strength = <12>;
bias-disable; bias-disable;
}; };
pinconf_cs { pinconf-cs {
pins = "gpio10"; pins = "gpio10";
drive-strength = <16>; drive-strength = <16>;
bias-disable; bias-disable;
@ -148,7 +148,7 @@ pinconf_cs {
}; };
}; };
spi3_sleep: spi3_sleep { spi3_sleep: spi3-sleep {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio8", "gpio9", "gpio10", "gpio11"; pins = "gpio8", "gpio9", "gpio10", "gpio11";
@ -160,12 +160,12 @@ pinconf {
}; };
}; };
spi4_default: spi4_default { spi4_default: spi4-default {
pinmux { pinmux {
function = "blsp_spi4"; function = "blsp_spi4";
pins = "gpio12", "gpio13", "gpio15"; pins = "gpio12", "gpio13", "gpio15";
}; };
pinmux_cs { pinmux-cs {
function = "gpio"; function = "gpio";
pins = "gpio14"; pins = "gpio14";
}; };
@ -174,7 +174,7 @@ pinconf {
drive-strength = <12>; drive-strength = <12>;
bias-disable; bias-disable;
}; };
pinconf_cs { pinconf-cs {
pins = "gpio14"; pins = "gpio14";
drive-strength = <16>; drive-strength = <16>;
bias-disable; bias-disable;
@ -182,7 +182,7 @@ pinconf_cs {
}; };
}; };
spi4_sleep: spi4_sleep { spi4_sleep: spi4-sleep {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio12", "gpio13", "gpio14", "gpio15"; pins = "gpio12", "gpio13", "gpio14", "gpio15";
@ -194,12 +194,12 @@ pinconf {
}; };
}; };
spi5_default: spi5_default { spi5_default: spi5-default {
pinmux { pinmux {
function = "blsp_spi5"; function = "blsp_spi5";
pins = "gpio16", "gpio17", "gpio19"; pins = "gpio16", "gpio17", "gpio19";
}; };
pinmux_cs { pinmux-cs {
function = "gpio"; function = "gpio";
pins = "gpio18"; pins = "gpio18";
}; };
@ -208,7 +208,7 @@ pinconf {
drive-strength = <12>; drive-strength = <12>;
bias-disable; bias-disable;
}; };
pinconf_cs { pinconf-cs {
pins = "gpio18"; pins = "gpio18";
drive-strength = <16>; drive-strength = <16>;
bias-disable; bias-disable;
@ -216,7 +216,7 @@ pinconf_cs {
}; };
}; };
spi5_sleep: spi5_sleep { spi5_sleep: spi5-sleep {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio16", "gpio17", "gpio18", "gpio19"; pins = "gpio16", "gpio17", "gpio18", "gpio19";
@ -228,12 +228,12 @@ pinconf {
}; };
}; };
spi6_default: spi6_default { spi6_default: spi6-default {
pinmux { pinmux {
function = "blsp_spi6"; function = "blsp_spi6";
pins = "gpio20", "gpio21", "gpio23"; pins = "gpio20", "gpio21", "gpio23";
}; };
pinmux_cs { pinmux-cs {
function = "gpio"; function = "gpio";
pins = "gpio22"; pins = "gpio22";
}; };
@ -242,7 +242,7 @@ pinconf {
drive-strength = <12>; drive-strength = <12>;
bias-disable; bias-disable;
}; };
pinconf_cs { pinconf-cs {
pins = "gpio22"; pins = "gpio22";
drive-strength = <16>; drive-strength = <16>;
bias-disable; bias-disable;
@ -250,7 +250,7 @@ pinconf_cs {
}; };
}; };
spi6_sleep: spi6_sleep { spi6_sleep: spi6-sleep {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio20", "gpio21", "gpio22", "gpio23"; pins = "gpio20", "gpio21", "gpio22", "gpio23";
@ -262,7 +262,7 @@ pinconf {
}; };
}; };
i2c1_default: i2c1_default { i2c1_default: i2c1-default {
pinmux { pinmux {
function = "blsp_i2c1"; function = "blsp_i2c1";
pins = "gpio2", "gpio3"; pins = "gpio2", "gpio3";
@ -274,7 +274,7 @@ pinconf {
}; };
}; };
i2c1_sleep: i2c1_sleep { i2c1_sleep: i2c1-sleep {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio2", "gpio3"; pins = "gpio2", "gpio3";
@ -286,7 +286,7 @@ pinconf {
}; };
}; };
i2c2_default: i2c2_default { i2c2_default: i2c2-default {
pinmux { pinmux {
function = "blsp_i2c2"; function = "blsp_i2c2";
pins = "gpio6", "gpio7"; pins = "gpio6", "gpio7";
@ -298,7 +298,7 @@ pinconf {
}; };
}; };
i2c2_sleep: i2c2_sleep { i2c2_sleep: i2c2-sleep {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio6", "gpio7"; pins = "gpio6", "gpio7";
@ -310,7 +310,7 @@ pinconf {
}; };
}; };
i2c4_default: i2c4_default { i2c4_default: i2c4-default {
pinmux { pinmux {
function = "blsp_i2c4"; function = "blsp_i2c4";
pins = "gpio14", "gpio15"; pins = "gpio14", "gpio15";
@ -322,7 +322,7 @@ pinconf {
}; };
}; };
i2c4_sleep: i2c4_sleep { i2c4_sleep: i2c4-sleep {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio14", "gpio15"; pins = "gpio14", "gpio15";
@ -334,7 +334,7 @@ pinconf {
}; };
}; };
i2c5_default: i2c5_default { i2c5_default: i2c5-default {
pinmux { pinmux {
function = "blsp_i2c5"; function = "blsp_i2c5";
pins = "gpio18", "gpio19"; pins = "gpio18", "gpio19";
@ -346,7 +346,7 @@ pinconf {
}; };
}; };
i2c5_sleep: i2c5_sleep { i2c5_sleep: i2c5-sleep {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio18", "gpio19"; pins = "gpio18", "gpio19";
@ -358,7 +358,7 @@ pinconf {
}; };
}; };
i2c6_default: i2c6_default { i2c6_default: i2c6-default {
pinmux { pinmux {
function = "blsp_i2c6"; function = "blsp_i2c6";
pins = "gpio22", "gpio23"; pins = "gpio22", "gpio23";
@ -370,7 +370,7 @@ pinconf {
}; };
}; };
i2c6_sleep: i2c6_sleep { i2c6_sleep: i2c6-sleep {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio22", "gpio23"; pins = "gpio22", "gpio23";
@ -382,8 +382,8 @@ pinconf {
}; };
}; };
pmx_sdc1_clk { pmx-sdc1-clk {
sdc1_clk_on: clk_on { sdc1_clk_on: clk-on {
pinmux { pinmux {
pins = "sdc1_clk"; pins = "sdc1_clk";
}; };
@ -393,7 +393,7 @@ pinconf {
drive-strength = <16>; drive-strength = <16>;
}; };
}; };
sdc1_clk_off: clk_off { sdc1_clk_off: clk-off {
pinmux { pinmux {
pins = "sdc1_clk"; pins = "sdc1_clk";
}; };
@ -405,8 +405,8 @@ pinconf {
}; };
}; };
pmx_sdc1_cmd { pmx-sdc1-cmd {
sdc1_cmd_on: cmd_on { sdc1_cmd_on: cmd-on {
pinmux { pinmux {
pins = "sdc1_cmd"; pins = "sdc1_cmd";
}; };
@ -416,7 +416,7 @@ pinconf {
drive-strength = <10>; drive-strength = <10>;
}; };
}; };
sdc1_cmd_off: cmd_off { sdc1_cmd_off: cmd-off {
pinmux { pinmux {
pins = "sdc1_cmd"; pins = "sdc1_cmd";
}; };
@ -428,8 +428,8 @@ pinconf {
}; };
}; };
pmx_sdc1_data { pmx-sdc1-data {
sdc1_data_on: data_on { sdc1_data_on: data-on {
pinmux { pinmux {
pins = "sdc1_data"; pins = "sdc1_data";
}; };
@ -439,7 +439,7 @@ pinconf {
drive-strength = <10>; drive-strength = <10>;
}; };
}; };
sdc1_data_off: data_off { sdc1_data_off: data-off {
pinmux { pinmux {
pins = "sdc1_data"; pins = "sdc1_data";
}; };
@ -451,8 +451,8 @@ pinconf {
}; };
}; };
pmx_sdc2_clk { pmx-sdc2-clk {
sdc2_clk_on: clk_on { sdc2_clk_on: clk-on {
pinmux { pinmux {
pins = "sdc2_clk"; pins = "sdc2_clk";
}; };
@ -462,7 +462,7 @@ pinconf {
drive-strength = <16>; drive-strength = <16>;
}; };
}; };
sdc2_clk_off: clk_off { sdc2_clk_off: clk-off {
pinmux { pinmux {
pins = "sdc2_clk"; pins = "sdc2_clk";
}; };
@ -474,8 +474,8 @@ pinconf {
}; };
}; };
pmx_sdc2_cmd { pmx-sdc2-cmd {
sdc2_cmd_on: cmd_on { sdc2_cmd_on: cmd-on {
pinmux { pinmux {
pins = "sdc2_cmd"; pins = "sdc2_cmd";
}; };
@ -485,7 +485,7 @@ pinconf {
drive-strength = <10>; drive-strength = <10>;
}; };
}; };
sdc2_cmd_off: cmd_off { sdc2_cmd_off: cmd-off {
pinmux { pinmux {
pins = "sdc2_cmd"; pins = "sdc2_cmd";
}; };
@ -497,8 +497,8 @@ pinconf {
}; };
}; };
pmx_sdc2_data { pmx-sdc2-data {
sdc2_data_on: data_on { sdc2_data_on: data-on {
pinmux { pinmux {
pins = "sdc2_data"; pins = "sdc2_data";
}; };
@ -508,7 +508,7 @@ pinconf {
drive-strength = <10>; drive-strength = <10>;
}; };
}; };
sdc2_data_off: data_off { sdc2_data_off: data-off {
pinmux { pinmux {
pins = "sdc2_data"; pins = "sdc2_data";
}; };
@ -520,8 +520,8 @@ pinconf {
}; };
}; };
pmx_sdc2_cd_pin { pmx-sdc2-cd-pin {
sdc2_cd_on: cd_on { sdc2_cd_on: cd-on {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio38"; pins = "gpio38";
@ -532,7 +532,7 @@ pinconf {
bias-pull-up; bias-pull-up;
}; };
}; };
sdc2_cd_off: cd_off { sdc2_cd_off: cd-off {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio38"; pins = "gpio38";
@ -546,7 +546,7 @@ pinconf {
}; };
cdc-pdm-lines { cdc-pdm-lines {
cdc_pdm_lines_act: pdm_lines_on { cdc_pdm_lines_act: pdm-lines-on {
pinmux { pinmux {
function = "cdc_pdm0"; function = "cdc_pdm0";
pins = "gpio63", "gpio64", "gpio65", "gpio66", pins = "gpio63", "gpio64", "gpio65", "gpio66",
@ -559,7 +559,7 @@ pinconf {
bias-pull-none; bias-pull-none;
}; };
}; };
cdc_pdm_lines_sus: pdm_lines_off { cdc_pdm_lines_sus: pdm-lines-off {
pinmux { pinmux {
function = "cdc_pdm0"; function = "cdc_pdm0";
pins = "gpio63", "gpio64", "gpio65", "gpio66", pins = "gpio63", "gpio64", "gpio65", "gpio66",
@ -575,7 +575,7 @@ pinconf {
}; };
ext-pri-tlmm-lines { ext-pri-tlmm-lines {
ext_pri_tlmm_lines_act: ext_pa_on { ext_pri_tlmm_lines_act: ext-pa-on {
pinmux { pinmux {
function = "pri_mi2s"; function = "pri_mi2s";
pins = "gpio113", "gpio114", "gpio115", pins = "gpio113", "gpio114", "gpio115",
@ -589,7 +589,7 @@ pinconf {
}; };
}; };
ext_pri_tlmm_lines_sus: ext_pa_off { ext_pri_tlmm_lines_sus: ext-pa-off {
pinmux { pinmux {
function = "pri_mi2s"; function = "pri_mi2s";
pins = "gpio113", "gpio114", "gpio115", pins = "gpio113", "gpio114", "gpio115",
@ -605,7 +605,7 @@ pinconf {
}; };
ext-pri-ws-line { ext-pri-ws-line {
ext_pri_ws_act: ext_pa_on { ext_pri_ws_act: ext-pa-on {
pinmux { pinmux {
function = "pri_mi2s_ws"; function = "pri_mi2s_ws";
pins = "gpio110"; pins = "gpio110";
@ -617,7 +617,7 @@ pinconf {
}; };
}; };
ext_pri_ws_sus: ext_pa_off { ext_pri_ws_sus: ext-pa-off {
pinmux { pinmux {
function = "pri_mi2s_ws"; function = "pri_mi2s_ws";
pins = "gpio110"; pins = "gpio110";
@ -631,7 +631,7 @@ pinconf {
}; };
ext-mclk-tlmm-lines { ext-mclk-tlmm-lines {
ext_mclk_tlmm_lines_act: mclk_lines_on { ext_mclk_tlmm_lines_act: mclk-lines-on {
pinmux { pinmux {
function = "pri_mi2s"; function = "pri_mi2s";
pins = "gpio116"; pins = "gpio116";
@ -642,7 +642,7 @@ pinconf {
bias-pull-none; bias-pull-none;
}; };
}; };
ext_mclk_tlmm_lines_sus: mclk_lines_off { ext_mclk_tlmm_lines_sus: mclk-lines-off {
pinmux { pinmux {
function = "pri_mi2s"; function = "pri_mi2s";
pins = "gpio116"; pins = "gpio116";
@ -657,7 +657,7 @@ pinconf {
/* secondary Mi2S */ /* secondary Mi2S */
ext-sec-tlmm-lines { ext-sec-tlmm-lines {
ext_sec_tlmm_lines_act: tlmm_lines_on { ext_sec_tlmm_lines_act: tlmm-lines-on {
pinmux { pinmux {
function = "sec_mi2s"; function = "sec_mi2s";
pins = "gpio112", "gpio117", "gpio118", pins = "gpio112", "gpio117", "gpio118",
@ -670,7 +670,7 @@ pinconf {
bias-pull-none; bias-pull-none;
}; };
}; };
ext_sec_tlmm_lines_sus: tlmm_lines_off { ext_sec_tlmm_lines_sus: tlmm-lines-off {
pinmux { pinmux {
function = "sec_mi2s"; function = "sec_mi2s";
pins = "gpio112", "gpio117", "gpio118", pins = "gpio112", "gpio117", "gpio118",
@ -686,12 +686,12 @@ pinconf {
}; };
cdc-dmic-lines { cdc-dmic-lines {
cdc_dmic_lines_act: dmic_lines_on { cdc_dmic_lines_act: dmic-lines-on {
pinmux_dmic0_clk { pinmux-dmic0-clk {
function = "dmic0_clk"; function = "dmic0_clk";
pins = "gpio0"; pins = "gpio0";
}; };
pinmux_dmic0_data { pinmux-dmic0-data {
function = "dmic0_data"; function = "dmic0_data";
pins = "gpio1"; pins = "gpio1";
}; };
@ -700,12 +700,12 @@ pinconf {
drive-strength = <8>; drive-strength = <8>;
}; };
}; };
cdc_dmic_lines_sus: dmic_lines_off { cdc_dmic_lines_sus: dmic-lines-off {
pinmux_dmic0_clk { pinmux-dmic0-clk {
function = "dmic0_clk"; function = "dmic0_clk";
pins = "gpio0"; pins = "gpio0";
}; };
pinmux_dmic0_data { pinmux-dmic0-data {
function = "dmic0_data"; function = "dmic0_data";
pins = "gpio1"; pins = "gpio1";
}; };
@ -722,7 +722,6 @@ pinmux {
pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44"; pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44";
function = "wcss_wlan"; function = "wcss_wlan";
}; };
pinconf { pinconf {
pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44"; pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44";
drive-strength = <6>; drive-strength = <6>;
@ -730,7 +729,7 @@ pinconf {
}; };
}; };
cci0_default: cci0_default { cci0_default: cci0-default {
pinmux { pinmux {
function = "cci_i2c"; function = "cci_i2c";
pins = "gpio29", "gpio30"; pins = "gpio29", "gpio30";
@ -742,64 +741,64 @@ pinconf {
}; };
}; };
camera_front_default: camera_front_default { camera_front_default: camera-front-default {
pinmux_pwdn { pinmux-pwdn {
function = "gpio"; function = "gpio";
pins = "gpio33"; pins = "gpio33";
}; };
pinconf_pwdn { pinconf-pwdn {
pins = "gpio33"; pins = "gpio33";
drive-strength = <16>; drive-strength = <16>;
bias-disable; bias-disable;
}; };
pinmux_rst { pinmux-rst {
function = "gpio"; function = "gpio";
pins = "gpio28"; pins = "gpio28";
}; };
pinconf_rst { pinconf-rst {
pins = "gpio28"; pins = "gpio28";
drive-strength = <16>; drive-strength = <16>;
bias-disable; bias-disable;
}; };
pinmux_mclk1 { pinmux-mclk1 {
function = "cam_mclk1"; function = "cam_mclk1";
pins = "gpio27"; pins = "gpio27";
}; };
pinconf_mclk1 { pinconf-mclk1 {
pins = "gpio27"; pins = "gpio27";
drive-strength = <16>; drive-strength = <16>;
bias-disable; bias-disable;
}; };
}; };
camera_rear_default: camera_rear_default { camera_rear_default: camera-rear-default {
pinmux_pwdn { pinmux-pwdn {
function = "gpio"; function = "gpio";
pins = "gpio34"; pins = "gpio34";
}; };
pinconf_pwdn { pinconf-pwdn {
pins = "gpio34"; pins = "gpio34";
drive-strength = <16>; drive-strength = <16>;
bias-disable; bias-disable;
}; };
pinmux_rst { pinmux-rst {
function = "gpio"; function = "gpio";
pins = "gpio35"; pins = "gpio35";
}; };
pinconf_rst { pinconf-rst {
pins = "gpio35"; pins = "gpio35";
drive-strength = <16>; drive-strength = <16>;
bias-disable; bias-disable;
}; };
pinmux_mclk0 { pinmux-mclk0 {
function = "cam_mclk0"; function = "cam_mclk0";
pins = "gpio26"; pins = "gpio26";
}; };
pinconf_mclk0 { pinconf-mclk0 {
pins = "gpio26"; pins = "gpio26";
drive-strength = <16>; drive-strength = <16>;
bias-disable; bias-disable;

6
arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
View File

@ -168,7 +168,7 @@ muic: sm5502@25 {
}; };
&msmgpio { &msmgpio {
gpio_keys_default: gpio_keys_default { gpio_keys_default: gpio-keys-default {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio107", "gpio109"; pins = "gpio107", "gpio109";
@ -180,7 +180,7 @@ pinconf {
}; };
}; };
gpio_hall_sensor_default: gpio_hall_sensor_default { gpio_hall_sensor_default: gpio-hall-sensor-default {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio52"; pins = "gpio52";
@ -192,7 +192,7 @@ pinconf {
}; };
}; };
muic_int_default: muic_int_default { muic_int_default: muic-int-default {
pinmux { pinmux {
function = "gpio"; function = "gpio";
pins = "gpio12"; pins = "gpio12";

10
arch/arm64/boot/dts/qcom/msm8916.dtsi
View File

@ -340,7 +340,7 @@ modem_alert0: trip-point0 {
}; };
cpu_opp_table: cpu_opp_table { cpu_opp_table: cpu-opp-table {
compatible = "operating-points-v2"; compatible = "operating-points-v2";
opp-shared; opp-shared;
@ -358,7 +358,7 @@ opp-998400000 {
}; };
}; };
gpu_opp_table: opp_table { gpu_opp_table: gpu-opp-table {
compatible = "operating-points-v2"; compatible = "operating-points-v2";
opp-400000000 { opp-400000000 {
@ -378,13 +378,13 @@ timer {
}; };
clocks { clocks {
xo_board: xo_board { xo_board: xo-board {
compatible = "fixed-clock"; compatible = "fixed-clock";
#clock-cells = <0>; #clock-cells = <0>;
clock-frequency = <19200000>; clock-frequency = <19200000>;
}; };
sleep_clk: sleep_clk { sleep_clk: sleep-clk {
compatible = "fixed-clock"; compatible = "fixed-clock";
#clock-cells = <0>; #clock-cells = <0>;
clock-frequency = <32768>; clock-frequency = <32768>;
@ -1783,7 +1783,7 @@ rpm {
qcom,ipc = <&apcs 8 0>; qcom,ipc = <&apcs 8 0>;
qcom,smd-edge = <15>; qcom,smd-edge = <15>;
rpm_requests { rpm-requests {
compatible = "qcom,rpm-msm8916"; compatible = "qcom,rpm-msm8916";
qcom,smd-channels = "rpm_requests"; qcom,smd-channels = "rpm_requests";