Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'socfpga_dts_updates_for_v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into soc/dt

SoCFPGA dts updates for v6.2
- Use the "clk-phase-sd-hs" property for SDMMC
- Remove the "clk-phase" fom the sdmmc_clk that is no longer used
- Clean dtschema for mmc node
- Increase NAND partition for Arria10

* tag 'socfpga_dts_updates_for_v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
arm64: dts: socfpga: Add clk-phase-sd-hs property to the sdmmc node
arm: dts: socfpga: Add clk-phase-sd-hs property to the sdmmc node
arm: dts: socfpga: remove "clk-phase" in sdmmc_clk
arm: dts: socfpga: align mmc node names with dtschema
ARM: dts: socfpga: arria10: Increase NAND boot partition size

Link: https://lore.kernel.org/r/20221121163259.341974-1-dinguyen@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+19 -9
+2 -2
arch/arm/boot/dts/socfpga.dtsi
··· 453 453 compatible = "altr,socfpga-gate-clk"; 454 454 clocks = <&f2s_periph_ref_clk>, <&main_nand_sdmmc_clk>, <&per_nand_mmc_clk>; 455 455 clk-gate = <0xa0 8>; 456 - clk-phase = <0 135>; 457 456 }; 458 457 459 458 sdmmc_clk_divided: sdmmc_clk_divided { ··· 754 755 reg = <0xff800000 0x1000>; 755 756 }; 756 757 757 - mmc: dwmmc0@ff704000 { 758 + mmc: mmc@ff704000 { 758 759 compatible = "altr,socfpga-dw-mshc"; 759 760 reg = <0xff704000 0x1000>; 760 761 interrupts = <0 139 4>; ··· 764 765 clocks = <&l4_mp_clk>, <&sdmmc_clk_divided>; 765 766 clock-names = "biu", "ciu"; 766 767 resets = <&rst SDMMC_RESET>; 768 + altr,sysmgr-syscon = <&sysmgr 0x108 3>; 767 769 status = "disabled"; 768 770 }; 769 771
+2 -2
arch/arm/boot/dts/socfpga_arria10.dtsi
··· 365 365 compatible = "altr,socfpga-a10-gate-clk"; 366 366 clocks = <&sdmmc_free_clk>; 367 367 clk-gate = <0xC8 5>; 368 - clk-phase = <0 135>; 369 368 }; 370 369 371 370 qspi_clk: qspi_clk { ··· 655 656 arm,shared-override; 656 657 }; 657 658 658 - mmc: dwmmc0@ff808000 { 659 + mmc: mmc@ff808000 { 659 660 #address-cells = <1>; 660 661 #size-cells = <0>; 661 662 compatible = "altr,socfpga-dw-mshc"; ··· 665 666 clocks = <&l4_mp_clk>, <&sdmmc_clk>; 666 667 clock-names = "biu", "ciu"; 667 668 resets = <&rst SDMMC_RESET>; 669 + altr,sysmgr-syscon = <&sysmgr 0x28 4>; 668 670 status = "disabled"; 669 671 }; 670 672
+1
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dtsi
··· 73 73 cap-sd-highspeed; 74 74 broken-cd; 75 75 bus-width = <4>; 76 + clk-phase-sd-hs = <0>, <135>; 76 77 }; 77 78 78 79 &osc1 {
+2 -2
arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts
··· 16 16 17 17 partition@0 { 18 18 label = "Boot and fpga data"; 19 - reg = <0x0 0x02000000>; 19 + reg = <0x0 0x02500000>; 20 20 }; 21 21 partition@1c00000 { 22 22 label = "Root Filesystem - JFFS2"; 23 - reg = <0x02000000 0x06000000>; 23 + reg = <0x02500000 0x05500000>; 24 24 }; 25 25 }; 26 26 };
+1
arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts
··· 12 12 cap-mmc-highspeed; 13 13 broken-cd; 14 14 bus-width = <4>; 15 + clk-phase-sd-hs = <0>, <135>; 15 16 }; 16 17 17 18 &eccmgr {
+2 -1
arch/arm/boot/dts/socfpga_arria5.dtsi
··· 18 18 }; 19 19 }; 20 20 21 - mmc0: dwmmc0@ff704000 { 21 + mmc0: mmc@ff704000 { 22 22 broken-cd; 23 23 bus-width = <4>; 24 24 cap-mmc-highspeed; 25 25 cap-sd-highspeed; 26 + clk-phase-sd-hs = <0>, <135>; 26 27 }; 27 28 28 29 sysmgr@ffd08000 {
+2 -1
arch/arm/boot/dts/socfpga_cyclone5.dtsi
··· 18 18 }; 19 19 }; 20 20 21 - mmc0: dwmmc0@ff704000 { 21 + mmc0: mmc@ff704000 { 22 22 broken-cd; 23 23 bus-width = <4>; 24 24 cap-mmc-highspeed; 25 25 cap-sd-highspeed; 26 + clk-phase-sd-hs = <0>, <135>; 26 27 }; 27 28 28 29 sysmgr@ffd08000 {
+1
arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi
··· 18 18 19 19 &mmc0 { /* On-SoM eMMC */ 20 20 bus-width = <8>; 21 + clk-phase-sd-hs = <0>, <135>; 21 22 status = "okay"; 22 23 };
+1 -1
arch/arm/boot/dts/socfpga_vt.dts
··· 29 29 }; 30 30 }; 31 31 32 - dwmmc0@ff704000 { 32 + mmc@ff704000 { 33 33 broken-cd; 34 34 bus-width = <4>; 35 35 cap-mmc-highspeed;
+1
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
··· 309 309 <&clkmgr STRATIX10_SDMMC_CLK>; 310 310 clock-names = "biu", "ciu"; 311 311 iommus = <&smmu 5>; 312 + altr,sysmgr-syscon = <&sysmgr 0x28 4>; 312 313 status = "disabled"; 313 314 }; 314 315
+1
arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
··· 105 105 cap-mmc-highspeed; 106 106 broken-cd; 107 107 bus-width = <4>; 108 + clk-phase-sd-hs = <0>, <135>; 108 109 }; 109 110 110 111 &osc1 {
+1
arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
··· 313 313 <&clkmgr AGILEX_SDMMC_CLK>; 314 314 clock-names = "biu", "ciu"; 315 315 iommus = <&smmu 5>; 316 + altr,sysmgr-syscon = <&sysmgr 0x28 4>; 316 317 status = "disabled"; 317 318 }; 318 319
+1
arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts
··· 83 83 cap-sd-highspeed; 84 84 broken-cd; 85 85 bus-width = <4>; 86 + clk-phase-sd-hs = <0>, <135>; 86 87 }; 87 88 88 89 &osc1 {
+1
arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts
··· 74 74 cap-sd-highspeed; 75 75 broken-cd; 76 76 bus-width = <4>; 77 + clk-phase-sd-hs = <0>, <135>; 77 78 }; 78 79 79 80 &osc1 {