hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linux-sg2042/arch/arm
History
Jon Hunter 31d9adca82 ARM: OMAP2+: Fix broken gpmc support 
Commit 6797b4fe (ARM: OMAP2+: Prevent potential crash if GPMC probe fails)
added code to ensure that GPMC chip-selects could not be requested until the
device probe was successful. The chip-selects should have been
unreserved at the end of the probe function, but the code to unreserve
them appears to have ended up in the gpmc_calc_timings() function and
hence, this is causing problems requesting chip-selects. Fix this merge
error by unreserving the chip-selects at the end of the probe, but
before we call the gpmc child probe functions (for device-tree) which
request a chip-select.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Tested-by: Philip Avinash <avinashphilip@ti.com>
Tested-by: Grazvydas Ignotas <notasas@gmail.com>
[tony@atomide.com: updated description to add breaking commit id]
Signed-off-by: Tony Lindgren <tony@atomide.com>
 		2013-03-04 11:12:16 -08:00
..
boot Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-03-03 11:54:39 -08:00
common ARM: GIC: fix GIC cpumask initialization 2013-02-08 10:17:22 +00:00
configs arm-soc: mvebu platform changes 2013-02-28 20:09:24 -08:00
crypto ARM: 7626/1: arm/crypto: Make asm SHA-1 and AES code Thumb-2 compatible 2013-01-13 12:41:22 +00:00
include Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-03-03 11:54:39 -08:00
kernel Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-03-03 11:54:39 -08:00
kvm ARM: KVM: fix compilation after removal of user_alloc from struct kvm_memory_slot 2013-02-25 11:48:41 +02:00
lib ARM: 7653/2: do not scale loops_per_jiffy when using a constant delay clock 2013-02-21 13:25:36 +00:00
mach-at91 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-bcm Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mach-bcm2835 arm-soc: soc-specific updates 2013-02-21 15:27:22 -08:00
mach-clps711x The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-cns3xxx The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-davinci Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-dove arm-soc: mvebu platform changes 2013-02-28 20:09:24 -08:00
mach-ebsa110 The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-ep93xx The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-exynos Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-footbridge The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-gemini The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-h720x The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-highbank Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-imx arm-soc: i.MX DT changes 2013-02-28 19:59:34 -08:00
mach-integrator Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-iop13xx Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-iop32x The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-iop33x The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-ixp4xx The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-kirkwood arm-soc: mvebu platform changes 2013-02-28 20:09:24 -08:00
mach-ks8695 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-l7200/include/mach
…
mach-lpc32xx The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-mmp Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-msm Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-mv78xx0 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-mvebu arm-soc: mvebu platform changes 2013-02-28 20:09:24 -08:00
mach-mxs arm-soc: device tree conversions 2013-02-21 15:38:49 -08:00
mach-netx The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-nomadik Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-omap1 ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h 2013-03-04 11:12:16 -08:00
mach-omap2 ARM: OMAP2+: Fix broken gpmc support 2013-03-04 11:12:16 -08:00
mach-orion5x Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-picoxcell Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mach-prima2 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-pxa Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-realview arm-soc: cleanups 2013-02-21 14:58:40 -08:00
mach-rpc The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-s3c24xx Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-s3c64xx Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-s5p64x0 arm-soc: cleanups 2013-02-21 14:58:40 -08:00
mach-s5pc100 Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mach-s5pv210 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2013-02-24 17:35:10 -08:00
mach-sa1100 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-shark The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-shmobile IOMMU Updates for Linux v3.9 2013-02-26 11:09:17 -08:00
mach-socfpga Merge branch 'socfpga/hw' into next/soc 2013-02-11 19:37:51 -08:00
mach-spear3xx Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2013-02-26 09:24:48 -08:00
mach-spear6xx Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2013-02-26 09:24:48 -08:00
mach-spear13xx Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT" 2013-02-20 15:48:02 +05:30
mach-sunxi Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-tegra Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-u300 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-ux500 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-versatile Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-vexpress Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-virt ARM: mach-virt: fixup machine descriptor after removal of sys_timer 2013-02-11 10:39:30 -08:00
mach-vt8500 arm-soc: soc-specific updates 2013-02-21 15:27:22 -08:00
mach-w90x900 arm-soc: cleanups 2013-02-21 14:58:40 -08:00
mach-zynq arm: zynq: Add missing irqchip.h to common.c 2013-01-29 10:55:28 -08:00
mm Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-03-03 11:54:39 -08:00
net ARM: net: bpf_jit: fix emit_swap16() for non ARMv6+. 2013-02-14 13:26:44 -05:00
nwfpe
…
oprofile
…
plat-iop ARM: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
plat-omap arm-soc: late OMAP changes 2013-02-28 20:00:40 -08:00
plat-orion arm-soc: cleanups 2013-02-21 14:58:40 -08:00
plat-pxa ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
plat-samsung Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
plat-spear arm-soc: driver specific changes 2013-02-21 15:12:18 -08:00
plat-versatile Merge branch 'for-arm-soc/arch-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into kvm-arm/timer 2013-02-11 19:03:52 +00:00
tools
…
vfp ARM: Fix broken commit 0cc41e4a21 corrupting kernel messages 2013-03-01 21:09:59 +00:00
xen xen: implement updated XENMEM_add_to_physmap_range ABI 2013-02-19 22:01:55 -05:00
Kconfig arm-soc: late OMAP changes 2013-02-28 20:00:40 -08:00
Kconfig-nommu
…
Kconfig.debug arm-soc: soc-specific updates 2013-02-21 15:27:22 -08:00
Makefile arm-soc: virtualization changes 2013-02-21 15:40:16 -08:00