Skip to content

Commit 4805c2b

Browse files
committed
fix type of gpio driver
1 parent ecb1cef commit 4805c2b

File tree

7 files changed

+9
-8
lines changed

7 files changed

+9
-8
lines changed

devices/nrf/nrf52810.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
</driver>
103103
<driver name="uicr" type="nrf52"/>
104104
<driver name="wdt" type="nrf52"/>
105-
<driver name="gpio" type="nrf">
105+
<driver name="gpio" type="nrf52">
106106
<signal driver="uart" instance="0" name="rts"/>
107107
<signal driver="uart" instance="0" name="txd"/>
108108
<signal driver="uart" instance="0" name="cts"/>

devices/nrf/nrf52811.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
</driver>
106106
<driver name="uicr" type="nrf52"/>
107107
<driver name="wdt" type="nrf52"/>
108-
<driver name="gpio" type="nrf">
108+
<driver name="gpio" type="nrf52">
109109
<signal driver="uart" instance="0" name="rts"/>
110110
<signal driver="uart" instance="0" name="txd"/>
111111
<signal driver="uart" instance="0" name="cts"/>

devices/nrf/nrf52820.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<driver name="uicr" type="nrf52"/>
109109
<driver name="usbd" type="nrf52"/>
110110
<driver name="wdt" type="nrf52"/>
111-
<driver name="gpio" type="nrf">
111+
<driver name="gpio" type="nrf52">
112112
<signal driver="uart" instance="0" name="rts"/>
113113
<signal driver="uart" instance="0" name="txd"/>
114114
<signal driver="uart" instance="0" name="cts"/>

devices/nrf/nrf52832.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
</driver>
139139
<driver name="uicr" type="nrf52"/>
140140
<driver name="wdt" type="nrf52"/>
141-
<driver name="gpio" type="nrf">
141+
<driver name="gpio" type="nrf52">
142142
<signal driver="uarte" instance="0" name="rts"/>
143143
<signal driver="uarte" instance="0" name="txd"/>
144144
<signal driver="uarte" instance="0" name="cts"/>

devices/nrf/nrf52833.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
<driver name="uicr" type="nrf52"/>
144144
<driver name="usbd" type="nrf52"/>
145145
<driver name="wdt" type="nrf52"/>
146-
<driver name="gpio" type="nrf">
146+
<driver name="gpio" type="nrf52">
147147
<signal driver="uart" instance="0" name="rts"/>
148148
<signal driver="uart" instance="0" name="txd"/>
149149
<signal driver="uart" instance="0" name="cts"/>

devices/nrf/nrf52840.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
<driver name="uicr" type="nrf52"/>
150150
<driver name="usbd" type="nrf52"/>
151151
<driver name="wdt" type="nrf52"/>
152-
<driver name="gpio" type="nrf">
152+
<driver name="gpio" type="nrf52">
153153
<signal driver="uart" instance="0" name="rts"/>
154154
<signal driver="uart" instance="0" name="txd"/>
155155
<signal driver="uart" instance="0" name="cts"/>

tools/generator/dfg/nrf/nrf_device_tree.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,11 +233,12 @@ def driverOrder(e):
233233
else:
234234
modules[m].append(i)
235235

236+
237+
compatible = p['id']['platform'] + p['id']['family']
236238
# add all other modules
237239
for name, instances in modules.items():
238240
driver = tree.addChild('driver')
239241
dtype = name
240-
compatible = p['id']['platform'] + p['id']['family']
241242

242243
driver.setAttributes('name', dtype, 'type', compatible)
243244
# Add all instances to this driver
@@ -249,7 +250,7 @@ def driverOrder(e):
249250

250251
# GPIO driver
251252
gpio_driver = tree.addChild('driver')
252-
gpio_driver.setAttributes('name', 'gpio', 'type', 'nrf')
253+
gpio_driver.setAttributes('name', 'gpio', 'type', compatible)
253254
# gpio_driver.addSortKey(lambda e : (e['port'], int(e['pin'])))
254255

255256
# add all signals

0 commit comments

Comments
 (0)