regulator: move pmu act8931 driver to kernel 3.10

Signed-off-by: dkl <dkl@rock-chips.com>

arch/arm/boot/dts/act8931.dtsi

@@ -0,0 +1,61 @@
+
+&act8931{
+
+	compatible = "act,act8931";
+
+	regulators {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		regulator@0{
+			reg = <0>;
+			regulator-compatible= "act_dcdc1";
+			regulator-always-on;
+			regulator-boot-on;
+		};
+
+		regulator@1 {
+			reg = <1>;
+			regulator-compatible = "act_dcdc2";
+			regulator-always-on;
+			regulator-boot-on;
+		};
+
+		regulator@2 {
+			reg = <2>;
+			regulator-compatible = "act_dcdc3";
+			regulator-always-on;
+			regulator-boot-on;
+		};
+
+		regulator@3 {
+			reg = <3>;
+			regulator-compatible= "act_ldo1";
+			regulator-always-on;
+			regulator-boot-on;
+		};
+
+		regulator@4 {
+			reg = <4>;
+			regulator-compatible = "act_ldo2";
+			regulator-always-on;
+			regulator-boot-on;
+		};
+
+		regulator@5 {
+			reg = <5>;
+			regulator-compatible = "act_ldo3";
+			regulator-always-on;
+			regulator-boot-on;
+		};
+
+		regulator@6 {
+			reg = <6>;
+			regulator-compatible = "act_ldo4";
+			regulator-always-on;
+			regulator-boot-on;
+		};
+
+	};
+
+};

arch/arm/boot/dts/rk312x-sdk.dtsi

@@ -169,6 +169,10 @@
 		reg = <0x1c>;
 		status = "okay";
 	};
+	act8931: act8931@5b {
+		reg = <0x5b>;
+		status = "okay";
+	};
 	rt5025: rt5025@35 {
 			compatible = "rt,rt5025";
 			reg = <0x35>;
@@ -616,6 +620,62 @@
 
 };
 
+/include/ "act8931.dtsi"
+&act8931 {
+	/* gpio: 0-irq, 1-pwr_hold */
+	gpios = <&gpio2 GPIO_B1 GPIO_ACTIVE_HIGH>, <&gpio1 GPIO_A2 GPIO_ACTIVE_HIGH>;
+	act8931,system-power-controller;
+
+	regulators {
+
+		act8931_dcdc1_reg: regulator@0{
+			regulator-name= "vccio";
+			regulator-min-microvolt = <1800000>;
+			regulator-max-microvolt = <3300000>;
+			regulator-initial-mode = <0x2>;
+		};
+
+		act8931_dcdc2_reg: regulator@1 {
+			regulator-name= "act_dcdc2";
+			regulator-min-microvolt = <1500000>;
+			regulator-max-microvolt = <1500000>;
+			regulator-initial-mode = <0x2>;
+		};
+
+		act8931_dcdc3_reg: regulator@2 {
+			regulator-name= "vdd_arm";
+			regulator-min-microvolt = <700000>;
+			regulator-max-microvolt = <1500000>;
+			regulator-initial-mode = <0x2>;
+		};
+
+		act8931_ldo1_reg:regulator@3 {
+			regulator-name= "act_ldo1";
+			regulator-min-microvolt = <2800000>;
+			regulator-max-microvolt = <2800000>;
+		};
+
+		act8931_ldo2_reg: regulator@4 {
+			regulator-name= "act_ldo2";
+			regulator-min-microvolt = <1800000>;
+			regulator-max-microvolt = <1800000>;
+		};
+
+		act8931_ldo3_reg: regulator@5 {
+			regulator-name= "act_ldo3";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+		};
+
+		act8931_ldo4_reg: regulator@6 {
+			regulator-name= "act_ldo4";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+		};
+	};
+
+};
+
 &pwm0 {
         status = "okay";
 };

arch/arm/configs/rockchip_defconfig

@@ -370,6 +370,7 @@ CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_ACT8846=y
 CONFIG_ACT8846_SUPPORT_RESET=y
+CONFIG_REGULATOR_ACT8931=y
 CONFIG_REGULATOR_RT5025=y
 CONFIG_REGULATOR_RT5036=y
 CONFIG_ROCKCHIP_PWM_REGULATOR=y

drivers/regulator/Kconfig

@@ -262,6 +262,12 @@ config ACT8846_SUPPORT_RESET
 	help
 	  Support short press key to restart.
 
+config REGULATOR_ACT8931
+	tristate "Active Semi ACT8931 PMIC regulators"
+        depends on I2C
+        help
+          Support the voltage and current regulators of the ACT8931 series of PMIC devices.
+
 config REGULATOR_RT5025
 	bool "Richtek RT5025 PMIC Voltage regulstors"
 	depends on MFD_RT5025

drivers/regulator/Makefile

@@ -13,6 +13,7 @@ obj-$(CONFIG_REGULATOR_88PM8607) += 88pm8607.o
 obj-$(CONFIG_REGULATOR_AAT2870) += aat2870-regulator.o
 obj-$(CONFIG_REGULATOR_AB3100) += ab3100.o
 obj-$(CONFIG_REGULATOR_AB8500)	+= ab8500.o ab8500-ext.o
+obj-$(CONFIG_REGULATOR_ACT8931) += act8931.o
 obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o
 obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o
 obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o