Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ARM: dts: Add coralreef device tree #215

Merged
merged 3 commits into from
Mar 14, 2025

Conversation

DeborahOoi96
Copy link

@DeborahOoi96 DeborahOoi96 commented Mar 13, 2025

WI: AB#2959890

Changes required to build ni-coralreef.dts with updated zynq-7000.dtsi device tree bindings. Largely copied from ni-bluefin.dts.

Testing: Manually built kernel with changes and observed that ni-coralreef.dtb does show up. Decompiled resulting ni-coralreef.dtb via dtc to ensure changes are applied.

@gratian gratian requested a review from a team March 13, 2025 16:12
@gratian
Copy link
Contributor

gratian commented Mar 13, 2025

@DeborahOoi96 can you squash/combine the fixes in commits:

  • 9e84022 ni-coralreef: reverse port order
  • e205381 ni-coralreef: use the correct led color

into the commit that adds the device tree:

  • 6f8b2d9 ni-coralreef: add device tree

They look like fixes to the original commit and there is no reason to have to carry them separately.

Everything else looks fine.

@DeborahOoi96 DeborahOoi96 force-pushed the deooi/AddCoralreefDT branch 2 times, most recently from 0e1550b to 79ba672 Compare March 14, 2025 06:53
bstreiff and others added 3 commits March 14, 2025 17:14
Copied largely from ni-bluefin.dts, but with more DSA ports and USB gone.
Updated port order such that "sw0" lines up with "Port 0" etc.
Updated status LED to be a bicolour blue and yellow LED, not green.

Signed-off-by: Brandon Streiff <brandon.streiff@ni.com>
Acked-by: Kyle Roeschley <kyle.roeschley@ni.com>
Acked-by: Erik Hons <erik.hons@ni.com>
Acked-by: Haris Okanovic <haris.okanovic@ni.com>

Natinst-ReviewBoard-ID: 310589
(cherry picked from commit 3b0fa2e)

Natinst-ReviewBoard-ID: 320599
(cherry picked from commit ff0acb4)

Natinst-ReviewBoard-ID: 325354
(cherry picked from commit 83855f3)

Signed-off-by: deooi <deborah.ooi@ni.com>
Move ni-coralreef.dts to the xilinx folder together with the
other xilinx devices.

Signed-off-by: deooi <deborah.ooi@ni.com>
zynq-7000.dtsi contains updated AMBA and GPIO device tree node phandles.
Adopt these changes by referencing i2c0 phandle instead of amba node for
overriding i2c bindings, and refer to gpio0 phandle instead of gpio.

Signed-off-by: deooi <deborah.ooi@ni.com>
@DeborahOoi96 DeborahOoi96 force-pushed the deooi/AddCoralreefDT branch from 79ba672 to 3b25e6f Compare March 14, 2025 09:29
@gratian gratian merged commit 1e2fe29 into ni:nilrt/master/6.6 Mar 14, 2025
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants