diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/ltq-vmmc/200-kernel-37.patch | 192 |
1 files changed, 0 insertions, 192 deletions
diff --git a/package/ltq-vmmc/200-kernel-37.patch b/package/ltq-vmmc/200-kernel-37.patch deleted file mode 100644 index f5e2b36b74..0000000000 --- a/package/ltq-vmmc/200-kernel-37.patch +++ /dev/null @@ -1,192 +0,0 @@ ---- a/src/drv_vmmc_init.c -+++ b/src/drv_vmmc_init.c -@@ -784,7 +784,7 @@ - dwld.fwDwld.length = IoInit.pram_size; - - /* download firmware */ -- ret = ifx_mps_ioctl((IFX_void_t *) command, IFX_NULL, FIO_MPS_DOWNLOAD, -+ ret = ifx_mps_ioctl((IFX_void_t *) command, FIO_MPS_DOWNLOAD, - (IFX_uint32_t) &dwld.fwDwld); - } - -@@ -1594,7 +1594,7 @@ - #ifdef VMMC_DRIVER_UNLOAD_HOOK - if (VDevices[0].nDevState & DS_GPIO_RESERVED) - { -- IFX_int32_t ret; -+ IFX_int32_t ret = 0; - VMMC_DRIVER_UNLOAD_HOOK(ret); - if (!VMMC_SUCCESS(ret)) - { ---- a/src/mps/drv_mps_vmmc_linux.c -+++ b/src/mps/drv_mps_vmmc_linux.c -@@ -110,7 +110,7 @@ - #ifndef __KERNEL__ - IFX_int32_t ifx_mps_open (struct inode *inode, struct file *file_p); - IFX_int32_t ifx_mps_close (struct inode *inode, struct file *file_p); --IFX_int32_t ifx_mps_ioctl (struct inode *inode, struct file *file_p, -+long ifx_mps_ioctl (struct file *file_p, - IFX_uint32_t nCmd, IFX_ulong_t arg); - IFX_int32_t ifx_mps_read_mailbox (mps_devices type, mps_message * rw); - IFX_int32_t ifx_mps_write_mailbox (mps_devices type, mps_message * rw); -@@ -171,7 +171,7 @@ - static struct file_operations ifx_mps_fops = { - owner:THIS_MODULE, - poll:ifx_mps_poll, -- ioctl:ifx_mps_ioctl, -+ unlocked_ioctl:ifx_mps_ioctl, - open:ifx_mps_open, - release:ifx_mps_close - }; -@@ -614,7 +614,7 @@ - * \return -ENOIOCTLCMD Invalid command - * \ingroup API - */ --IFX_int32_t ifx_mps_ioctl (struct inode * inode, struct file * file_p, -+long ifx_mps_ioctl (struct file *file_p, - IFX_uint32_t nCmd, IFX_ulong_t arg) - { - IFX_int32_t retvalue = -EINVAL; -@@ -629,17 +629,18 @@ - 'mps_devices' enum type, which in fact is [0..8]; So, if inode value is - [0..NUM_VOICE_CHANNEL+1], then we make sure that we are calling from - kernel space. */ -- if (((IFX_int32_t) inode >= 0) && -- ((IFX_int32_t) inode < NUM_VOICE_CHANNEL + 1)) -+ if (((IFX_int32_t) file_p >= 0) && -+ ((IFX_int32_t) file_p < NUM_VOICE_CHANNEL + 1)) - { - from_kernel = 1; - - /* Get corresponding mailbox device structure */ - if ((pMBDev = -- ifx_mps_get_device ((mps_devices) ((IFX_int32_t) inode))) == 0) -+ ifx_mps_get_device ((mps_devices) ((IFX_int32_t) file_p))) == 0) - { - return (-EINVAL); - } -+ file_p = NULL; - } - else - { ---- a/src/drv_vmmc_ioctl.c -+++ b/src/drv_vmmc_ioctl.c -@@ -427,18 +427,18 @@ - /* MPS driver will do the USR2KERN so just pass on the pointer. */ - dwnld_struct.data = (IFX_void_t *)IoInit.pPRAMfw; - -- ret = ifx_mps_ioctl((IFX_void_t *)command, IFX_NULL, -+ ret = ifx_mps_ioctl((IFX_void_t *)command, - FIO_MPS_DOWNLOAD, (IFX_uint32_t) &dwnld_struct); - break; - } - case FIO_DEV_RESET: - { -- ret = ifx_mps_ioctl((IFX_void_t *)command, IFX_NULL, FIO_MPS_RESET, 0); -+ ret = ifx_mps_ioctl((IFX_void_t *)command, FIO_MPS_RESET, 0); - break; - } - case FIO_DEV_RESTART: - { -- ret = ifx_mps_ioctl((IFX_void_t *)command, IFX_NULL, FIO_MPS_RESTART, 0); -+ ret = ifx_mps_ioctl((IFX_void_t *)command, FIO_MPS_RESTART, 0); - break; - } - case FIO_LASTERR: ---- a/src/mps/drv_mps_vmmc.h -+++ b/src/mps/drv_mps_vmmc.h -@@ -279,7 +279,7 @@ - #include <linux/fs.h> - IFX_int32_t ifx_mps_open (struct inode *inode, struct file *file_p); - IFX_int32_t ifx_mps_close (struct inode *inode, struct file *filp); --IFX_int32_t ifx_mps_ioctl (struct inode *inode, struct file *file_p, -+long ifx_mps_ioctl (struct file *filp, - IFX_uint32_t nCmd, unsigned long arg); - IFX_int32_t ifx_mps_register_data_callback (mps_devices type, IFX_uint32_t dir, - IFX_void_t (*callback) (mps_devices ---- a/src/drv_vmmc_linux.c -+++ b/src/drv_vmmc_linux.c -@@ -32,7 +32,11 @@ - #ifdef LINUX_2_6 - #include <linux/version.h> - #ifndef UTS_RELEASE -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)) -+#include <linux/utsrelease.h> -+#else - #include <generated/utsrelease.h> -+#endif - #endif /* UTC_RELEASE */ - #undef CONFIG_DEVFS_FS - #endif /* LINUX_2_6 */ ---- a/src/mps/drv_mps_vmmc_common.c -+++ b/src/mps/drv_mps_vmmc_common.c -@@ -22,7 +22,11 @@ - #undef USE_PLAIN_VOICE_FIRMWARE - #undef PRINT_ON_ERR_INTERRUPT - #undef FAIL_ON_ERR_INTERRUPT --#include <generated/autoconf.h> -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)) -+#include <linux/utsrelease.h> -+#else -+#include <generated/utsrelease.h> -+#endif - #include <linux/interrupt.h> - #include <linux/delay.h> - -@@ -47,8 +51,19 @@ - # define ifx_gptu_timer_free lq_free_timer - - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) - # define bsp_mask_and_ack_irq ltq_mask_and_ack_irq - #else -+extern void ltq_mask_and_ack_irq(struct irq_data *d); -+static void inline bsp_mask_and_ack_irq(int x) -+{ -+ struct irq_data d; -+ d.irq = x; -+ ltq_mask_and_ack_irq(&d); -+} -+#endif -+ -+#else - # include <asm/ifx/ifx_regs.h> - # include <asm/ifx/ifx_gptu.h> - #endif -@@ -107,7 +122,9 @@ - extern mps_mbx_dev *ifx_mps_get_device (mps_devices type); - - #ifdef LINUX_2_6 -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) - extern IFX_void_t bsp_mask_and_ack_irq (IFX_uint32_t irq_nr); -+#endif - - #else /* */ - extern IFX_void_t mask_and_ack_danube_irq (IFX_uint32_t irq_nr); ---- a/src/mps/drv_mps_vmmc_danube.c -+++ b/src/mps/drv_mps_vmmc_danube.c -@@ -16,11 +16,16 @@ - /* ============================= */ - /* Includes */ - /* ============================= */ -+#include "linux/version.h" - #include "drv_config.h" - - #ifdef SYSTEM_DANUBE /* defined in drv_mps_vmmc_config.h */ - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)) -+#include <linux/autoconf.h> -+#else - #include <generated/autoconf.h> -+#endif - - /* lib_ifxos headers */ - #include "ifx_types.h" -@@ -39,6 +44,7 @@ - # include <linux/dma-mapping.h> - - -+#define LQ_RCU_BASE_ADDR (KSEG1 + LTQ_RCU_BASE_ADDR) - # define LQ_RCU_RST ((u32 *)(LQ_RCU_BASE_ADDR + 0x0010)) - #define IFX_RCU_RST_REQ_CPU1 (1 << 3) - # define IFX_RCU_RST_REQ LQ_RCU_RST |