forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
....@@ -61,8 +61,6 @@
6161
6262 leds {
6363 compatible = "gpio-leds";
64
- pinctrl-names = "default";
65
- pinctrl-0 = <&led_pins_i12_tvbox>;
6664
6765 red {
6866 label = "i12_tvbox:red:usr";
....@@ -77,8 +75,6 @@
7775
7876 reg_vmmc3: vmmc3 {
7977 compatible = "regulator-fixed";
80
- pinctrl-names = "default";
81
- pinctrl-0 = <&vmmc3_pin_i12_tvbox>;
8278 regulator-name = "vmmc3";
8379 regulator-min-microvolt = <3300000>;
8480 regulator-max-microvolt = <3300000>;
....@@ -88,8 +84,6 @@
8884
8985 reg_vmmc3_io: vmmc3-io {
9086 compatible = "regulator-fixed";
91
- pinctrl-names = "default";
92
- pinctrl-0 = <&vmmc3_io_pin_i12_tvbox>;
9387 regulator-name = "vmmc3-io";
9488 regulator-min-microvolt = <3300000>;
9589 regulator-max-microvolt = <3300000>;
....@@ -101,8 +95,6 @@
10195
10296 reg_gmac_3v3: gmac-3v3 {
10397 compatible = "regulator-fixed";
104
- pinctrl-names = "default";
105
- pinctrl-0 = <&gmac_power_pin_i12_tvbox>;
10698 regulator-name = "gmac-3v3";
10799 regulator-min-microvolt = <3300000>;
108100 regulator-max-microvolt = <3300000>;
....@@ -122,20 +114,14 @@
122114
123115 &gmac {
124116 pinctrl-names = "default";
125
- pinctrl-0 = <&gmac_pins_mii_a>;
126
- phy = <&phy1>;
117
+ pinctrl-0 = <&gmac_mii_pins>;
118
+ phy-handle = <&phy1>;
127119 phy-mode = "mii";
128120 phy-supply = <&reg_gmac_3v3>;
129121 status = "okay";
130
-
131
- phy1: ethernet-phy@1 {
132
- reg = <1>;
133
- };
134122 };
135123
136124 &i2c0 {
137
- pinctrl-names = "default";
138
- pinctrl-0 = <&i2c0_pins_a>;
139125 status = "okay";
140126
141127 axp209: pmic@34 {
....@@ -151,13 +137,17 @@
151137
152138 &ir0 {
153139 pinctrl-names = "default";
154
- pinctrl-0 = <&ir0_rx_pins_a>;
140
+ pinctrl-0 = <&ir0_rx_pin>;
155141 status = "okay";
156142 };
157143
144
+&gmac_mdio {
145
+ phy1: ethernet-phy@1 {
146
+ reg = <1>;
147
+ };
148
+};
149
+
158150 &mmc0 {
159
- pinctrl-names = "default";
160
- pinctrl-0 = <&mmc0_pins_a>;
161151 vmmc-supply = <&reg_vcc3v3>;
162152 bus-width = <4>;
163153 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
....@@ -165,8 +155,6 @@
165155 };
166156
167157 &mmc3 {
168
- pinctrl-names = "default";
169
- pinctrl-0 = <&mmc3_pins_a>;
170158 vmmc-supply = <&reg_vmmc3>;
171159 bus-width = <4>;
172160 non-removable;
....@@ -181,39 +169,12 @@
181169 };
182170 };
183171
184
-&mmc3_pins_a {
185
- /* AP6210 / AP6330 requires pull-up */
186
- bias-pull-up;
187
-};
188
-
189172 &ohci0 {
190173 status = "okay";
191174 };
192175
193176 &ohci1 {
194177 status = "okay";
195
-};
196
-
197
-&pio {
198
- vmmc3_pin_i12_tvbox: vmmc3_pin@0 {
199
- pins = "PH2";
200
- function = "gpio_out";
201
- };
202
-
203
- vmmc3_io_pin_i12_tvbox: vmmc3_io_pin@0 {
204
- pins = "PH12";
205
- function = "gpio_out";
206
- };
207
-
208
- gmac_power_pin_i12_tvbox: gmac_power_pin@0 {
209
- pins = "PH21";
210
- function = "gpio_out";
211
- };
212
-
213
- led_pins_i12_tvbox: led_pins@0 {
214
- pins = "PH9", "PH20";
215
- function = "gpio_out";
216
- };
217178 };
218179
219180 &reg_usb1_vbus {
....@@ -226,7 +187,7 @@
226187
227188 &uart0 {
228189 pinctrl-names = "default";
229
- pinctrl-0 = <&uart0_pins_a>;
190
+ pinctrl-0 = <&uart0_pb_pins>;
230191 status = "okay";
231192 };
232193