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>
Showing
- arch/arm/boot/dts/socfpga.dtsi 6 additions, 6 deletionsarch/arm/boot/dts/socfpga.dtsi
- arch/arm/boot/dts/socfpga_arria5.dtsi 1 addition, 1 deletionarch/arm/boot/dts/socfpga_arria5.dtsi
- arch/arm/boot/dts/socfpga_arria5_socdk.dts 12 additions, 0 deletionsarch/arm/boot/dts/socfpga_arria5_socdk.dts
- arch/arm/boot/dts/socfpga_cyclone5_socdk.dts 14 additions, 1 deletionarch/arm/boot/dts/socfpga_cyclone5_socdk.dts
- arch/arm/boot/dts/socfpga_cyclone5_sockit.dts 12 additions, 0 deletionsarch/arm/boot/dts/socfpga_cyclone5_sockit.dts
- arch/arm/mach-socfpga/core.h 1 addition, 1 deletionarch/arm/mach-socfpga/core.h
- arch/arm/mach-socfpga/headsmp.S 15 additions, 10 deletionsarch/arm/mach-socfpga/headsmp.S
- arch/arm/mach-socfpga/platsmp.c 2 additions, 2 deletionsarch/arm/mach-socfpga/platsmp.c
- arch/arm/mach-socfpga/socfpga.c 2 additions, 2 deletionsarch/arm/mach-socfpga/socfpga.c
Loading
Please register or sign in to comment