hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/sun6i-a31-colombus.dts
....@@ -60,13 +60,11 @@
6060 stdout-path = "serial0:115200n8";
6161 };
6262
63
- i2c_lcd: i2c@0 {
63
+ i2c_lcd: i2c {
6464 /* The lcd panel i2c interface is hooked up via gpios */
6565 compatible = "i2c-gpio";
66
- pinctrl-names = "default";
67
- pinctrl-0 = <&i2c_lcd_pins>;
68
- gpios = <&pio 0 23 GPIO_ACTIVE_HIGH>, /* PA23, sda */
69
- <&pio 0 24 GPIO_ACTIVE_HIGH>; /* PA24, scl */
66
+ sda-gpios = <&pio 0 23 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PA23 */
67
+ scl-gpios = <&pio 0 24 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PA24 */
7068 i2c-gpio,delay-us = <5>;
7169 };
7270 };
....@@ -77,31 +75,21 @@
7775
7876 &gmac {
7977 pinctrl-names = "default";
80
- pinctrl-0 = <&gmac_pins_rgmii_a>;
81
- phy = <&phy1>;
78
+ pinctrl-0 = <&gmac_rgmii_pins>;
79
+ phy-handle = <&phy1>;
8280 phy-mode = "rgmii";
8381 status = "okay";
84
-
85
- phy1: ethernet-phy@1 {
86
- reg = <1>;
87
- };
8882 };
8983
9084 &i2c0 {
91
- pinctrl-names = "default";
92
- pinctrl-0 = <&i2c0_pins_a>;
9385 status = "fail";
9486 };
9587
9688 &i2c1 {
97
- pinctrl-names = "default";
98
- pinctrl-0 = <&i2c1_pins_a>;
9989 status = "okay";
10090 };
10191
10292 &i2c2 {
103
- pinctrl-names = "default";
104
- pinctrl-0 = <&i2c2_pins_a>;
10593 status = "okay";
10694
10795 mma8452: mma8452@1d {
....@@ -112,48 +100,27 @@
112100 };
113101 };
114102
103
+&mdio {
104
+ phy1: ethernet-phy@1 {
105
+ reg = <1>;
106
+ };
107
+};
108
+
115109 &mmc0 {
116
- pinctrl-names = "default";
117
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_colombus>;
118110 vmmc-supply = <&reg_vcc3v0>;
119111 bus-width = <4>;
120112 cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
121113 status = "okay";
122114 };
123115
124
-&mmc0_pins_a {
125
- bias-pull-up;
126
-};
127
-
128
-&pio {
129
- mmc0_cd_pin_colombus: mmc0_cd_pin@0 {
130
- pins = "PA8";
131
- function = "gpio_in";
132
- bias-pull-up;
133
- };
134
-
135
- usb2_vbus_pin_colombus: usb2_vbus_pin@0 {
136
- pins = "PH24";
137
- function = "gpio_out";
138
- };
139
-
140
- i2c_lcd_pins: i2c_lcd_pin@0 {
141
- pins = "PA23", "PA24";
142
- function = "gpio_out";
143
- bias-pull-up;
144
- };
145
-};
146
-
147116 &reg_usb2_vbus {
148
- pinctrl-names = "default";
149
- pinctrl-0 = <&usb2_vbus_pin_colombus>;
150117 gpio = <&pio 7 24 GPIO_ACTIVE_HIGH>;
151118 status = "okay";
152119 };
153120
154121 &uart0 {
155122 pinctrl-names = "default";
156
- pinctrl-0 = <&uart0_pins_a>;
123
+ pinctrl-0 = <&uart0_ph_pins>;
157124 status = "okay";
158125 };
159126