diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-23 20:44:25 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-23 20:44:25 -0400 |
| commit | c851a2458fbc12495f4f786d4eabb612850a5143 (patch) | |
| tree | fa0b97f9ff8f744db11a1d296283ce7ce335a536 /arch/arm/dts | |
| parent | 14e7a30f2e8963fc5b91ba68e53bb2de708aee65 (diff) | |
| parent | 29aa439759ed2e5dfa45cd8d6d5a1d51604e3820 (diff) | |
| download | u-boot-c851a2458fbc12495f4f786d4eabb612850a5143.tar.gz | |
Merge git://git.denx.de/u-boot-socfpga
Conflicts:
configs/socfpga_arria5_defconfig
configs/socfpga_cyclone5_defconfig
configs/socfpga_socrates_defconfig
Merged these by hand and re-ran savedefconfig on them.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/socfpga.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga_arria5_socdk.dts | 6 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga_cyclone5.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga_cyclone5_socrates.dts | 3 |
4 files changed, 12 insertions, 9 deletions
diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi index e17e9f4a3c..8588221e57 100644 --- a/arch/arm/dts/socfpga.dtsi +++ b/arch/arm/dts/socfpga.dtsi @@ -23,7 +23,6 @@ spi0 = &qspi; spi1 = &spi0; spi2 = &spi1; - mmc = &mmc; }; cpus { @@ -550,6 +549,7 @@ porta: gpio-controller@0 { compatible = "snps,dw-apb-gpio-port"; + bank-name = "porta"; gpio-controller; #gpio-cells = <2>; snps,nr-gpios = <29>; @@ -570,6 +570,7 @@ portb: gpio-controller@0 { compatible = "snps,dw-apb-gpio-port"; + bank-name = "portb"; gpio-controller; #gpio-cells = <2>; snps,nr-gpios = <29>; @@ -590,6 +591,7 @@ portc: gpio-controller@0 { compatible = "snps,dw-apb-gpio-port"; + bank-name = "portc"; gpio-controller; #gpio-cells = <2>; snps,nr-gpios = <27>; @@ -621,7 +623,7 @@ arm,data-latency = <2 1 1>; }; - mmc: dwmmc0@ff704000 { + mmc0: dwmmc0@ff704000 { compatible = "altr,socfpga-dw-mshc"; reg = <0xff704000 0x1000>; interrupts = <0 139 4>; diff --git a/arch/arm/dts/socfpga_arria5_socdk.dts b/arch/arm/dts/socfpga_arria5_socdk.dts index f2b5963f59..7d1836e8be 100644 --- a/arch/arm/dts/socfpga_arria5_socdk.dts +++ b/arch/arm/dts/socfpga_arria5_socdk.dts @@ -33,6 +33,10 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; + + soc { + u-boot,dm-pre-reloc; + }; }; &gmac1 { @@ -67,6 +71,8 @@ &mmc0 { vmmc-supply = <®ulator_3_3v>; vqmmc-supply = <®ulator_3_3v>; + bus-width = <4>; + u-boot,dm-pre-reloc; }; &usb1 { diff --git a/arch/arm/dts/socfpga_cyclone5.dtsi b/arch/arm/dts/socfpga_cyclone5.dtsi index 234a901205..de362099db 100644 --- a/arch/arm/dts/socfpga_cyclone5.dtsi +++ b/arch/arm/dts/socfpga_cyclone5.dtsi @@ -27,12 +27,6 @@ cap-sd-highspeed; }; - ethernet@ff702000 { - phy-mode = "rgmii"; - phy-addr = <0xffffffff>; /* probe for phy addr */ - status = "okay"; - }; - sysmgr@ffd08000 { cpu1-start-addr = <0xffd080c4>; }; diff --git a/arch/arm/dts/socfpga_cyclone5_socrates.dts b/arch/arm/dts/socfpga_cyclone5_socrates.dts index 00b1830485..6782691f73 100644 --- a/arch/arm/dts/socfpga_cyclone5_socrates.dts +++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts @@ -23,6 +23,7 @@ &gmac1 { status = "okay"; + phy-mode = "rgmii"; }; &i2c0 { @@ -34,7 +35,7 @@ }; }; -&mmc { +&mmc0 { status = "okay"; }; |