diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-22 09:49:21 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-22 09:49:21 +0100 |
| commit | 7c74d60baed1deb3b23ed13c184344b59348dc15 (patch) | |
| tree | aa7288b58331a090ecb430a41ca849322dcf6bc9 /arch/arm/dts | |
| parent | 63a96a03b6c9dbc40f0d94a8be22f002bee4962e (diff) | |
| parent | bb9534df1e8b4bfad3c2065b0c4eb861442efbfd (diff) | |
| download | barebox-7c74d60baed1deb3b23ed13c184344b59348dc15.tar.gz barebox-7c74d60baed1deb3b23ed13c184344b59348dc15.tar.xz | |
Merge branch 'for-next/socfpga'
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/socfpga.dtsi | 19 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts | 6 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga_cyclone5_socdk.dts | 8 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga_cyclone5_sockit.dts | 6 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga_cyclone5_socrates.dts | 6 |
5 files changed, 26 insertions, 19 deletions
diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi index b3a7f69ffe..7789c9d3b5 100644 --- a/arch/arm/dts/socfpga.dtsi +++ b/arch/arm/dts/socfpga.dtsi @@ -1,27 +1,8 @@ / { - chosen { - environment@0 { - compatible = "barebox,environment"; - device-path = &mmc, "partname:1"; - file-path = "barebox.env"; - }; - }; - aliases { mmc0 = &mmc; }; }; -&osc2 { - clock-frequency = <0>; -}; - -&f2s_periph_ref_clk { - clock-frequency = <0>; -}; - -&f2s_sdram_ref_clk { - clock-frequency = <0>; -}; &watchdog0 { resets = <&rst L4WD0_RESET>; diff --git a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts index 087fc71e60..8854ade434 100644 --- a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts +++ b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts @@ -24,6 +24,12 @@ chosen { stdout-path = &uart0; + + environment@0 { + compatible = "barebox,environment"; + device-path = &mmc, "partname:1"; + file-path = "barebox.env"; + }; }; leds: gpio-leds { diff --git a/arch/arm/dts/socfpga_cyclone5_socdk.dts b/arch/arm/dts/socfpga_cyclone5_socdk.dts index f93ac105c4..dfb6273cae 100644 --- a/arch/arm/dts/socfpga_cyclone5_socdk.dts +++ b/arch/arm/dts/socfpga_cyclone5_socdk.dts @@ -21,6 +21,14 @@ / { model = "Altera SOCFPGA Cyclone V SoC Development Kit"; compatible = "altr,socdk", "altr,socfpga-cyclone5", "altr,socfpga"; + + chosen { + environment@0 { + compatible = "barebox,environment"; + device-path = &mmc, "partname:1"; + file-path = "barebox.env"; + }; + }; }; &qspi { diff --git a/arch/arm/dts/socfpga_cyclone5_sockit.dts b/arch/arm/dts/socfpga_cyclone5_sockit.dts index 7cb9b96005..8830afeb9a 100644 --- a/arch/arm/dts/socfpga_cyclone5_sockit.dts +++ b/arch/arm/dts/socfpga_cyclone5_sockit.dts @@ -24,5 +24,11 @@ chosen { stdout-path = &uart0; + + environment@0 { + compatible = "barebox,environment"; + device-path = &mmc, "partname:1"; + file-path = "barebox.env"; + }; }; }; diff --git a/arch/arm/dts/socfpga_cyclone5_socrates.dts b/arch/arm/dts/socfpga_cyclone5_socrates.dts index ea7e6cc102..93253af7ec 100644 --- a/arch/arm/dts/socfpga_cyclone5_socrates.dts +++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts @@ -21,6 +21,12 @@ / { chosen { stdout-path = &uart0; + + environment@0 { + compatible = "barebox,environment"; + device-path = &mmc, "partname:1"; + file-path = "barebox.env"; + }; }; aliases { |