Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'sr@denx.de' of git://git.denx.de/u-boot-staging

Browse source 
* 'sr@denx.de' of git://git.denx.de/u-boot-staging:
  Makefile: Add the missing dependency for spl target
  gpio: Adapt PCA9698 to standard GPIO API
This commit is contained in:
Wolfgang Denk 2011-11-21 22:11:05 +01:00
commit f9342e2c3e
3 changed files with 71 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -483,7 +483,7 @@ mmc_spl: $(TIMESTAMP_FILE) $(VERSION_FILE) depend
$(obj)mmc_spl/u-boot-mmc-spl.bin: mmc_spl $(obj)mmc_spl/u-boot-mmc-spl.bin: mmc_spl
$(obj)spl/u-boot-spl.bin: depend $(obj)spl/u-boot-spl.bin: $(SUBDIR_TOOLS) depend
$(MAKE) -C spl all $(MAKE) -C spl all
updater: updater:

62
drivers/gpio/pca9698.c
View file

@ -27,6 +27,7 @@
#include <common.h> #include <common.h>
#include <i2c.h> #include <i2c.h>
#include <asm/errno.h>
#include <pca9698.h> #include <pca9698.h>
/* /*
@ -39,19 +40,20 @@
#define PCA9698_REG_CONFIG 0x18 #define PCA9698_REG_CONFIG 0x18
#define PCA9698_BUFFER_SIZE 5 #define PCA9698_BUFFER_SIZE 5
#define PCA9698_GPIO_COUNT 40
static int pca9698_read40(u8 chip, u8 offset, u8 *buffer) static int pca9698_read40(u8 addr, u8 offset, u8 *buffer)
{ {
u8 command = offset | 0x80; /* autoincrement */ u8 command = offset | 0x80; /* autoincrement */
return i2c_read(chip, command, 1, buffer, PCA9698_BUFFER_SIZE); return i2c_read(addr, command, 1, buffer, PCA9698_BUFFER_SIZE);
} }
static int pca9698_write40(u8 chip, u8 offset, u8 *buffer) static int pca9698_write40(u8 addr, u8 offset, u8 *buffer)
{ {
u8 command = offset | 0x80; /* autoincrement */ u8 command = offset | 0x80; /* autoincrement */
return i2c_write(chip, command, 1, buffer, PCA9698_BUFFER_SIZE); return i2c_write(addr, command, 1, buffer, PCA9698_BUFFER_SIZE);
} }
static void pca9698_set_bit(unsigned gpio, u8 *buffer, unsigned value) static void pca9698_set_bit(unsigned gpio, u8 *buffer, unsigned value)
@ -65,41 +67,59 @@ static void pca9698_set_bit(unsigned gpio, u8 *buffer, unsigned value)
buffer[byte] &= ~(1 << bit); buffer[byte] &= ~(1 << bit);
} }
int pca9698_direction_input(u8 chip, unsigned offset) int pca9698_request(unsigned gpio, const char *label)
{
if (gpio >= PCA9698_GPIO_COUNT)
return -EINVAL;
return 0;
}
void pca9698_free(unsigned gpio)
{
}
int pca9698_direction_input(u8 addr, unsigned gpio)
{ {
u8 data[PCA9698_BUFFER_SIZE]; u8 data[PCA9698_BUFFER_SIZE];
int res; int res;
res = pca9698_read40(chip, PCA9698_REG_CONFIG, data); res = pca9698_read40(addr, PCA9698_REG_CONFIG, data);
if (res) if (res)
return res; return res;
pca9698_set_bit(offset, data, 1); pca9698_set_bit(gpio, data, 1);
return pca9698_write40(chip, PCA9698_REG_CONFIG, data);
return pca9698_write40(addr, PCA9698_REG_CONFIG, data);
} }
int pca9698_direction_output(u8 chip, unsigned offset) int pca9698_direction_output(u8 addr, unsigned gpio, int value)
{ {
u8 data[PCA9698_BUFFER_SIZE]; u8 data[PCA9698_BUFFER_SIZE];
int res; int res;
res = pca9698_read40(chip, PCA9698_REG_CONFIG, data); res = pca9698_set_value(addr, gpio, value);
if (res) if (res)
return res; return res;
pca9698_set_bit(offset, data, 0); res = pca9698_read40(addr, PCA9698_REG_CONFIG, data);
return pca9698_write40(chip, PCA9698_REG_CONFIG, data); if (res)
return res;
pca9698_set_bit(gpio, data, 0);
return pca9698_write40(addr, PCA9698_REG_CONFIG, data);
} }
int pca9698_get_input(u8 chip, unsigned offset) int pca9698_get_value(u8 addr, unsigned gpio)
{ {
unsigned config_byte = offset / 8; unsigned config_byte = gpio / 8;
unsigned config_bit = offset % 8; unsigned config_bit = gpio % 8;
unsigned value; unsigned value;
u8 data[PCA9698_BUFFER_SIZE]; u8 data[PCA9698_BUFFER_SIZE];
int res; int res;
res = pca9698_read40(chip, PCA9698_REG_INPUT, data); res = pca9698_read40(addr, PCA9698_REG_INPUT, data);
if (res) if (res)
return -1; return -1;
@ -108,16 +128,16 @@ int pca9698_get_input(u8 chip, unsigned offset)
return !!value; return !!value;
} }
int pca9698_set_output(u8 chip, unsigned offset, int value) int pca9698_set_value(u8 addr, unsigned gpio, int value)
{ {
u8 data[PCA9698_BUFFER_SIZE]; u8 data[PCA9698_BUFFER_SIZE];
int res; int res;
res = pca9698_read40(chip, PCA9698_REG_OUTPUT, data); res = pca9698_read40(addr, PCA9698_REG_OUTPUT, data);
if (res) if (res)
return res; return res;
memset(data, sizeof(data), 0); pca9698_set_bit(gpio, data, value);
pca9698_set_bit(offset, data, value);
return pca9698_write40(chip, PCA9698_REG_OUTPUT, data); return pca9698_write40(addr, PCA9698_REG_OUTPUT, data);
} }

33
include/pca9698.h
View file

@ -1,9 +1,34 @@
/*
* (C) Copyright 2011
* Dirk Eibach, Guntermann & Drunck GmbH, eibach@gdsys.de
*
* See file CREDITS for list of people who contributed to this
* project.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#ifndef __PCA9698_H_ #ifndef __PCA9698_H_
#define __PCA9698_H_ #define __PCA9698_H_
int pca9698_direction_input(u8 chip, unsigned offset); int pca9698_request(unsigned gpio, const char *label);
int pca9698_direction_output(u8 chip, unsigned offset); void pca9698_free(unsigned gpio);
int pca9698_get_input(u8 chip, unsigned offset); int pca9698_direction_input(u8 addr, unsigned gpio);
int pca9698_set_output(u8 chip, unsigned offset, int value); int pca9698_direction_output(u8 addr, unsigned gpio, int value);
int pca9698_get_value(u8 addr, unsigned gpio);
int pca9698_set_value(u8 addr, unsigned gpio, int value);
#endif /* __PCA9698_H_ */ #endif /* __PCA9698_H_ */