apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'at91', 'dcache', 'ftrace', 'hwbpt', 'misc', 'mmci', 's3c', 'st-ux' and 'unwind' into devel

Browse Source
This commit is contained in:
Russell King
2010-10-18 22:34:25 +01:00
parent 8ed9059533 5fb31a96e1 80be7a7f64 19852e5900 29e29f2748 725343fa74 9e978f0962 f3af03de0b 5333a3de3c
commit 23beab76b4
921 changed files with 14129 additions and 5741 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpio/sx150x.c
+21 -5
View File
@@ -459,16 +459,32 @@ static int sx150x_init_io(struct sx150x_chip *chip, u8 base, u16 cfg)
return err;
}
static int sx150x_reset(struct sx150x_chip *chip)
{
int err;
err = i2c_smbus_write_byte_data(chip->client,
chip->dev_cfg->reg_reset,
0x12);
if (err < 0)
return err;
err = i2c_smbus_write_byte_data(chip->client,
chip->dev_cfg->reg_reset,
0x34);
return err;
}
static int sx150x_init_hw(struct sx150x_chip *chip,
struct sx150x_platform_data *pdata)
{
int err = 0;
err = i2c_smbus_write_word_data(chip->client,
chip->dev_cfg->reg_reset,
0x3412);
if (err < 0)
return err;
if (pdata->reset_during_probe) {
err = sx150x_reset(chip);
if (err < 0)
return err;
}
err = sx150x_i2c_write(chip->client,
chip->dev_cfg->reg_misc,
drivers/gpio/tc35892-gpio.c
+8
View File
@@ -322,6 +322,9 @@ static int __devinit tc35892_gpio_probe(struct platform_device *pdev)
goto out_freeirq;
}
if (pdata->setup)
pdata->setup(tc35892, tc35892_gpio->chip.base);
platform_set_drvdata(pdev, tc35892_gpio);
return 0;
@@ -338,9 +341,14 @@ out_free:
static int __devexit tc35892_gpio_remove(struct platform_device *pdev)
{
struct tc35892_gpio *tc35892_gpio = platform_get_drvdata(pdev);
struct tc35892 *tc35892 = tc35892_gpio->tc35892;
struct tc35892_gpio_platform_data *pdata = tc35892->pdata->gpio;
int irq = platform_get_irq(pdev, 0);
int ret;
if (pdata->remove)
pdata->remove(tc35892, tc35892_gpio->chip.base);
ret = gpiochip_remove(&tc35892_gpio->chip);
if (ret < 0) {
dev_err(tc35892_gpio->dev,