Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 23:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

arm: socfpga: gen5: sync devicetrees to Linux

Browse source 
This is again a sync to linux-next + pending patches in Dinh's tree at
commit 1c909b2dfe6a ("ARM: dts: socfpga: update more missing reset
properties")'

It adds missing peripheral reset properties to socfpga.dtsi and removes
U-Boot specific leftovers from socfpga_cyclone5_socrates.dts.

Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
This commit is contained in:
Simon Goldschmidt 2019-03-01 20:12:28 +01:00 committed by Marek Vasut
parent 75ce8c938d
commit 42a37d9774
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
arch/arm/dts/socfpga.dtsi
View file

@ -84,6 +84,7 @@
#dma-requests = <32>; #dma-requests = <32>;
clocks = <&l4_main_clk>; clocks = <&l4_main_clk>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
resets = <&rst DMA_RESET>;
}; };
}; };
@ -100,6 +101,7 @@
reg = <0xffc00000 0x1000>; reg = <0xffc00000 0x1000>;
interrupts = <0 131 4>, <0 132 4>, <0 133 4>, <0 134 4>; interrupts = <0 131 4>, <0 132 4>, <0 133 4>, <0 134 4>;
clocks = <&can0_clk>; clocks = <&can0_clk>;
resets = <&rst CAN0_RESET>;
status = "disabled"; status = "disabled";
}; };
@ -108,6 +110,7 @@
reg = <0xffc01000 0x1000>; reg = <0xffc01000 0x1000>;
interrupts = <0 135 4>, <0 136 4>, <0 137 4>, <0 138 4>; interrupts = <0 135 4>, <0 136 4>, <0 137 4>, <0 138 4>;
clocks = <&can1_clk>; clocks = <&can1_clk>;
resets = <&rst CAN1_RESET>;
status = "disabled"; status = "disabled";
}; };
@ -585,6 +588,7 @@
compatible = "snps,dw-apb-gpio"; compatible = "snps,dw-apb-gpio";
reg = <0xff708000 0x1000>; reg = <0xff708000 0x1000>;
clocks = <&l4_mp_clk>; clocks = <&l4_mp_clk>;
resets = <&rst GPIO0_RESET>;
status = "disabled"; status = "disabled";
porta: gpio-controller@0 { porta: gpio-controller@0 {
@ -605,6 +609,7 @@
compatible = "snps,dw-apb-gpio"; compatible = "snps,dw-apb-gpio";
reg = <0xff709000 0x1000>; reg = <0xff709000 0x1000>;
clocks = <&l4_mp_clk>; clocks = <&l4_mp_clk>;
resets = <&rst GPIO1_RESET>;
status = "disabled"; status = "disabled";
portb: gpio-controller@0 { portb: gpio-controller@0 {
@ -625,6 +630,7 @@
compatible = "snps,dw-apb-gpio"; compatible = "snps,dw-apb-gpio";
reg = <0xff70a000 0x1000>; reg = <0xff70a000 0x1000>;
clocks = <&l4_mp_clk>; clocks = <&l4_mp_clk>;
resets = <&rst GPIO2_RESET>;
status = "disabled"; status = "disabled";
portc: gpio-controller@0 { portc: gpio-controller@0 {
@ -735,6 +741,7 @@
#size-cells = <0>; #size-cells = <0>;
clocks = <&l4_mp_clk>, <&sdmmc_clk_divided>; clocks = <&l4_mp_clk>, <&sdmmc_clk_divided>;
clock-names = "biu", "ciu"; clock-names = "biu", "ciu";
resets = <&rst SDMMC_RESET>;
status = "disabled"; status = "disabled";
}; };
@ -746,9 +753,9 @@
<0xffb80000 0x10000>; <0xffb80000 0x10000>;
reg-names = "nand_data", "denali_reg"; reg-names = "nand_data", "denali_reg";
interrupts = <0x0 0x90 0x4>; interrupts = <0x0 0x90 0x4>;
dma-mask = <0xffffffff>;
clocks = <&nand_clk>, <&nand_x_clk>, <&nand_ecc_clk>; clocks = <&nand_clk>, <&nand_x_clk>, <&nand_ecc_clk>;
clock-names = "nand", "nand_x", "ecc"; clock-names = "nand", "nand_x", "ecc";
resets = <&rst NAND_RESET>;
status = "disabled"; status = "disabled";
}; };
@ -768,6 +775,7 @@
cdns,fifo-width = <4>; cdns,fifo-width = <4>;
cdns,trigger-address = <0x00000000>; cdns,trigger-address = <0x00000000>;
clocks = <&qspi_clk>; clocks = <&qspi_clk>;
resets = <&rst QSPI_RESET>;
status = "disabled"; status = "disabled";
}; };
@ -786,6 +794,7 @@
sdr: sdr@ffc25000 { sdr: sdr@ffc25000 {
compatible = "altr,sdr-ctl", "syscon"; compatible = "altr,sdr-ctl", "syscon";
reg = <0xffc25000 0x1000>; reg = <0xffc25000 0x1000>;
resets = <&rst SDR_RESET>;
}; };
sdramedac { sdramedac {
@ -802,6 +811,7 @@
interrupts = <0 154 4>; interrupts = <0 154 4>;
num-cs = <4>; num-cs = <4>;
clocks = <&spi_m_clk>; clocks = <&spi_m_clk>;
resets = <&rst SPIM0_RESET>;
status = "disabled"; status = "disabled";
}; };
@ -813,6 +823,7 @@
interrupts = <0 155 4>; interrupts = <0 155 4>;
num-cs = <4>; num-cs = <4>;
clocks = <&spi_m_clk>; clocks = <&spi_m_clk>;
resets = <&rst SPIM1_RESET>;
status = "disabled"; status = "disabled";
}; };
@ -879,6 +890,7 @@
dmas = <&pdma 28>, dmas = <&pdma 28>,
<&pdma 29>; <&pdma 29>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
resets = <&rst UART0_RESET>;
}; };
uart1: serial1@ffc03000 { uart1: serial1@ffc03000 {
@ -891,6 +903,7 @@
dmas = <&pdma 30>, dmas = <&pdma 30>,
<&pdma 31>; <&pdma 31>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
resets = <&rst UART1_RESET>;
}; };
usbphy0: usbphy { usbphy0: usbphy {
@ -930,6 +943,7 @@
reg = <0xffd02000 0x1000>; reg = <0xffd02000 0x1000>;
interrupts = <0 171 4>; interrupts = <0 171 4>;
clocks = <&osc1>; clocks = <&osc1>;
resets = <&rst L4WD0_RESET>;
status = "disabled"; status = "disabled";
}; };
@ -938,6 +952,7 @@
reg = <0xffd03000 0x1000>; reg = <0xffd03000 0x1000>;
interrupts = <0 172 4>; interrupts = <0 172 4>;
clocks = <&osc1>; clocks = <&osc1>;
resets = <&rst L4WD1_RESET>;
status = "disabled"; status = "disabled";
}; };
}; };

2
arch/arm/dts/socfpga_cyclone5_socrates.dts
View file

@ -76,7 +76,6 @@
&qspi { &qspi {
status = "okay"; status = "okay";
u-boot,dm-pre-reloc;
flash: flash@0 { flash: flash@0 {
#address-cells = <1>; #address-cells = <1>;
@ -91,6 +90,5 @@
cdns,tchsh-ns = <4>; cdns,tchsh-ns = <4>;
cdns,tslch-ns = <4>; cdns,tslch-ns = <4>;
status = "okay"; status = "okay";
u-boot,dm-pre-reloc;
}; };
}; };