arm: socfpga: arria10: Update device tree
cover arm: socfpga: arria10: Update device tree
This patchset mainly to update Arria 10 dts/dtsi from Linux v5.6. All uboot specific properties are moved to *u-boot.dtsi.
The 3rd patch is to fix missing u-boot,dm-pre-reloc for L2 cache node and enable cache driver in SPL.
Thanks.
Regards
Ley Foon
Ley Foon Tan (3):
arm: dts: arria10: Move uboot specific properties to u-boot.dtsi
arm: dts: arria10: Update dtsi/dts from Linux
arm: socfpga: arria10: Enable cache driver in SPL
arch/arm/dts/socfpga_arria10-u-boot.dtsi | 142 ++++++++++++++++++ arch/arm/dts/socfpga_arria10.dtsi | 118 ++++++++------- .../arm/dts/socfpga_arria10_socdk-u-boot.dtsi | 17 +++ arch/arm/dts/socfpga_arria10_socdk.dtsi | 66 ++++---- .../socfpga_arria10_socdk_sdmmc-u-boot.dtsi | 46 ++++++ arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts | 53 +------ configs/socfpga_arria10_defconfig | 1 + 7 files changed, 297 insertions(+), 146 deletions(-) create mode 100644 arch/arm/dts/socfpga_arria10-u-boot.dtsi create mode 100644 arch/arm/dts/socfpga_arria10_socdk-u-boot.dtsi create mode 100644 arch/arm/dts/socfpga_arria10_socdk_sdmmc-u-boot.dtsi
Signature · 1 line
2.19.0
PATCH 1/3 arm: dts: arria10: Move uboot specific properties to u-boot.dtsi
Move Uboot specific properties to *u-boot.dtsi files. Preparation to sync Arria 10 device tree from Linux.
--- arch/arm/dts/socfpga_arria10-u-boot.dtsi | 123 ++++++++++++++++++ arch/arm/dts/socfpga_arria10.dtsi | 28 ---- .../arm/dts/socfpga_arria10_socdk-u-boot.dtsi | 17 +++ arch/arm/dts/socfpga_arria10_socdk.dtsi | 27 ---- .../socfpga_arria10_socdk_sdmmc-u-boot.dtsi | 46 +++++++ arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts | 37 ------ 6 files changed, 186 insertions(+), 92 deletions(-) create mode 100644 arch/arm/dts/socfpga_arria10-u-boot.dtsi create mode 100644 arch/arm/dts/socfpga_arria10_socdk-u-boot.dtsi create mode 100644 arch/arm/dts/socfpga_arria10_socdk_sdmmc-u-boot.dtsi
arch/arm/dts/socfpga_arria10-u-boot.dtsi new file +123 -0
@@ -0,0 +1,123 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2014, 2020, Intel Corporation + */ + +/ { + chosen { + tick-timer = &timer2; + u-boot,dm-pre-reloc; + }; + + memory at 0 { + u-boot,dm-pre-reloc; + }; + + soc { + u-boot,dm-pre-reloc; + }; +}; + +&clkmgr { + u-boot,dm-pre-reloc; + + clocks { + u-boot,dm-pre-reloc; + }; +}; + +&cb_intosc_hs_div2_clk { + u-boot,dm-pre-reloc; +}; + +&cb_intosc_ls_clk { + u-boot,dm-pre-reloc; +}; + +&f2s_free_clk { + u-boot,dm-pre-reloc; +}; + +&i2c0 { + reset-names = "i2c"; +}; + +&i2c1 { + reset-names = "i2c"; +}; + +&i2c2 { + reset-names = "i2c"; +}; + +&i2c3 { + reset-names = "i2c"; +}; + +&i2c4 { + reset-names = "i2c"; +}; + +&l4_mp_clk { + u-boot,dm-pre-reloc; +}; + +&l4_sp_clk { + u-boot,dm-pre-reloc; +}; + +&l4_sys_free_clk { + u-boot,dm-pre-reloc; +}; + +&main_periph_ref_clk { + u-boot,dm-pre-reloc; +}; + +&main_pll { + u-boot,dm-pre-reloc; +}; + +&main_noc_base_clk { + u-boot,dm-pre-reloc; +}; + +&noc_free_clk { + u-boot,dm-pre-reloc; +}; + +&osc1 { + u-boot,dm-pre-reloc; +}; + +&peri_noc_base_clk { + u-boot,dm-pre-reloc; +}; + +&periph_pll { + u-boot,dm-pre-reloc; +}; + +&porta { + bank-name = "porta"; +}; + +&portb { + bank-name = "portb"; +}; + +&portc { + bank-name = "portc"; +}; + +&rst { + u-boot,dm-pre-reloc; +}; + +&sysmgr { + u-boot,dm-pre-reloc; +}; + +&timer2 { + u-boot,dm-pre-reloc; +};
arch/arm/dts/socfpga_arria10.dtsi +0 -28
@@ -21,11 +21,6 @@ #address-cells = <1>; #size-cells = <1>; - chosen { - tick-timer = &timer2; - u-boot,dm-pre-reloc; - }; - cpus { #address-cells = <1>; #size-cells = <0>;
@@ -60,7 +55,6 @@ device_type = "soc"; interrupt-parent = <&intc>; ranges; - u-boot,dm-pre-reloc; amba { compatible = "simple-bus";
@@ -99,35 +93,29 @@ clkmgr: clkmgr at ffd04000 { compatible = "altr,clk-mgr"; reg = <0xffd04000 0x1000>; - u-boot,dm-pre-reloc; clocks { #address-cells = <1>; #size-cells = <0>; - u-boot,dm-pre-reloc; cb_intosc_hs_div2_clk: cb_intosc_hs_div2_clk { #clock-cells = <0>; compatible = "fixed-clock"; - u-boot,dm-pre-reloc; }; cb_intosc_ls_clk: cb_intosc_ls_clk { #clock-cells = <0>; compatible = "fixed-clock"; - u-boot,dm-pre-reloc; }; f2s_free_clk: f2s_free_clk { #clock-cells = <0>; compatible = "fixed-clock"; - u-boot,dm-pre-reloc; }; osc1: osc1 { #clock-cells = <0>; compatible = "fixed-clock"; - u-boot,dm-pre-reloc; }; main_pll: main_pll at 40 {
@@ -138,7 +126,6 @@ clocks = <&osc1>, <&cb_intosc_ls_clk>, <&f2s_free_clk>; reg = <0x40>; - u-boot,dm-pre-reloc; main_mpu_base_clk: main_mpu_base_clk { #clock-cells = <0>;
@@ -152,7 +139,6 @@ compatible = "altr,socfpga-a10-perip-clk"; clocks = <&main_pll>; div-reg = <0x144 0 11>; - u-boot,dm-pre-reloc; }; main_emaca_clk: main_emaca_clk at 68 {
@@ -228,7 +214,6 @@ clocks = <&osc1>, <&cb_intosc_ls_clk>, <&f2s_free_clk>, <&main_periph_ref_clk>; reg = <0xC0>; - u-boot,dm-pre-reloc; peri_mpu_base_clk: peri_mpu_base_clk { #clock-cells = <0>;
@@ -242,7 +227,6 @@ compatible = "altr,socfpga-a10-perip-clk"; clocks = <&periph_pll>; div-reg = <0x144 16 11>; - u-boot,dm-pre-reloc; }; peri_emaca_clk: peri_emaca_clk at e8 {
@@ -318,7 +302,6 @@ <&osc1>, <&cb_intosc_hs_div2_clk>, <&f2s_free_clk>; reg = <0x64>; - u-boot,dm-pre-reloc; }; s2f_user1_free_clk: s2f_user1_free_clk at 104 {
@@ -345,7 +328,6 @@ compatible = "altr,socfpga-a10-perip-clk"; clocks = <&noc_free_clk>; fixed-divider = <4>; - u-boot,dm-pre-reloc; }; l4_main_clk: l4_main_clk {
@@ -500,7 +482,6 @@ porta: gpio-controller at 0 { compatible = "snps,dw-apb-gpio-port"; - bank-name = "porta"; gpio-controller; #gpio-cells = <2>; snps,nr-gpios = <29>;
@@ -520,7 +501,6 @@ portb: gpio-controller at 0 { compatible = "snps,dw-apb-gpio-port"; - bank-name = "portb"; gpio-controller; #gpio-cells = <2>; snps,nr-gpios = <29>;
@@ -540,7 +520,6 @@ portc: gpio-controller at 0 { compatible = "snps,dw-apb-gpio-port"; - bank-name = "portc"; gpio-controller; #gpio-cells = <2>; snps,nr-gpios = <27>;
@@ -568,7 +547,6 @@ interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>; clocks = <&l4_sp_clk>; resets = <&rst I2C0_RESET>; - reset-names = "i2c"; status = "disabled"; };
@@ -580,7 +558,6 @@ interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>; clocks = <&l4_sp_clk>; resets = <&rst I2C1_RESET>; - reset-names = "i2c"; status = "disabled"; };
@@ -592,7 +569,6 @@ interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>; clocks = <&l4_sp_clk>; resets = <&rst I2C2_RESET>; - reset-names = "i2c"; status = "disabled"; };
@@ -604,7 +580,6 @@ interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>; clocks = <&l4_sp_clk>; resets = <&rst I2C3_RESET>; - reset-names = "i2c"; status = "disabled"; };
@@ -616,7 +591,6 @@ interrupts = <0 109 IRQ_TYPE_LEVEL_HIGH>; clocks = <&l4_sp_clk>; resets = <&rst I2C4_RESET>; - reset-names = "i2c"; status = "disabled"; };
@@ -767,7 +741,6 @@ compatible = "altr,rst-mgr"; reg = <0xffd05000 0x100>; altr,modrst-offset = <0x20>; - u-boot,dm-pre-reloc; }; scu: snoop-control-unit at ffffc000 {
@@ -811,7 +784,6 @@ reg = <0xffd00000 0x100>; clocks = <&l4_sys_free_clk>; clock-names = "timer"; - u-boot,dm-pre-reloc; }; timer3: timer3 at ffd00100 {
arch/arm/dts/socfpga_arria10_socdk-u-boot.dtsi new file +17 -0
@@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2015, 2020 Intel. All rights reserved. + */ + +#include "socfpga_arria10-u-boot.dtsi" + +/ { + aliases { + bootargs = "console=ttyS0,115200"; + i2c0 = &i2c1; + }; +}; + +&uart1 { + u-boot,dm-pre-reloc; +};
arch/arm/dts/socfpga_arria10_socdk.dtsi +0 -27
@@ -24,7 +24,6 @@ aliases { ethernet0 = &gmac0; serial0 = &uart1; - i2c0 = &i2c1; }; chosen {
@@ -36,7 +35,6 @@ name = "memory"; device_type = "memory"; reg = <0x0 0x40000000>; /* 1GB */ - u-boot,dm-pre-reloc; }; a10leds {
@@ -63,9 +61,6 @@ }; }; - soc { - u-boot,dm-pre-reloc; - }; }; &gmac0 {
@@ -155,7 +150,6 @@ }; &uart1 { - u-boot,dm-pre-reloc; status = "okay"; };
@@ -167,24 +161,3 @@ &watchdog1 { status = "okay"; }; - -/* Clock available early */ -&main_periph_ref_clk { - u-boot,dm-pre-reloc; -}; - -&l4_mp_clk { - u-boot,dm-pre-reloc; -}; - -&l4_sp_clk { - u-boot,dm-pre-reloc; -}; - -&clkmgr { - u-boot,dm-pre-reloc; -}; - -&sysmgr { - u-boot,dm-pre-reloc; -};
arch/arm/dts/socfpga_arria10_socdk_sdmmc-u-boot.dtsi new file +46 -0
46 lines not on this page · raw message
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +0 -37
@@ -17,28 +17,8 @@ /dts-v1/; #include "socfpga_arria10_socdk.dtsi" -#include "socfpga_arria10_socdk_sdmmc_handoff.dtsi" -#include "socfpga_arria10_handoff_u-boot.dtsi" - -/ { - chosen { - firmware-loader = <&fs_loader0>; - }; - - fs_loader0: fs-loader { - u-boot,dm-pre-reloc; - compatible = "u-boot,fs-loader"; - phandlepart = <&mmc 1>; - }; -}; - -&fpga_mgr { - u-boot,dm-pre-reloc; - altr,bitstream = "fit_spl_fpga.itb"; -}; &mmc { - u-boot,dm-pre-reloc; status = "okay"; num-slots = <1>; cap-sd-highspeed;
@@ -57,20 +37,3 @@ <48 IRQ_TYPE_LEVEL_HIGH>; }; }; - -/* Clock available early */ -&main_sdmmc_clk { - u-boot,dm-pre-reloc; -}; - -&peri_sdmmc_clk { - u-boot,dm-pre-reloc; -}; - -&sdmmc_free_clk { - u-boot,dm-pre-reloc; -}; - -&sdmmc_clk { - u-boot,dm-pre-reloc; -};
Signature · 1 line
2.19.0
PATCH 2/3 arm: dts: arria10: Update dtsi/dts from Linux
In reply to Ley Foon TanUpdate these 3 files from Linux with tag/v5.6.
- socfpga_arria10.dtsi
- socfpga_arria10_socdk.dtsi
- socfpga_arria10_socdk_sdmmc.dts
Change in socfpga_arria10.dtsi:
- Add clkmgr label, so that can reference to it in u-boot.dtsi.
Change in socfpga_arria10-u-boot.dtsi:
- Add compatible and altr,sysmgr-syscon for uboot.
--- arch/arm/dts/socfpga_arria10-u-boot.dtsi | 15 ++++ arch/arm/dts/socfpga_arria10.dtsi | 90 ++++++++++++++------ arch/arm/dts/socfpga_arria10_socdk.dtsi | 43 +++++++--- arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts | 16 +--- 4 files changed, 108 insertions(+), 56 deletions(-)
arch/arm/dts/socfpga_arria10-u-boot.dtsi +15 -0
@@ -38,6 +38,21 @@ u-boot,dm-pre-reloc; }; +&gmac0 { + compatible = "altr,socfpga-stmmac", "snps,dwmac-3.72a", "snps,dwmac"; + altr,sysmgr-syscon = <&sysmgr 0x44 0>; +}; + +&gmac1 { + compatible = "altr,socfpga-stmmac", "snps,dwmac-3.72a", "snps,dwmac"; + altr,sysmgr-syscon = <&sysmgr 0x48 0>; +}; + +&gmac2 { + compatible = "altr,socfpga-stmmac", "snps,dwmac-3.72a", "snps,dwmac"; + altr,sysmgr-syscon = <&sysmgr 0x4C 0>; +}; + &i2c0 { reset-names = "i2c"; };
arch/arm/dts/socfpga_arria10.dtsi +62 -28
224 lines not on this page · raw message
arch/arm/dts/socfpga_arria10_socdk.dtsi +29 -14
61 lines not on this page · raw message
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +2 -14
@@ -1,18 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014-2015 Altera Corporation <www.altera.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. */ /dts-v1/;
@@ -20,8 +8,8 @@ &mmc { status = "okay"; - num-slots = <1>; cap-sd-highspeed; + cap-mmc-highspeed; broken-cd; bus-width = <4>; };
Signature · 1 line
2.19.0
PATCH 2/3 arm: dts: arria10: Update dtsi/dts from Linux
Quoted 1 line · Ley Foon Tan
Update these 3 files from Linux with tag/v5.6.
Can you please add the commit ID in to the commit message ? Also, there's now 5.6.2 .
Tan
PATCH 2/3 arm: dts: arria10: Update dtsi/dts from Linux
Quoted 12 lines
-----Original Message-----
From: Marek Vasut <[email protected]>
Sent: Monday, April 6, 2020 6:41 PM
To: Tan, Ley Foon <[email protected]>; u-boot at lists.denx.de
Cc: Ley Foon Tan <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>
Subject: Re: [PATCH 2/3] arm: dts: arria10: Update dtsi/dts from Linux
Quoted 5 lines
Quoted 1 line · Ley Foon Tan
Update these 3 files from Linux with tag/v5.6.
Can you please add the commit ID in to the commit message ? Also, there's now 5.6.2 .
Okay, will update it and check any new in 5.6.2.
Regards
Ley Foon
PATCH 2/3 arm: dts: arria10: Update dtsi/dts from Linux
Quoted 12 lines · Ley Foon
Quoted 12 lines
-----Original Message-----
From: Marek Vasut <[email protected]>
Sent: Monday, April 6, 2020 6:41 PM
To: Tan, Ley Foon <[email protected]>; u-boot at lists.denx.de
Cc: Ley Foon Tan <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>
Subject: Re: [PATCH 2/3] arm: dts: arria10: Update dtsi/dts from Linux
Quoted 7 lines
Quoted 5 lines · Ley Foon Tan
Quoted 1 line
Update these 3 files from Linux with tag/v5.6.
Can you please add the commit ID in to the commit message ? Also, there's now 5.6.2 .
Okay, will update it and check any new in 5.6.2.
Probably nothing :)
Let's wait for review from Simon too.
PATCH 3/3 arm: socfpga: arria10: Enable cache driver in SPL
In reply to Ley Foon TanAdding "u-boot,dm-pre-reloc" and enable CONFIG_SPL_CACHE to enable cache driver in SPL.
This fixed error below in SPL:
cache controller driver NOT found!
--- arch/arm/dts/socfpga_arria10-u-boot.dtsi | 4 ++++ configs/socfpga_arria10_defconfig | 1 + 2 files changed, 5 insertions(+)
arch/arm/dts/socfpga_arria10-u-boot.dtsi +4 -0
@@ -73,6 +73,10 @@ reset-names = "i2c"; }; +&L2 { + u-boot,dm-pre-reloc; +}; + &l4_mp_clk { u-boot,dm-pre-reloc; };
configs/socfpga_arria10_defconfig +1 -0
@@ -22,6 +22,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_FPGA_SUPPORT=y +CONFIG_SPL_CACHE=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y # CONFIG_CMD_FLASH is not set
Signature · 1 line
2.19.0
PATCH 3/3 arm: socfpga: arria10: Enable cache driver in SPL
Am 06.04.2020 um 11:18 schrieb Ley Foon Tan:
Quoted 32 lines
Adding "u-boot,dm-pre-reloc" and enable
CONFIG_SPL_CACHEto enable cache driver in SPL.This fixed error below in SPL:
cache controller driver NOT found!Signed-off-by Ley Foon Tan <[email protected]>--- arch/arm/dts/socfpga_arria10-u-boot.dtsi | 4 ++++ configs/socfpga_arria10_defconfig | 1 + 2 files changed, 5 insertions(+)arch/arm/dts/socfpga_arria10-u-boot.dtsi +4
-0@@ -73,6 +73,10 @@ reset-names = "i2c"; }; +&L2 { + u-boot,dm-pre-reloc; +}; + &l4_mp_clk { u-boot,dm-pre-reloc; };configs/socfpga_arria10_defconfig +0
-0
configs/socfpga_arria10_defconfig CONFIG_VERSION_VARIABLE=y · line 25
Quoted 4 lines
configs/socfpga_arria10_defconfig +1
-0@@ -22,6 +22,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_FPGA_SUPPORT=y +CONFIG_SPL_CACHE=y
Can you select or default this in Kconfig if it's required for all Arria10 boards (even if we only have one right now)?
Regards,
Simon
Quoted 4 lines
configs/socfpga_arria10_defconfig +0
-0CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y # CONFIG_CMD_FLASH is not set
Tan
PATCH 3/3 arm: socfpga: arria10: Enable cache driver in SPL
Quoted 44 lines
-----Original Message-----
From: Simon Goldschmidt <[email protected]>
Sent: Monday, April 6, 2020 8:49 PM
To: Tan, Ley Foon <[email protected]>; u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; Ley Foon Tan <[email protected]>; See, Chin Liang <[email protected]>; Chee, Tien Fong <[email protected]>
Subject: Re: [PATCH 3/3] arm: socfpga: arria10: Enable cache driver in SPLAm 06.04.2020 um 11:18 schrieb Ley Foon Tan:
Quoted 32 lines
Adding "u-boot,dm-pre-reloc" and enable
CONFIG_SPL_CACHEto enable cache driver in SPL.This fixed error below in SPL:
cache controller driver NOT found!Signed-off-by Ley Foon Tan <[email protected]>--- arch/arm/dts/socfpga_arria10-u-boot.dtsi | 4 ++++ configs/socfpga_arria10_defconfig | 1 + 2 files changed, 5 insertions(+)arch/arm/dts/socfpga_arria10-u-boot.dtsi +4
-0@@ -73,6 +73,10 @@ reset-names = "i2c"; }; +&L2 { + u-boot,dm-pre-reloc; +}; + &l4_mp_clk { u-boot,dm-pre-reloc; };configs/socfpga_arria10_defconfig +0
-1--- a/configs/socfpga_arria10_defconfig
Quoted 8 lines
Quoted 5 lines
+++ b/configs/socfpga_arria10_defconfig
configs/socfpga_arria10_defconfig +0
-0@@ -22,6 +22,7 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_DISPLAY_BOARDINFO_LATE=yCONFIG_SPL_ENV_SUPPORT=yCONFIG_SPL_FPGA_SUPPORT=y
+CONFIG_SPL_CACHE=yCan you select or default this in
Kconfigif it's required for all Arria10 boards (even if we only have one right now)?
Okay.
Thanks.
Regards
Ley Foon
cover arm: socfpga: arria10: Update device tree
In reply to Ley Foon TanQuoted 5 lines · Ley Foon Tan
This patchset mainly to update Arria 10 dts/dtsi from Linux v5.6. All uboot specific properties are moved to *u-boot.dtsi.
The 3rd patch is to fix missing u-boot,dm-pre-reloc for L2 cache node and enable cache driver in SPL.
Except for a minor nit in 2/3, looks good, thanks.