Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: apq8064: move pinctrls to dedicated dtsi

As there are more pinctrls to come, moving these to dedicated dtsi makes
more sense.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

authored by

Srinivas Kandagatla and committed by
Andy Gross
a30e78bd e07214db

+59 -56
+58
arch/arm/boot/dts/qcom-apq8064-pins.dtsi
··· 1 + 2 + &tlmm_pinmux { 3 + sdc4_gpios: sdc4-gpios { 4 + pios { 5 + pins = "gpio63", "gpio64", "gpio65", "gpio66", "gpio67", "gpio68"; 6 + function = "sdc4"; 7 + }; 8 + }; 9 + 10 + ps_hold: ps_hold { 11 + mux { 12 + pins = "gpio78"; 13 + function = "ps_hold"; 14 + }; 15 + }; 16 + 17 + i2c1_pins: i2c1 { 18 + mux { 19 + pins = "gpio20", "gpio21"; 20 + function = "gsbi1"; 21 + }; 22 + }; 23 + 24 + i2c3_pins: i2c3 { 25 + mux { 26 + pins = "gpio8", "gpio9"; 27 + function = "gsbi3"; 28 + }; 29 + }; 30 + 31 + gsbi6_uart_2pins: gsbi6_uart_2pins { 32 + mux { 33 + pins = "gpio14", "gpio15"; 34 + function = "gsbi6"; 35 + }; 36 + }; 37 + 38 + gsbi6_uart_4pins: gsbi6_uart_4pins { 39 + mux { 40 + pins = "gpio14", "gpio15", "gpio16", "gpio17"; 41 + function = "gsbi6"; 42 + }; 43 + }; 44 + 45 + gsbi7_uart_2pins: gsbi7_uart_2pins { 46 + mux { 47 + pins = "gpio82", "gpio83"; 48 + function = "gsbi7"; 49 + }; 50 + }; 51 + 52 + gsbi7_uart_4pins: gsbi7_uart_4pins { 53 + mux { 54 + pins = "gpio82", "gpio83", "gpio84", "gpio85"; 55 + function = "gsbi7"; 56 + }; 57 + }; 58 + };
+1 -56
arch/arm/boot/dts/qcom-apq8064.dtsi
··· 142 142 143 143 pinctrl-names = "default"; 144 144 pinctrl-0 = <&ps_hold>; 145 - 146 - sdc4_gpios: sdc4-gpios { 147 - pios { 148 - pins = "gpio63", "gpio64", "gpio65", "gpio66", "gpio67", "gpio68"; 149 - function = "sdc4"; 150 - }; 151 - }; 152 - 153 - ps_hold: ps_hold { 154 - mux { 155 - pins = "gpio78"; 156 - function = "ps_hold"; 157 - }; 158 - }; 159 - 160 - i2c1_pins: i2c1 { 161 - mux { 162 - pins = "gpio20", "gpio21"; 163 - function = "gsbi1"; 164 - }; 165 - }; 166 - 167 - i2c3_pins: i2c3 { 168 - mux { 169 - pins = "gpio8", "gpio9"; 170 - function = "gsbi3"; 171 - }; 172 - }; 173 - 174 - gsbi6_uart_2pins: gsbi6_uart_2pins { 175 - mux { 176 - pins = "gpio14", "gpio15"; 177 - function = "gsbi6"; 178 - }; 179 - }; 180 - 181 - gsbi6_uart_4pins: gsbi6_uart_4pins { 182 - mux { 183 - pins = "gpio14", "gpio15", "gpio16", "gpio17"; 184 - function = "gsbi6"; 185 - }; 186 - }; 187 - 188 - gsbi7_uart_2pins: gsbi7_uart_2pins { 189 - mux { 190 - pins = "gpio82", "gpio83"; 191 - function = "gsbi7"; 192 - }; 193 - }; 194 - 195 - gsbi7_uart_4pins: gsbi7_uart_4pins { 196 - mux { 197 - pins = "gpio82", "gpio83", "gpio84", "gpio85"; 198 - function = "gsbi7"; 199 - }; 200 - }; 201 145 }; 202 146 203 147 sfpb_wrapper_mutex: syscon@1200000 { ··· 774 830 }; 775 831 }; 776 832 }; 833 + #include "qcom-apq8064-pins.dtsi"