Skip to content

Conversation

@galak
Copy link
Contributor

@galak galak commented Apr 28, 2020

The SoC node has compatibles for the specific SoC in place, having the
same compatible at the top level is technically a conflict and the
top-level one should really just be about the board. Remove the SoC
related compatibles at the top-level.

Signed-off-by: Kumar Gala [email protected]

The SoC node has compatibles for the specific SoC in place, having the
same compatible at the top level is technically a conflict and the
top-level one should really just be about the board.  Remove the SoC
related compatibles at the top-level.

Signed-off-by: Kumar Gala <[email protected]>
@zephyrbot
Copy link

All checks passed.

checkpatch (informational only, not a failure)

-:11: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "seeed,carbon_nrf51" appears un-documented -- check ./dts/bindings/
#11: FILE: boards/arm/96b_carbon_nrf51/96b_carbon_nrf51.dts:12:
+	compatible = "seeed,carbon_nrf51";

-:11: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "seeed" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#11: FILE: boards/arm/96b_carbon_nrf51/96b_carbon_nrf51.dts:12:
+	compatible = "seeed,carbon_nrf51";

-:25: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "seeed,nitrogen" appears un-documented -- check ./dts/bindings/
#25: FILE: boards/arm/96b_nitrogen/96b_nitrogen.dts:13:
+	compatible = "seeed,nitrogen";

-:25: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "seeed" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#25: FILE: boards/arm/96b_nitrogen/96b_nitrogen.dts:13:
+	compatible = "seeed,nitrogen";

-:39: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "actinius,icarus" appears un-documented -- check ./dts/bindings/
#39: FILE: boards/arm/actinius_icarus/actinius_icarus_common.dts:9:
+	compatible = "actinius,icarus";

-:39: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "actinius" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#39: FILE: boards/arm/actinius_icarus/actinius_icarus_common.dts:9:
+	compatible = "actinius,icarus";

-:52: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "adafruit,feather-nrf52840" appears un-documented -- check ./dts/bindings/
#52: FILE: boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840.dts:13:
+	compatible = "adafruit,feather-nrf52840";

-:65: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "bbc,microbit" appears un-documented -- check ./dts/bindings/
#65: FILE: boards/arm/bbc_microbit/bbc_microbit.dts:12:
+	compatible = "bbc,microbit";

-:65: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "bbc" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#65: FILE: boards/arm/bbc_microbit/bbc_microbit.dts:12:
+	compatible = "bbc,microbit";

-:79: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "laird,bl652_dvk" appears un-documented -- check ./dts/bindings/
#79: FILE: boards/arm/bl652_dvk/bl652_dvk.dts:12:
+	compatible = "laird,bl652_dvk";

-:93: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "nordic,pca10056-dk" appears un-documented -- check ./dts/bindings/
#93: FILE: boards/arm/bl654_dvk/bl654_dvk.dts:12:
+	compatible = "nordic,pca10056-dk";

-:107: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "decawave,dwm1001" appears un-documented -- check ./dts/bindings/
#107: FILE: boards/arm/decawave_dwm1001_dev/decawave_dwm1001_dev.dts:12:
+	compatible = "decawave,dwm1001";

-:107: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "decawave" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#107: FILE: boards/arm/decawave_dwm1001_dev/decawave_dwm1001_dev.dts:12:
+	compatible = "decawave,dwm1001";

-:121: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "nordic,pca10056-dk" appears un-documented -- check ./dts/bindings/
#121: FILE: boards/arm/degu_evk/degu_evk.dts:12:
+	compatible = "nordic,pca10056-dk";

-:135: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "holyiot,yj-16019" appears un-documented -- check ./dts/bindings/
#135: FILE: boards/arm/holyiot_yj16019/holyiot_yj16019.dts:12:
+	compatible = "holyiot,yj-16019";

-:135: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "holyiot" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#135: FILE: boards/arm/holyiot_yj16019/holyiot_yj16019.dts:12:
+	compatible = "holyiot,yj-16019";

-:148: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "waveshare,BLE400" appears un-documented -- check ./dts/bindings/
#148: FILE: boards/arm/nrf51_ble400/nrf51_ble400.dts:12:
+	compatible = "waveshare,BLE400";

-:148: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "waveshare" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#148: FILE: boards/arm/nrf51_ble400/nrf51_ble400.dts:12:
+	compatible = "waveshare,BLE400";

-:162: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "redbear,blenano" appears un-documented -- check ./dts/bindings/
#162: FILE: boards/arm/nrf51_blenano/nrf51_blenano.dts:12:
+	compatible = "redbear,blenano";

-:162: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "redbear" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#162: FILE: boards/arm/nrf51_blenano/nrf51_blenano.dts:12:
+	compatible = "redbear,blenano";

-:176: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "vng,vbluno51" appears un-documented -- check ./dts/bindings/
#176: FILE: boards/arm/nrf51_vbluno51/nrf51_vbluno51.dts:12:
+	compatible = "vng,vbluno51";

-:176: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "vng" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#176: FILE: boards/arm/nrf51_vbluno51/nrf51_vbluno51.dts:12:
+	compatible = "vng,vbluno51";

-:190: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "nordic,nrf51-dk-nrf51422" appears un-documented -- check ./dts/bindings/
#190: FILE: boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422.dts:12:
+	compatible = "nordic,nrf51-dk-nrf51422";

-:204: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "nordic,nrf51-dongle-nrf51422" appears un-documented -- check ./dts/bindings/
#204: FILE: boards/arm/nrf51dongle_nrf51422/nrf51dongle_nrf51422.dts:12:
+	compatible = "nordic,nrf51-dongle-nrf51422";

-:218: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "nrf52832-mdk" appears un-documented -- check ./dts/bindings/
#218: FILE: boards/arm/nrf52832_mdk/nrf52832_mdk.dts:13:
+	compatible = "nrf52832-mdk";

-:232: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "nordic,nrf52833-dk-nrf52833" appears un-documented -- check ./dts/bindings/
#232: FILE: boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833.dts:12:
+	compatible = "nordic,nrf52833-dk-nrf52833";

-:246: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "nordic,pca10056-dk" appears un-documented -- check ./dts/bindings/
#246: FILE: boards/arm/nrf52840_blip/nrf52840_blip.dts:15:
+	compatible = "nordic,pca10056-dk";

-:260: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "nordic,pca10056-dk" appears un-documented -- check ./dts/bindings/
#260: FILE: boards/arm/nrf52840_mdk/nrf52840_mdk.dts:12:
+	compatible = "nordic,pca10056-dk";

-:274: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "nordic,pca10056-dk" appears un-documented -- check ./dts/bindings/
#274: FILE: boards/arm/nrf52840_papyr/nrf52840_papyr.dts:12:
+	compatible = "nordic,pca10056-dk";

-:288: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "nordic,nrf52840-dk-nrf52811" appears un-documented -- check ./dts/bindings/
#288: FILE: boards/arm/nrf52840dk_nrf52811/nrf52840dk_nrf52811.dts:12:
+	compatible = "nordic,nrf52840-dk-nrf52811";

-:302: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "nordic,nrf52840-dk-nrf52840" appears un-documented -- check ./dts/bindings/
#302: FILE: boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts:12:
+	compatible = "nordic,nrf52840-dk-nrf52840";

-:316: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "nordic,nrf52840-dongle-nrf52840" appears un-documented -- check ./dts/bindings/
#316: FILE: boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840.dts:13:
+	compatible = "nordic,nrf52840-dongle-nrf52840";

-:330: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "adafruit,nrf52_adafruit_feather" appears un-documented -- check ./dts/bindings/
#330: FILE: boards/arm/nrf52_adafruit_feather/nrf52_adafruit_feather.dts:14:
+	compatible = "adafruit,nrf52_adafruit_feather";

-:344: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "redbear,blenano2" appears un-documented -- check ./dts/bindings/
#344: FILE: boards/arm/nrf52_blenano2/nrf52_blenano2.dts:12:
+	compatible = "redbear,blenano2";

-:344: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "redbear" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#344: FILE: boards/arm/nrf52_blenano2/nrf52_blenano2.dts:12:
+	compatible = "redbear,blenano2";

-:358: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "sparkfun,nrf52832" appears un-documented -- check ./dts/bindings/
#358: FILE: boards/arm/nrf52_sparkfun/nrf52_sparkfun.dts:13:
+	compatible = "sparkfun,nrf52832";

-:358: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "sparkfun" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#358: FILE: boards/arm/nrf52_sparkfun/nrf52_sparkfun.dts:13:
+	compatible = "sparkfun,nrf52832";

-:372: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "vng,vbluno52" appears un-documented -- check ./dts/bindings/
#372: FILE: boards/arm/nrf52_vbluno52/nrf52_vbluno52.dts:12:
+	compatible = "vng,vbluno52";

-:372: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "vng" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#372: FILE: boards/arm/nrf52_vbluno52/nrf52_vbluno52.dts:12:
+	compatible = "vng,vbluno52";

-:386: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "nordic,nrf52-dk-nrf52810" appears un-documented -- check ./dts/bindings/
#386: FILE: boards/arm/nrf52dk_nrf52810/nrf52dk_nrf52810.dts:14:
+	compatible = "nordic,nrf52-dk-nrf52810";

-:400: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "nordic,nrf52-dk-nrf52832" appears un-documented -- check ./dts/bindings/
#400: FILE: boards/arm/nrf52dk_nrf52832/nrf52dk_nrf52832.dts:13:
+	compatible = "nordic,nrf52-dk-nrf52832";

-:414: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "innblue,innblue21" appears un-documented -- check ./dts/bindings/
#414: FILE: boards/arm/nrf9160_innblue21/nrf9160_innblue21_common.dts:9:
+	compatible = "innblue,innblue21";

-:414: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "innblue" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#414: FILE: boards/arm/nrf9160_innblue21/nrf9160_innblue21_common.dts:9:
+	compatible = "innblue,innblue21";

-:428: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "innblue,innblue22" appears un-documented -- check ./dts/bindings/
#428: FILE: boards/arm/nrf9160_innblue22/nrf9160_innblue22_common.dts:9:
+	compatible = "innblue,innblue22";

-:428: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "innblue" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#428: FILE: boards/arm/nrf9160_innblue22/nrf9160_innblue22_common.dts:9:
+	compatible = "innblue,innblue22";

-:442: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "nordic,nrf9160-dk-nrf52840" appears un-documented -- check ./dts/bindings/
#442: FILE: boards/arm/nrf9160dk_nrf52840/nrf9160dk_nrf52840.dts:13:
+	compatible = "nordic,nrf9160-dk-nrf52840";

-:456: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "nordic,nrf9160-dk-nrf9160" appears un-documented -- check ./dts/bindings/
#456: FILE: boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_common.dts:9:
+	compatible = "nordic,nrf9160-dk-nrf9160";

-:470: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "particle,argon" appears un-documented -- check ./dts/bindings/
#470: FILE: boards/arm/particle_argon/particle_argon.dts:14:
+	compatible = "particle,argon", "particle,feather";

-:470: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "particle" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#470: FILE: boards/arm/particle_argon/particle_argon.dts:14:
+	compatible = "particle,argon", "particle,feather";

-:470: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "particle,feather" appears un-documented -- check ./dts/bindings/
#470: FILE: boards/arm/particle_argon/particle_argon.dts:14:
+	compatible = "particle,argon", "particle,feather";

-:470: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "particle" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#470: FILE: boards/arm/particle_argon/particle_argon.dts:14:
+	compatible = "particle,argon", "particle,feather";

-:484: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "particle,boron" appears un-documented -- check ./dts/bindings/
#484: FILE: boards/arm/particle_boron/particle_boron.dts:14:
+	compatible = "particle,boron", "particle,feather";

-:484: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "particle" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#484: FILE: boards/arm/particle_boron/particle_boron.dts:14:
+	compatible = "particle,boron", "particle,feather";

-:484: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "particle,feather" appears un-documented -- check ./dts/bindings/
#484: FILE: boards/arm/particle_boron/particle_boron.dts:14:
+	compatible = "particle,boron", "particle,feather";

-:484: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "particle" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#484: FILE: boards/arm/particle_boron/particle_boron.dts:14:
+	compatible = "particle,boron", "particle,feather";

-:498: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "particle,xenon" appears un-documented -- check ./dts/bindings/
#498: FILE: boards/arm/particle_xenon/particle_xenon.dts:14:
+	compatible = "particle,xenon", "particle,feather";

-:498: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "particle" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#498: FILE: boards/arm/particle_xenon/particle_xenon.dts:14:
+	compatible = "particle,xenon", "particle,feather";

-:498: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "particle,feather" appears un-documented -- check ./dts/bindings/
#498: FILE: boards/arm/particle_xenon/particle_xenon.dts:14:
+	compatible = "particle,xenon", "particle,feather";

-:498: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "particle" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#498: FILE: boards/arm/particle_xenon/particle_xenon.dts:14:
+	compatible = "particle,xenon", "particle,feather";

-:511: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "bbc,qemu-microbit" appears un-documented -- check ./dts/bindings/
#511: FILE: boards/arm/qemu_cortex_m0/qemu_cortex_m0.dts:13:
+	compatible = "bbc,qemu-microbit";

-:511: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "bbc" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#511: FILE: boards/arm/qemu_cortex_m0/qemu_cortex_m0.dts:13:
+	compatible = "bbc,qemu-microbit";

-:525: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "phytec,reel_board" appears un-documented -- check ./dts/bindings/
#525: FILE: boards/arm/reel_board/reel_board.dts:14:
+	compatible = "phytec,reel_board";

-:539: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "phytec,reel_board_v2" appears un-documented -- check ./dts/bindings/
#539: FILE: boards/arm/reel_board/reel_board_v2.dts:14:
+	compatible = "phytec,reel_board_v2";

-:553: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "nordic,thingy52-nrf52832" appears un-documented -- check ./dts/bindings/
#553: FILE: boards/arm/thingy52_nrf52832/thingy52_nrf52832.dts:14:
+	compatible = "nordic,thingy52-nrf52832";

-:566: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "bsim,nrf52832" appears un-documented -- check ./dts/bindings/
#566: FILE: boards/posix/nrf52_bsim/nrf52_bsim.dts:13:
+	compatible = "bsim,nrf52832";

-:566: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "bsim" appears un-documented -- check ./dts/bindings/vendor-prefixes.txt
#566: FILE: boards/posix/nrf52_bsim/nrf52_bsim.dts:13:
+	compatible = "bsim,nrf52832";

-:580: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "nordic,nrf52840-dk-nrf52840" appears un-documented -- check ./dts/bindings/
#580: FILE: samples/application_development/out_of_tree_board/boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts:12:
+	compatible = "nordic,nrf52840-dk-nrf52840";

- total: 0 errors, 67 warnings, 373 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
      mechanically convert to the typical style using --fix or --fix-inplace.

Your patch has style problems, please review.

NOTE: Ignored message types: AVOID_EXTERNS BRACES CONFIG_EXPERIMENTAL CONST_STRUCT DATE_TIME FILE_PATH_CHANGES MINMAX NETWORKING_BLOCK_COMMENT_STYLE PRINTK_WITHOUT_KERN_LEVEL SPLIT_STRING VOLATILE

NOTE: If any of the errors are false positives, please report
      them to the maintainers.

Tip: The bot edits this comment instead of posting a new one, so you can check the comment's history to see earlier messages.

@aescolar aescolar removed their request for review April 28, 2020 17:17
/ {
model = "QEMU Cortex-M0";
compatible = "nordic,nrf51822-qfaa", "nordic,nrf51822";
compatible = "bbc,qemu-microbit";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ioannisg is this OK?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so , yes

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

qemu_cortex_m0 is emulating a bbc-micro bit

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's why I called in qemu-microbit, otherwise I'd argue we could have just used the microbit board port.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. FWIW, the reason we did not use the microbit board port directly, is that QEMU does not emulate RTC but just the TIMER nRF peripheral, so we needed a new timer driver; this made me thing we could just have a separate qemu board with a local timer driver :)

Copy link
Contributor

@mbolivar-nordic mbolivar-nordic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine; AFAIK we don't use these anywhere

Copy link
Member

@ioannisg ioannisg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine to me

@galak
Copy link
Contributor Author

galak commented Apr 29, 2020

This isn't going to pass CI because of the large number of boards touched. As mentioned we don't use the top-level compat for anything so this will have no impact. Going to merge.

@galak galak merged commit d929e87 into zephyrproject-rtos:master Apr 29, 2020
@galak galak deleted the nrf-board-compat-cleanup branch April 29, 2020 13:20
@pabigot
Copy link
Contributor

pabigot commented Apr 29, 2020

I love (not) when stuff that touches a bunch of files gets fast-tracked and merged with input from a small subset of those affected. First I saw of this was #24769 (review) and it was already too late.

This removed compatibles at the root that are not present anywhere else: e.g. there's no longer a visible compatible to identify a particle,feather which is the generic of particle,xenon.

It's not that it's a big deal, but I put that there for a reason, and now I need another solution.

@pabigot
Copy link
Contributor

pabigot commented Apr 29, 2020

I misread what this changed (it conflicted with a local change during rebase). Sorry, looks like this wasn't the cause of my problem.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants