Supermicro_arm64_1G_Switch_G3748_Added: Patch of dts file to support …#373
Conversation
|
Has/will this been upstreamed? |
|
Hello Saikrishna
Yes, once the PR is reviewed and approved it should automatically get merged to master (upstream)
I am sure you know that process.So I really don’t completely understand your question.
Please help me understand I would be glad to respond.
|
paulmenzel
left a comment
There was a problem hiding this comment.
Thank you for your contribution.
PS: If you reply via email, please remove the cited part, otherwise the comment in the GitHub Web interface is “ugly” to read.
Hi @SelvaSupermicro, By upstream, I mean submitting this change into the main Linux kernel. See their contribution page for more details. |
Thanks for the clarifications. These code changes are applicable only for SONiC. Hence we dont want to upstream to main Linux kernel. |
b0d18fa to
ec8e89d
Compare
3e52dec to
8f4ff5a
Compare
|
From your commit message:
SONiC and ONL are two separate projects for a network operating system. No idea, why you reference ONL. To ease maintenance of the SONiC Linux kernel repository, you have to sent these patches upstream. Often upstream is also giving you a high quality review, that the SONiC developers/maintainers are not capable of. Also the devicetree has a lot of commented out lines, that also need to be cleaned up. |
Sorry for the ONL reference. I meant to say Linux. Anyway, I have cleaned up the patch to include file that was already committed instead creating new..
|
|
@SelvaSupermicro please resolve the conflict |
|
|
||
| This change adds device tree files for Supermicro SSE-G3748 board. | ||
| This dts file is derived from Marvell RD-AC5X board. | ||
| - SPI flash partition is changed. |
There was a problem hiding this comment.
We use different SPI flash partitions from what is used in Marvell RD-AC5X dts file.
Supermicro SSE-G3748 smc_sse-g3748.dts uses:
partition@0 {
label = "spi_flash_part0";
reg = <0x0 0x200000>;
};
parition@1 {
label = "spi_flash_part1";
reg = <0x200000 0x10000>;
};
parition@2 {
label = "spi_flash_part2";
reg = <0x210000 0xC00000>;
};
parition@3 {
label = "spi_flash_part3";
reg = <0xE10000 0x1F0000>;
};
Marvell RD-AC5X ac5-98dx35xx-rd.dts uses:
partition@0 {
label = "spi_flash_part0";
reg = <0x0 0x800000>;
};
parition@1 {
label = "spi_flash_part1";
reg = <0x800000 0x700000>;
};
parition@2 {
label = "spi_flash_part2";
reg = <0xF00000 0x100000>;
};
|
Sorry for the delay here, could you rebase your changes on top of the master branch, or merge in the current master branch into your branch? This is to resolve the patch conflict in |
Hi Saikrishna, |
|
Please improve the merge/pull request summary/title. |
|
Hello SaiKrishna, |
|
Looks like there's one conflict somehow? |
Echoing this, particularly the title. |
| 0011-arm64-dts-marvell-Add-Nokia-7215-IXS-A1-board.patch | ||
| 0012-net-mvpp2-clear-BM-pool-before-initialization.patch | ||
| 0013-mmc-sdhci-xenon-fix-PHY-init-clock-stability.patch | ||
| 0014-mmc-sdhci-xenon-add-timeout-for-PHY-init-complete.patch |
There was a problem hiding this comment.
There's too many changes here given that only one patch file being added in this PR. Please recheck the merge conflict resolution
4aadc91 to
f182d03
Compare
This patch is to support new platform, Supermicro 1G arm64 switch G3748 which uses marvel AC5X ASIC.
This patch is applied for all arm64 builds and will be effective only for this new platform.
Testing: