Skip to content

Conversation

@kkang-NI
Copy link

@kkang-NI kkang-NI commented Apr 22, 2025

migrated ni-slsc-12001.dts related changes from branch dev/slsc/1.0/4.1 to ni/linux repo branch nilrt/master/6.6.

The commits:
33bb24ec422d56e nati_slsc_dts: Add device tree for SLSC
bd53913ffd7ca2c nati_slsc_dts: Correct SPI settings on device tree
9cf417b917ca50c nati_slsc_dts: fix IRQ for spi7/8
4a9c9dedc9c57d1 nati_slsc_dts: Add SLSC FPGA to Device Tree
05d7cb71400076f nati_slsc_dts: Remove trailing whitespace
85377cbaf33a07c nati_slsc_dts: Correct device info in device tree
489cdc8c332e7f6 nati_slsc_dts: pull in Tecate dts for 4.1 Linux kernel
3dac1d2e2886d11 nati_slsc_dts: Remove unused devices in dts
4740c7033c40894 nati_slsc_dts: Use spidev as compatible type in dts
297230220f55b18 nati_slsc_12001_dts: Rename dts file with model name
31600f928cd20af nati_slsc_12001_dts: Fix the format of the dts
e3a89e6e7022b6e nati_slsc_12001_dts: set SLSC FPGA compatible id to ni,slscfpga
a5f550aed87eb66 nati_slsc_12001_dts: Add AD7291 ADC to device tree
b662f5d16e2e2f4 nati_slsc_12001_dts: Enforce level trigger for slscfpga IRQ
5fd9c31cd9ac578 nati_slsc_12001_dts: Reduce SPI max frequency m25p80 device

Additional:
removed execute permissions of ni-slsc-12001.dts file.
added SPDX-License-Identifier on top of the file.
move the file to xilinx folder.
update i2c bindings.

there will be separate PR for 01206af5a8ba commit where the patch involved both nati_slsc_defconfig and ni-slsc-12001.dts.

WI: AB#3014043

@kkang-NI kkang-NI force-pushed the dev/kkang/ni-slsc-12001-dts-creation branch 5 times, most recently from 58468dc to d7df368 Compare April 24, 2025 08:44
@kkang-NI kkang-NI changed the title [WIP] ARM: ni-slsc-12001.dts: Add device tree for SLSC ARM: ni-slsc-12001.dts: Add device tree for SLSC Apr 24, 2025
@kkang-NI kkang-NI marked this pull request as ready for review April 24, 2025 09:33
sien-wu and others added 2 commits April 24, 2025 21:06
Migrated no-slsc-12001.dts related changes from
branch dev/slsc/1.0/4.1 to ni/linux repo branch nilrt/master/6.6.

The commits:
33bb24e nati_slsc_dts: Add device tree for SLSC
bd53913 nati_slsc_dts: Correct SPI settings on device tree
9cf417b nati_slsc_dts: fix IRQ for spi7/8
4a9c9de nati_slsc_dts: Add SLSC FPGA to Device Tree
05d7cb7 nati_slsc_dts: Remove trailing whitespace
85377cb nati_slsc_dts: Correct device info in device tree
489cdc8 nati_slsc_dts: pull in Tecate dts for 4.1 Linux kernel
3dac1d2 nati_slsc_dts: Remove unused devices in dts
4740c70 nati_slsc_dts: Use spidev as compatible type in dts
2972302 nati_slsc_12001_dts: Rename dts file with model name
31600f9 nati_slsc_12001_dts: Fix the format of the dts
e3a89e6 nati_slsc_12001_dts: set SLSC FPGA compatible id to
                                     ni,slscfpga
a5f550a nati_slsc_12001_dts: Add AD7291 ADC to device tree
b662f5d nati_slsc_12001_dts: Enforce level trigger for slscfpga IRQ
5fd9c31 nati_slsc_12001_dts: Reduce SPI max frequency m25p80 device

Additional:
removed execute permissions of ni-slsc-12001.dts file.
added SPDX-License-Identifier on top of the file.

Signed-off-by: Sien <sien.wu@ni.com>
Signed-off-by: George Huang <george.huang@ni.com>
Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
zynq-700.dtsi contains i2c0 and i2c1 device tree node phandles.
Referencing i2c0 and i2c1 phandle for overriding i2c bindings.

Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
@kkang-NI kkang-NI force-pushed the dev/kkang/ni-slsc-12001-dts-creation branch from d7df368 to f2dff33 Compare April 24, 2025 13:08
@gratian gratian requested a review from a team April 24, 2025 15:01
Copy link

@chaitu236 chaitu236 left a comment

Choose a reason for hiding this comment

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

Signed-off-by: Sien sien.wu@ni.com
Signed-off-by: George Huang george.huang@ni.com

Were these people directly involved with this commit or did you copy their signed-off-by tags from the original commits before squashing? If the later, I don't think this is necessary; and may not be desirable? - question for @gratian

WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
WARNING: DT compatible string .. un-documented

These check-patch warnings can be ignored

@gratian gratian merged commit 2733e42 into ni:nilrt/master/6.6 Apr 24, 2025
1 check failed
@gratian
Copy link

gratian commented Apr 24, 2025

Cherry picked in nilrt/master/6.12

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