[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-216-ga6350cd
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-216-ga6350cd
|
From: Julien B a. A. <ar...@us...> - 2011-01-06 22:46:34
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via a6350cd5e7a181dcad9194ded381855a5deb680b (commit)
via 58716bef49f7b171cc37e743401291cfde121757 (commit)
from fb4f841d34ebdcdf0f8be8962eda220d1a619638 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a6350cd5e7a181dcad9194ded381855a5deb680b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 6 23:45:01 2011 +0100
[LINUX] fpgaloader: makes driver compatible with 2.6.3x kernels (on APF27)
commit 58716bef49f7b171cc37e743401291cfde121757
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 6 23:42:40 2011 +0100
[LINUX] fpgaloader: driver doesn't use IOCTL so remove it.
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.36.config | 45 +++++++++++++++-
.../fpga/dev_tools/loader/apf27-fpga-loader.c | 15 ++++--
.../modules/fpga/dev_tools/loader/fpga-loader.c | 55 ++-----------------
3 files changed, 58 insertions(+), 57 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
index a70499f..19f1e19 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.36
-# Wed Jan 5 14:04:58 2011
+# Thu Jan 6 23:38:31 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1538,12 +1538,51 @@ CONFIG_USB_ETH_RNDIS=y
#
# Armadeus specific drivers
#
-# CONFIG_ARMADEUS_DRIVERS is not set
+CONFIG_ARMADEUS_DRIVERS=y
+
+#
+# Misc.
+#
+# CONFIG_ARMADEUS_GENERIC_DRIVER is not set
+# CONFIG_ARMADEUS_AS1531_PLAT is not set
+# CONFIG_ARMADEUS_GPIO_DRIVER is not set
+# CONFIG_ARMADEUS_KEYPAD_DRIVER is not set
+# CONFIG_ARMADEUS_MAX1027 is not set
+# CONFIG_ARMADEUS_MAX9768 is not set
+
+#
+# FPGA related
+#
#
# FPGA Drivers
#
-# CONFIG_ARMADEUS_FPGA_DRIVERS is not set
+CONFIG_ARMADEUS_FPGA_DRIVERS=y
+
+#
+# Drivers for configuring and testing the FPGA
+#
+CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
+
+#
+# Others drivers for the FPGA
+#
+# CONFIG_ARMADEUS_I2C_OCORE_IRQMNG is not set
+# CONFIG_ARMADEUS_PS2KBD_DRIVER is not set
+# CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS is not set
+# CONFIG_POD_DRIVERS is not set
+
+#
+# Handheld related
+#
+# CONFIG_ARMADEUS_PWM_DRIVER is not set
+# CONFIG_IMX_BACKLIGHT is not set
+# CONFIG_HX5116_DISPLAY is not set
+
+#
+# Communication bus related
+#
+# CONFIG_ARMADEUS_ISP1761 is not set
CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
diff --git a/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c b/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
index 6e8e2e6..6f51943 100644
--- a/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
+++ b/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
@@ -19,19 +19,24 @@
*
*/
-#include <mach/iomux-mx1-mx2.h>
-#include <mach/gpio.h>
-#include <asm/io.h>
+#include <linux/version.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
-#include "xilinx-fpga-loader.h"
+#include <asm/io.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
+#include <mach/iomux-mx1-mx2.h>
+#else
+#include <mach/iomux-mx27.h>
+#endif
+#include <mach/gpio.h>
#include <mach/fpga.h>
-#include <linux/version.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
#define mxc_gpio_setup_multiple_pins mxc_gpio_setup_multiple
#define mxc_gpio_release_multiple_pins mxc_gpio_release_multiple
#endif
+#include "xilinx-fpga-loader.h"
+
#define CFG_FPGA_PWR (GPIO_PORTF | 19) /* FPGA prog pin */
#define CFG_FPGA_PRG (GPIO_PORTF | 11) /* FPGA prog pin */
#define CFG_FPGA_CLK (GPIO_PORTF | 15) /* FPGA clk pin */
diff --git a/target/linux/modules/fpga/dev_tools/loader/fpga-loader.c b/target/linux/modules/fpga/dev_tools/loader/fpga-loader.c
index bb98a47..f950207 100644
--- a/target/linux/modules/fpga/dev_tools/loader/fpga-loader.c
+++ b/target/linux/modules/fpga/dev_tools/loader/fpga-loader.c
@@ -33,10 +33,10 @@
#include "xilinx-fpga-loader.h"
-#define DRIVER_VERSION "0.9"
-#define DRIVER_NAME "fpgaloader"
-#define FPGA_PROC_DIRNAME "driver/fpga"
-#define FPGA_PROC_FILENAME FPGA_PROC_DIRNAME "/loader"
+#define DRIVER_VERSION "0.91"
+#define DRIVER_NAME "fpgaloader"
+#define FPGA_PROC_DIRNAME "driver/fpga"
+#define FPGA_PROC_FILENAME FPGA_PROC_DIRNAME "/loader"
#define FPGA_IOCTL 0x10000000 /* !! TO BE BETTER DEFINED !! */
/* global variables */
@@ -144,54 +144,12 @@ static int procfile_fpga_read(char *buffer, __attribute__ ((unused)) char **star
return ret;
}
-static int procfile_fpga_write( __attribute__ ((unused)) struct file *file, const char *buf, unsigned long count, void *data)
+static int procfile_fpga_write( __attribute__ ((unused)) struct file *file,
+ const char *buf, unsigned long count, void *data)
{
return count;
}
-/* Handling of IOCTL calls */
-int armadeus_fpga_ioctl( struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg )
-{
- int err = 0; int ret = 0;
- unsigned int minor;
-
- /* PRINTF( DRIVER_NAME " ## IOCTL received: (0x%x) ##\n", cmd ); */
- /* Extract the type and number bitfields, and don't decode wrong cmds:
- return ENOTTY (inappropriate ioctl) before access_ok() */
- if (_IOC_TYPE(cmd) != FPGA_IOCTL) return -ENOTTY;
-
- /* The direction is a bitmask, and VERIFY_WRITE catches R/W transfers.
- `Type' is user-oriented, while access_ok is kernel-oriented,
- so the concept of "read" and "write" is reversed */
- if (_IOC_DIR(cmd) & _IOC_READ)
- err = !access_ok(VERIFY_WRITE, (void *)arg, _IOC_SIZE(cmd));
- else if (_IOC_DIR(cmd) & _IOC_WRITE)
- err = !access_ok(VERIFY_READ, (void *)arg, _IOC_SIZE(cmd));
-
- if (err) return -EFAULT;
-
- if (down_interruptible(&fpga_sema))
- return -ERESTARTSYS;
-
- /* Extract and test minor */
- minor = MINOR(inode->i_rdev);
-/* if( minor > FPGA_MAX_MINOR ) {
- printk("Minor outside range: %d !\n", minor);
- return -EFAULT;
- }*/
-
- switch (cmd)
- {
- default:
- return -ENOTTY;
- break;
- }
-
- up(&fpga_sema);
-
- return ret;
-}
-
/* Create /proc entries for direct access to FPGA config */
static int create_proc_entries( void )
{
@@ -222,7 +180,6 @@ static struct file_operations fpga_fops = {
/* .read = armadeus_fpga_read, Configuration saving not supported yet */
.open = armadeus_fpga_open,
.release = armadeus_fpga_release,
- .ioctl = armadeus_fpga_ioctl,
};
#ifdef CONFIG_PM
hooks/post-receive
--
armadeus
|
