.. | .. |
---|
78 | 78 | }; |
---|
79 | 79 | |
---|
80 | 80 | &i2c0 { |
---|
81 | | - pinctrl-names = "default"; |
---|
82 | | - pinctrl-0 = <&i2c0_pins_a>; |
---|
83 | 81 | status = "okay"; |
---|
84 | 82 | |
---|
85 | 83 | axp209: pmic@34 { |
---|
.. | .. |
---|
91 | 89 | #include "axp209.dtsi" |
---|
92 | 90 | |
---|
93 | 91 | &i2c1 { |
---|
94 | | - pinctrl-names = "default"; |
---|
95 | | - pinctrl-0 = <&i2c1_pins_a>; |
---|
96 | 92 | status = "okay"; |
---|
97 | 93 | |
---|
98 | 94 | pcf8563: rtc@51 { |
---|
.. | .. |
---|
105 | 101 | vref-supply = <®_ldo2>; |
---|
106 | 102 | status = "okay"; |
---|
107 | 103 | |
---|
108 | | - button@200 { |
---|
| 104 | + button-200 { |
---|
109 | 105 | label = "Volume Up"; |
---|
110 | 106 | linux,code = <KEY_VOLUMEUP>; |
---|
111 | 107 | channel = <0>; |
---|
112 | 108 | voltage = <200000>; |
---|
113 | 109 | }; |
---|
114 | 110 | |
---|
115 | | - button@400 { |
---|
| 111 | + button-400 { |
---|
116 | 112 | label = "Volume Down"; |
---|
117 | 113 | linux,code = <KEY_VOLUMEDOWN>; |
---|
118 | 114 | channel = <0>; |
---|
.. | .. |
---|
121 | 117 | }; |
---|
122 | 118 | |
---|
123 | 119 | &mmc0 { |
---|
124 | | - pinctrl-names = "default"; |
---|
125 | | - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_d709>; |
---|
126 | 120 | vmmc-supply = <®_vcc3v3>; |
---|
127 | 121 | bus-width = <4>; |
---|
128 | 122 | cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */ |
---|
.. | .. |
---|
133 | 127 | status = "okay"; |
---|
134 | 128 | }; |
---|
135 | 129 | |
---|
136 | | -&pio { |
---|
137 | | - mmc0_cd_pin_d709: mmc0_cd_pin@0 { |
---|
138 | | - pins = "PG0"; |
---|
139 | | - function = "gpio_in"; |
---|
140 | | - bias-pull-up; |
---|
141 | | - }; |
---|
142 | | - |
---|
143 | | - usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { |
---|
144 | | - pins = "PG1"; |
---|
145 | | - function = "gpio_in"; |
---|
146 | | - bias-pull-down; |
---|
147 | | - }; |
---|
148 | | - |
---|
149 | | - usb0_id_detect_pin: usb0_id_detect_pin@0 { |
---|
150 | | - pins = "PG2"; |
---|
151 | | - function = "gpio_in"; |
---|
152 | | - bias-pull-up; |
---|
153 | | - }; |
---|
154 | | -}; |
---|
155 | | - |
---|
156 | 130 | &pwm { |
---|
157 | 131 | pinctrl-names = "default"; |
---|
158 | | - pinctrl-0 = <&pwm0_pins>; |
---|
| 132 | + pinctrl-0 = <&pwm0_pin>; |
---|
159 | 133 | status = "okay"; |
---|
160 | 134 | }; |
---|
161 | 135 | |
---|
.. | .. |
---|
197 | 171 | |
---|
198 | 172 | &uart1 { |
---|
199 | 173 | pinctrl-names = "default"; |
---|
200 | | - pinctrl-0 = <&uart1_pins_b>; |
---|
| 174 | + pinctrl-0 = <&uart1_pg_pins>; |
---|
201 | 175 | status = "okay"; |
---|
202 | 176 | }; |
---|
203 | 177 | |
---|
.. | .. |
---|
207 | 181 | }; |
---|
208 | 182 | |
---|
209 | 183 | &usbphy { |
---|
210 | | - pinctrl-names = "default"; |
---|
211 | | - pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; |
---|
212 | | - usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ |
---|
213 | | - usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ |
---|
| 184 | + usb0_id_det-gpios = <&pio 6 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG2 */ |
---|
| 185 | + usb0_vbus_det-gpios = <&pio 6 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PG1 */ |
---|
214 | 186 | usb0_vbus-supply = <®_usb0_vbus>; |
---|
215 | 187 | usb1_vbus-supply = <®_ldo3>; |
---|
216 | 188 | status = "okay"; |
---|