Skip to content

Add device tree for SLSC and migrate other nati_slsc_dts related changes.#223

Closed
kkang-NI wants to merge 16 commits intoni:nilrt/master/6.6from
kkang-NI:dev/kkang/nati_slsc_12001_dts
Closed

Add device tree for SLSC and migrate other nati_slsc_dts related changes.#223
kkang-NI wants to merge 16 commits intoni:nilrt/master/6.6from
kkang-NI:dev/kkang/nati_slsc_12001_dts

Conversation

@kkang-NI
Copy link
Copy Markdown

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

WI: AB#3014043

Testing:

  • manually built kernel with cherry picked commits.
  • required to add nati_slsc_defconfig to build pass.

sien-wu and others added 16 commits April 21, 2025 11:07
Add device tree for SLSC to enable SPI based modules communication.

Signed-off-by: George Huang <george.huang@ni.com>
Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
Adjust SPI interrupt assignemnt; fix MTD partition size,
Fix spidev comaptible name string

Signed-off-by: George Huang <george.huang@ni.com>
Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
Correct the IRQ settings on the device tree for SPI controller 7 and 8

Signed-off-by: George Huang <george.huang@ni.com>
Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
Add SLSC FPGA to device tree to enable Usermode driver for module
control and interrupt handling.

Signed-off-by: Sien Wu <sien.wu@ni.com>
Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
Remove trailing whitespace on dts file since review-board
will flag them as problem.

Signed-off-by: Sien Wu <sien.wu@ni.com>
Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
Correct the device code and model name of SLSC in the device tree.

Signed-off-by: Sien Wu <sien.wu@ni.com>
Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
Pull in device tree settings of Tecate for Linux kernel 4.1 to
improve compatibility of the SLSC hardware with the kernel.

Signed-off-by: Sien Wu <sien.wu@ni.com>
Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
Remove unused hardware from device tree to reflect the actual
state of the SLSC hardware.

Signed-off-by: Sien Wu <sien.wu@ni.com>
Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
Replace SLSC SPI controller compatible type with spidev rather
than Rohm DAC to reflect what the SPI hardware to actually
compatible with.

Signed-off-by: Sien Wu <sien.wu@ni.com>
Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
Adding model number to the device tree to indicate that it is
only valid for SLSC 12001 since a different dts file is required
for a SLSC chassis that has different number of slots.

Signed-off-by: Sien Wu <sien.wu@ni.com>
Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
Removed "0x" prefix for the device code and replaced leading
spaces by tabs so that the format is consistent with other
dts files.

Signed-off-by: Sien Wu <sien.wu@ni.com>
Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
Rename the compatible id of slscfpga from generic-uio to
ni,slscfpga so that it can better describe the hardware.

Signed-off-by: Sien Wu <sien.wu@ni.com>
Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
Add AD7291 ADC to device tree for monitoring chassis temperature,
fan, and battery.

Signed-off-by: Sien Wu <sien.wu@ni.com>
Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
Resolve a discrepancy of interrupt type between the
slscfpga in dts and the actual fpga hardware by
updating slscfpga device in dts to be level high trigger
instead of default since the default is edge trigger
but the FPGA implementation is level trigger.

Signed-off-by: Sien Wu <sien.wu@ni.com>
Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
Limit the max SPI frequency for m25p80 to 1MHz. Allowing
faster SPI clock for the m25p80 on SLSC module would
result in potential failure when talking to a module that
only meets the 1MHz minimum SPI clock timing.

Signed-off-by: Sien Wu <sien.wu@ni.com>
Acked-by: Brad Keryan <brad.keryan@ni.com>
Natinst-ReviewBoard-ID 150232
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 changed the title [WIP] Add device tree for SLSC and migrate other nati_slsc_dts related changes. Add device tree for SLSC and migrate other nati_slsc_dts related changes. Apr 21, 2025
@kkang-NI kkang-NI marked this pull request as draft April 21, 2025 06:29
@kkang-NI
Copy link
Copy Markdown
Author

I realized there is a numbers of PR Checks failures that link to every individual commit which I cherry picked from dev/slsc/1.0/4.1. It seems like I will have to fix the failures (spaces to tabs) in every commit while cherry picking.

@kkang-NI kkang-NI closed this Apr 21, 2025
@kkang-NI kkang-NI deleted the dev/kkang/nati_slsc_12001_dts branch April 21, 2025 09:43
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.

2 participants