.. | .. |
---|
60 | 60 | stdout-path = "serial0:115200n8"; |
---|
61 | 61 | }; |
---|
62 | 62 | |
---|
63 | | - i2c_lcd: i2c@0 { |
---|
| 63 | + i2c_lcd: i2c { |
---|
64 | 64 | /* The lcd panel i2c interface is hooked up via gpios */ |
---|
65 | 65 | 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 */ |
---|
70 | 68 | i2c-gpio,delay-us = <5>; |
---|
71 | 69 | }; |
---|
72 | 70 | }; |
---|
.. | .. |
---|
77 | 75 | |
---|
78 | 76 | &gmac { |
---|
79 | 77 | pinctrl-names = "default"; |
---|
80 | | - pinctrl-0 = <&gmac_pins_rgmii_a>; |
---|
81 | | - phy = <&phy1>; |
---|
| 78 | + pinctrl-0 = <&gmac_rgmii_pins>; |
---|
| 79 | + phy-handle = <&phy1>; |
---|
82 | 80 | phy-mode = "rgmii"; |
---|
83 | 81 | status = "okay"; |
---|
84 | | - |
---|
85 | | - phy1: ethernet-phy@1 { |
---|
86 | | - reg = <1>; |
---|
87 | | - }; |
---|
88 | 82 | }; |
---|
89 | 83 | |
---|
90 | 84 | &i2c0 { |
---|
91 | | - pinctrl-names = "default"; |
---|
92 | | - pinctrl-0 = <&i2c0_pins_a>; |
---|
93 | 85 | status = "fail"; |
---|
94 | 86 | }; |
---|
95 | 87 | |
---|
96 | 88 | &i2c1 { |
---|
97 | | - pinctrl-names = "default"; |
---|
98 | | - pinctrl-0 = <&i2c1_pins_a>; |
---|
99 | 89 | status = "okay"; |
---|
100 | 90 | }; |
---|
101 | 91 | |
---|
102 | 92 | &i2c2 { |
---|
103 | | - pinctrl-names = "default"; |
---|
104 | | - pinctrl-0 = <&i2c2_pins_a>; |
---|
105 | 93 | status = "okay"; |
---|
106 | 94 | |
---|
107 | 95 | mma8452: mma8452@1d { |
---|
.. | .. |
---|
112 | 100 | }; |
---|
113 | 101 | }; |
---|
114 | 102 | |
---|
| 103 | +&mdio { |
---|
| 104 | + phy1: ethernet-phy@1 { |
---|
| 105 | + reg = <1>; |
---|
| 106 | + }; |
---|
| 107 | +}; |
---|
| 108 | + |
---|
115 | 109 | &mmc0 { |
---|
116 | | - pinctrl-names = "default"; |
---|
117 | | - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_colombus>; |
---|
118 | 110 | vmmc-supply = <®_vcc3v0>; |
---|
119 | 111 | bus-width = <4>; |
---|
120 | 112 | cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */ |
---|
121 | 113 | status = "okay"; |
---|
122 | 114 | }; |
---|
123 | 115 | |
---|
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 | | - |
---|
147 | 116 | ®_usb2_vbus { |
---|
148 | | - pinctrl-names = "default"; |
---|
149 | | - pinctrl-0 = <&usb2_vbus_pin_colombus>; |
---|
150 | 117 | gpio = <&pio 7 24 GPIO_ACTIVE_HIGH>; |
---|
151 | 118 | status = "okay"; |
---|
152 | 119 | }; |
---|
153 | 120 | |
---|
154 | 121 | &uart0 { |
---|
155 | 122 | pinctrl-names = "default"; |
---|
156 | | - pinctrl-0 = <&uart0_pins_a>; |
---|
| 123 | + pinctrl-0 = <&uart0_ph_pins>; |
---|
157 | 124 | status = "okay"; |
---|
158 | 125 | }; |
---|
159 | 126 | |
---|