diff options
| author | Olof Johansson <olof@lixom.net> | 2014-10-23 21:05:45 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-10-23 21:05:45 -0700 |
| commit | 4fbc400cfc56fb6cb62197ff2244696770251bdf (patch) | |
| tree | 03b2a63ce8e9db0f6e7c84f098f87ccccecb51db /arch/arm/boot/dts/socfpga_arria5.dtsi | |
| parent | 184f84d9b94e142009835bd872f180c5264fbeeb (diff) | |
| parent | efb4a44e24df2b98464977aee5be41148936fc7c (diff) | |
| download | op-kernel-dev-4fbc400cfc56fb6cb62197ff2244696770251bdf.zip op-kernel-dev-4fbc400cfc56fb6cb62197ff2244696770251bdf.tar.gz | |
Merge tag 'socfpga_fixes_for_3.18' of git://git.rocketboards.org/linux-socfpga-next into fixes
Merge "SOCFPGA fixes for 3.18" from Dinh Nguyen:
These patches fixes an SMP and SDMMC driver hang during boot up on the
SOCFPGA platform.
Patch "arm: socfpga: fix fetching cpu1start_addr for SMP" fixes the SMP
trampoline code in order for CPU1 to correctly fetch it's cpu1start_addr.
Patch "ARM: dts: socfpga: rename gpio nodes" renames that GPIO node in order
to allow a standard way of specifying status="okay" in the board DTS file.
Patch "ARM: dts: socfpga: Fix SD card detect" fixes a SDMMC driver hang
during boot. The reason for the hang was the deferred probe of the SDMMC
driver was waiting for the GPIO resource that would never come.
Patch "ARM: dts: socfpga: Add a 3.3V fixed regulator node" adds a fixed
regulator node for the SDMMC driver to use.
* tag 'socfpga_fixes_for_3.18' of git://git.rocketboards.org/linux-socfpga-next:
ARM: dts: socfpga: Add a 3.3V fixed regulator node
ARM: dts: socfpga: Fix SD card detect
ARM: dts: socfpga: rename gpio nodes
arm: socfpga: fix fetching cpu1start_addr for SMP
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/socfpga_arria5.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/socfpga_arria5.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/socfpga_arria5.dtsi b/arch/arm/boot/dts/socfpga_arria5.dtsi index 03e8268..1907cc6 100644 --- a/arch/arm/boot/dts/socfpga_arria5.dtsi +++ b/arch/arm/boot/dts/socfpga_arria5.dtsi @@ -29,7 +29,7 @@ }; }; - dwmmc0@ff704000 { + mmc0: dwmmc0@ff704000 { num-slots = <1>; broken-cd; bus-width = <4>; |
