hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
....@@ -71,8 +71,6 @@
7171
7272 reg_vmmc1: vmmc1 {
7373 compatible = "regulator-fixed";
74
- pinctrl-names = "default";
75
- pinctrl-0 = <&mmc1_vcc_en_pin_t004>;
7674 regulator-name = "vmmc1";
7775 regulator-min-microvolt = <3300000>;
7876 regulator-max-microvolt = <3300000>;
....@@ -86,8 +84,6 @@
8684 };
8785
8886 &i2c0 {
89
- pinctrl-names = "default";
90
- pinctrl-0 = <&i2c0_pins_a>;
9187 status = "okay";
9288
9389 axp152: pmic@30 {
....@@ -100,8 +96,6 @@
10096 };
10197
10298 &mmc0 {
103
- pinctrl-names = "default";
104
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_t004>;
10599 vmmc-supply = <&reg_vcc3v3>;
106100 bus-width = <4>;
107101 cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
....@@ -109,8 +103,6 @@
109103 };
110104
111105 &mmc1 {
112
- pinctrl-names = "default";
113
- pinctrl-0 = <&mmc1_pins_a>;
114106 vmmc-supply = <&reg_vmmc1>;
115107 bus-width = <4>;
116108 non-removable;
....@@ -127,24 +119,7 @@
127119 };
128120
129121 &pio {
130
- usb0_id_detect_pin: usb0_id_detect_pin@0 {
131
- pins = "PG12";
132
- function = "gpio_in";
133
- bias-pull-up;
134
- };
135
-
136
- mmc0_cd_pin_t004: mmc0_cd_pin@0 {
137
- pins = "PG1";
138
- function = "gpio_in";
139
- bias-pull-up;
140
- };
141
-
142
- mmc1_vcc_en_pin_t004: mmc1_vcc_en_pin@0 {
143
- pins = "PB18";
144
- function = "gpio_out";
145
- };
146
-
147
- led_pins_t004: led_pins@0 {
122
+ led_pins_t004: led-pin {
148123 pins = "PB2";
149124 function = "gpio_out";
150125 drive-strength = <20>;
....@@ -158,7 +133,7 @@
158133
159134 &uart0 {
160135 pinctrl-names = "default";
161
- pinctrl-0 = <&uart0_pins_a>;
136
+ pinctrl-0 = <&uart0_pb_pins>;
162137 status = "okay";
163138 };
164139
....@@ -168,9 +143,7 @@
168143 };
169144
170145 &usbphy {
171
- pinctrl-names = "default";
172
- pinctrl-0 = <&usb0_id_detect_pin>;
173
- usb0_id_det-gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
146
+ usb0_id_det-gpios = <&pio 6 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG12 */
174147 usb1_vbus-supply = <&reg_usb1_vbus>;
175148 status = "okay";
176149 };