GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm: dts: arria10: Move uboot specific properties to u-boot.dtsi

Browse source 
Move Uboot specific properties to *u-boot.dtsi files.
Preparation to sync Arria 10 device tree from Linux.

Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com>
This commit is contained in:
Ley Foon Tan 2020-04-07 15:43:12 +08:00 • committed by Marek Vasut
parent 8876f89640
commit f3fccb12c0
6 changed files with 186 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
arch/arm/dts/socfpga_arria10-u-boot.dtsi Normal file
View file

@ -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@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;
};

28
arch/arm/dts/socfpga_arria10.dtsi
View file

@ -21,11 +21,6 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
chosen {
tick-timer = &timer2;
u-boot,dm-pre-reloc;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@ -60,7 +55,6 @@
device_type = "soc"; device_type = "soc";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
ranges; ranges;
u-boot,dm-pre-reloc;
amba { amba {
compatible = "simple-bus"; compatible = "simple-bus";
@ -99,35 +93,29 @@
clkmgr: clkmgr@ffd04000 { clkmgr: clkmgr@ffd04000 {
compatible = "altr,clk-mgr"; compatible = "altr,clk-mgr";
reg = <0xffd04000 0x1000>; reg = <0xffd04000 0x1000>;
u-boot,dm-pre-reloc;
clocks { clocks {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
u-boot,dm-pre-reloc;
cb_intosc_hs_div2_clk: cb_intosc_hs_div2_clk { cb_intosc_hs_div2_clk: cb_intosc_hs_div2_clk {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "fixed-clock"; compatible = "fixed-clock";
u-boot,dm-pre-reloc;
}; };
cb_intosc_ls_clk: cb_intosc_ls_clk { cb_intosc_ls_clk: cb_intosc_ls_clk {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "fixed-clock"; compatible = "fixed-clock";
u-boot,dm-pre-reloc;
}; };
f2s_free_clk: f2s_free_clk { f2s_free_clk: f2s_free_clk {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "fixed-clock"; compatible = "fixed-clock";
u-boot,dm-pre-reloc;
}; };
osc1: osc1 { osc1: osc1 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "fixed-clock"; compatible = "fixed-clock";
u-boot,dm-pre-reloc;
}; };
main_pll: main_pll@40 { main_pll: main_pll@40 {
@ -138,7 +126,6 @@
clocks = <&osc1>, <&cb_intosc_ls_clk>, clocks = <&osc1>, <&cb_intosc_ls_clk>,
<&f2s_free_clk>; <&f2s_free_clk>;
reg = <0x40>; reg = <0x40>;
u-boot,dm-pre-reloc;
main_mpu_base_clk: main_mpu_base_clk { main_mpu_base_clk: main_mpu_base_clk {
#clock-cells = <0>; #clock-cells = <0>;
@ -152,7 +139,6 @@
compatible = "altr,socfpga-a10-perip-clk"; compatible = "altr,socfpga-a10-perip-clk";
clocks = <&main_pll>; clocks = <&main_pll>;
div-reg = <0x144 0 11>; div-reg = <0x144 0 11>;
u-boot,dm-pre-reloc;
}; };
main_emaca_clk: main_emaca_clk@68 { main_emaca_clk: main_emaca_clk@68 {
@ -228,7 +214,6 @@
clocks = <&osc1>, <&cb_intosc_ls_clk>, clocks = <&osc1>, <&cb_intosc_ls_clk>,
<&f2s_free_clk>, <&main_periph_ref_clk>; <&f2s_free_clk>, <&main_periph_ref_clk>;
reg = <0xC0>; reg = <0xC0>;
u-boot,dm-pre-reloc;
peri_mpu_base_clk: peri_mpu_base_clk { peri_mpu_base_clk: peri_mpu_base_clk {
#clock-cells = <0>; #clock-cells = <0>;
@ -242,7 +227,6 @@
compatible = "altr,socfpga-a10-perip-clk"; compatible = "altr,socfpga-a10-perip-clk";
clocks = <&periph_pll>; clocks = <&periph_pll>;
div-reg = <0x144 16 11>; div-reg = <0x144 16 11>;
u-boot,dm-pre-reloc;
}; };
peri_emaca_clk: peri_emaca_clk@e8 { peri_emaca_clk: peri_emaca_clk@e8 {
@ -318,7 +302,6 @@
<&osc1>, <&cb_intosc_hs_div2_clk>, <&osc1>, <&cb_intosc_hs_div2_clk>,
<&f2s_free_clk>; <&f2s_free_clk>;
reg = <0x64>; reg = <0x64>;
u-boot,dm-pre-reloc;
}; };
s2f_user1_free_clk: s2f_user1_free_clk@104 { s2f_user1_free_clk: s2f_user1_free_clk@104 {
@ -345,7 +328,6 @@
compatible = "altr,socfpga-a10-perip-clk"; compatible = "altr,socfpga-a10-perip-clk";
clocks = <&noc_free_clk>; clocks = <&noc_free_clk>;
fixed-divider = <4>; fixed-divider = <4>;
u-boot,dm-pre-reloc;
}; };
l4_main_clk: l4_main_clk { l4_main_clk: l4_main_clk {
@ -500,7 +482,6 @@
porta: gpio-controller@0 { porta: gpio-controller@0 {
compatible = "snps,dw-apb-gpio-port"; compatible = "snps,dw-apb-gpio-port";
bank-name = "porta";
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
snps,nr-gpios = <29>; snps,nr-gpios = <29>;
@ -520,7 +501,6 @@
portb: gpio-controller@0 { portb: gpio-controller@0 {
compatible = "snps,dw-apb-gpio-port"; compatible = "snps,dw-apb-gpio-port";
bank-name = "portb";
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
snps,nr-gpios = <29>; snps,nr-gpios = <29>;
@ -540,7 +520,6 @@
portc: gpio-controller@0 { portc: gpio-controller@0 {
compatible = "snps,dw-apb-gpio-port"; compatible = "snps,dw-apb-gpio-port";
bank-name = "portc";
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
snps,nr-gpios = <27>; snps,nr-gpios = <27>;
@ -568,7 +547,6 @@
interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&l4_sp_clk>; clocks = <&l4_sp_clk>;
resets = <&rst I2C0_RESET>; resets = <&rst I2C0_RESET>;
reset-names = "i2c";
status = "disabled"; status = "disabled";
}; };
@ -580,7 +558,6 @@
interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&l4_sp_clk>; clocks = <&l4_sp_clk>;
resets = <&rst I2C1_RESET>; resets = <&rst I2C1_RESET>;
reset-names = "i2c";
status = "disabled"; status = "disabled";
}; };
@ -592,7 +569,6 @@
interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&l4_sp_clk>; clocks = <&l4_sp_clk>;
resets = <&rst I2C2_RESET>; resets = <&rst I2C2_RESET>;
reset-names = "i2c";
status = "disabled"; status = "disabled";
}; };
@ -604,7 +580,6 @@
interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&l4_sp_clk>; clocks = <&l4_sp_clk>;
resets = <&rst I2C3_RESET>; resets = <&rst I2C3_RESET>;
reset-names = "i2c";
status = "disabled"; status = "disabled";
}; };
@ -616,7 +591,6 @@
interrupts = <0 109 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 109 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&l4_sp_clk>; clocks = <&l4_sp_clk>;
resets = <&rst I2C4_RESET>; resets = <&rst I2C4_RESET>;
reset-names = "i2c";
status = "disabled"; status = "disabled";
}; };
@ -767,7 +741,6 @@
compatible = "altr,rst-mgr"; compatible = "altr,rst-mgr";
reg = <0xffd05000 0x100>; reg = <0xffd05000 0x100>;
altr,modrst-offset = <0x20>; altr,modrst-offset = <0x20>;
u-boot,dm-pre-reloc;
}; };
scu: snoop-control-unit@ffffc000 { scu: snoop-control-unit@ffffc000 {
@ -811,7 +784,6 @@
reg = <0xffd00000 0x100>; reg = <0xffd00000 0x100>;
clocks = <&l4_sys_free_clk>; clocks = <&l4_sys_free_clk>;
clock-names = "timer"; clock-names = "timer";
u-boot,dm-pre-reloc;
}; };
timer3: timer3@ffd00100 { timer3: timer3@ffd00100 {

17
arch/arm/dts/socfpga_arria10_socdk-u-boot.dtsi Normal file
View file

@ -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;
};

27
arch/arm/dts/socfpga_arria10_socdk.dtsi
View file

@ -24,7 +24,6 @@
aliases { aliases {
ethernet0 = &gmac0; ethernet0 = &gmac0;
serial0 = &uart1; serial0 = &uart1;
i2c0 = &i2c1;
}; };
chosen { chosen {
@ -36,7 +35,6 @@
name = "memory"; name = "memory";
device_type = "memory"; device_type = "memory";
reg = <0x0 0x40000000>; /* 1GB */ reg = <0x0 0x40000000>; /* 1GB */
u-boot,dm-pre-reloc;
}; };
a10leds { a10leds {
@ -63,9 +61,6 @@
}; };
}; };
soc {
u-boot,dm-pre-reloc;
};
}; };
&gmac0 { &gmac0 {
@ -155,7 +150,6 @@
}; };
&uart1 { &uart1 {
u-boot,dm-pre-reloc;
status = "okay"; status = "okay";
}; };
@ -167,24 +161,3 @@
&watchdog1 { &watchdog1 {
status = "okay"; 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;
};

46
arch/arm/dts/socfpga_arria10_socdk_sdmmc-u-boot.dtsi Normal file
View file

@ -0,0 +1,46 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2014-2015, 2020 Intel. All rights reserved.
*/
#include "socfpga_arria10_socdk_sdmmc_handoff.dtsi"
#include "socfpga_arria10_handoff_u-boot.dtsi"
#include "socfpga_arria10_socdk-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;
};
/* 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;
};

37
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts
View file

@ -17,28 +17,8 @@
/dts-v1/; /dts-v1/;
#include "socfpga_arria10_socdk.dtsi" #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 { &mmc {
u-boot,dm-pre-reloc;
status = "okay"; status = "okay";
num-slots = <1>; num-slots = <1>;
cap-sd-highspeed; cap-sd-highspeed;
@ -57,20 +37,3 @@
<48 IRQ_TYPE_LEVEL_HIGH>; <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;
};