From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 10 Sep 2012 05:46:34 +0000 (+1000)
Subject: Merge remote-tracking branch 'tegra/for-next'
X-Git-Tag: next-20120910~9
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8cc960fcaad30a5fefb689811cf87d86783a6836;p=karo-tx-linux.git

Merge remote-tracking branch 'tegra/for-next'
---

8cc960fcaad30a5fefb689811cf87d86783a6836
diff --cc arch/arm/Kconfig
index db1d019ebd6c,9ee51d16a732..92ebb88d517a
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -675,8 -683,10 +675,9 @@@ config ARCH_TEGR
  	select HAVE_CLK
  	select HAVE_SMP
  	select MIGHT_HAVE_CACHE_L2X0
 -	select NEED_MACH_IO_H if PCI
  	select ARCH_HAS_CPUFREQ
  	select USE_OF
+ 	select COMMON_CLK
  	help
  	  This enables support for NVIDIA Tegra based systems (Tegra APX,
  	  Tegra 6xx and Tegra 2 series).
diff --cc drivers/regulator/tps6586x-regulator.c
index c80f0ac05e2f,82125269b667..ce1e7cb8d513
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@@ -97,16 -100,71 +97,19 @@@ static int tps6586x_set_voltage_sel(str
  	return ret;
  }
  
 -static int tps6586x_get_voltage_sel(struct regulator_dev *rdev)
 -{
 -	struct tps6586x_regulator *ri = rdev_get_drvdata(rdev);
 -	struct device *parent = to_tps6586x_dev(rdev);
 -	uint8_t val, mask;
 -	int ret;
 -
 -	ret = tps6586x_read(parent, ri->volt_reg, &val);
 -	if (ret)
 -		return ret;
 -
 -	mask = ((1 << ri->volt_nbits) - 1) << ri->volt_shift;
 -	val = (val & mask) >> ri->volt_shift;
 -
 -	if (val >= ri->desc.n_voltages)
 -		BUG();
 -
 -	return val;
 -}
 -
 -static int tps6586x_regulator_enable(struct regulator_dev *rdev)
 -{
 -	struct tps6586x_regulator *ri = rdev_get_drvdata(rdev);
 -	struct device *parent = to_tps6586x_dev(rdev);
 -
 -	return tps6586x_set_bits(parent, ri->enable_reg[0],
 -				 1 << ri->enable_bit[0]);
 -}
 -
 -static int tps6586x_regulator_disable(struct regulator_dev *rdev)
 -{
 -	struct tps6586x_regulator *ri = rdev_get_drvdata(rdev);
 -	struct device *parent = to_tps6586x_dev(rdev);
 -
 -	return tps6586x_clr_bits(parent, ri->enable_reg[0],
 -				 1 << ri->enable_bit[0]);
 -}
 -
 -static int tps6586x_regulator_is_enabled(struct regulator_dev *rdev)
 -{
 -	struct tps6586x_regulator *ri = rdev_get_drvdata(rdev);
 -	struct device *parent = to_tps6586x_dev(rdev);
 -	uint8_t reg_val;
 -	int ret;
 -
 -	ret = tps6586x_read(parent, ri->enable_reg[0], &reg_val);
 -	if (ret)
 -		return ret;
 -
 -	return !!(reg_val & (1 << ri->enable_bit[0]));
 -}
 -
  static struct regulator_ops tps6586x_regulator_ops = {
  	.list_voltage = regulator_list_voltage_table,
 -	.get_voltage_sel = tps6586x_get_voltage_sel,
 +	.get_voltage_sel = regulator_get_voltage_sel_regmap,
  	.set_voltage_sel = tps6586x_set_voltage_sel,
  
 -	.is_enabled = tps6586x_regulator_is_enabled,
 -	.enable = tps6586x_regulator_enable,
 -	.disable = tps6586x_regulator_disable,
 +	.is_enabled = regulator_is_enabled_regmap,
 +	.enable = regulator_enable_regmap,
 +	.disable = regulator_disable_regmap,
  };
  
+ static struct regulator_ops tps6586x_sys_regulator_ops = {
+ };
+ 
  static const unsigned int tps6586x_ldo0_voltages[] = {
  	1200000, 1500000, 1800000, 2500000, 2700000, 2850000, 3100000, 3300000,
  };