sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

arm:replace ifdef's by runtime checks in the i2c driver.

Browse source 
Change-Id: I5cdff48d8be9bbe5a4734192b451dc45983fbef2
This commit is contained in:
Kees Jongenburger 2013-12-13 14:16:29 +01:00
parent aa94c9ed55
commit 3b447ae154
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/i2c/arch/earm/omap_i2c.c
View file

@ -12,6 +12,7 @@
#include <minix/padconf.h> #include <minix/padconf.h>
#include <minix/sysutil.h> #include <minix/sysutil.h>
#include <minix/type.h> #include <minix/type.h>
#include <minix/board.h>
#include <minix/spin.h> #include <minix/spin.h>
/* device headers */ /* device headers */
@ -782,6 +783,8 @@ omap_interface_setup(int (**process) (minix_i2c_ioctl_exec_t * ioctl_exec),
int r; int r;
int i2c_rev, major, minor; int i2c_rev, major, minor;
struct minix_mem_range mr; struct minix_mem_range mr;
struct machine machine;
sys_getmachine(&machine);
/* Fill in the function pointer */ /* Fill in the function pointer */
@ -789,15 +792,15 @@ omap_interface_setup(int (**process) (minix_i2c_ioctl_exec_t * ioctl_exec),
/* Select the correct i2c definition for this SoC */ /* Select the correct i2c definition for this SoC */
#if defined(AM335X) if (BOARD_IS_BBXM(machine.board_id)){
omap_i2c_buses = am335x_i2c_buses; omap_i2c_buses = dm37xx_i2c_buses;
omap_i2c_nbuses = AM335X_OMAP_NBUSES; omap_i2c_nbuses = DM37XX_OMAP_NBUSES;
#elif defined(DM37XX) } else if (BOARD_IS_BB(machine.board_id)){
omap_i2c_buses = dm37xx_i2c_buses; omap_i2c_buses = am335x_i2c_buses;
omap_i2c_nbuses = DM37XX_OMAP_NBUSES; omap_i2c_nbuses = AM335X_OMAP_NBUSES;
#else } else {
#error /* Unsupported SoC */ return EINVAL;
#endif }
if (i2c_bus_id < 0 || i2c_bus_id >= omap_i2c_nbuses) { if (i2c_bus_id < 0 || i2c_bus_id >= omap_i2c_nbuses) {
return EINVAL; return EINVAL;