power: Move as3722 pmic to pmic/ directory

Most of the PMICs are in the drivers/power/pmic/ directory. Move this one
there.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 29e135756ba81e09725e42e79d465f0b05905dd9..90a3b00a7cf92b6757f6f7c11420d000651c38c8 100644 (file)
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -5,7 +5,6 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-obj-$(CONFIG_PMIC_AS3722)      += as3722.o
 obj-$(CONFIG_AXP152_POWER)     += axp152.o
 obj-$(CONFIG_AXP209_POWER)     += axp209.o
 obj-$(CONFIG_AXP221_POWER)     += axp221.o

diff --git a/drivers/power/as3722.c b/drivers/power/as3722.c
deleted file mode 100644 (file)
index c09e1de..0000000
--- a/drivers/power/as3722.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Copyright (C) 2014 NVIDIA Corporation
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#define pr_fmt(fmt) "as3722: " fmt
-
-#include <common.h>
-#include <dm.h>
-#include <errno.h>
-#include <fdtdec.h>
-#include <i2c.h>
-
-#include <power/as3722.h>
-
-#define AS3722_SD_VOLTAGE(n) (0x00 + (n))
-#define AS3722_GPIO_CONTROL(n) (0x08 + (n))
-#define  AS3722_GPIO_CONTROL_MODE_OUTPUT_VDDH (1 << 0)
-#define  AS3722_GPIO_CONTROL_MODE_OUTPUT_VDDL (7 << 0)
-#define  AS3722_GPIO_CONTROL_INVERT (1 << 7)
-#define AS3722_LDO_VOLTAGE(n) (0x10 + (n))
-#define AS3722_GPIO_SIGNAL_OUT 0x20
-#define AS3722_SD_CONTROL 0x4d
-#define AS3722_LDO_CONTROL 0x4e
-#define AS3722_ASIC_ID1 0x90
-#define  AS3722_DEVICE_ID 0x0c
-#define AS3722_ASIC_ID2 0x91
-
-int as3722_read(struct udevice *pmic, u8 reg, u8 *value)
-{
-       int err;
-
-       err = dm_i2c_read(pmic, reg, value, 1);
-       if (err < 0)
-               return err;
-
-       return 0;
-}
-
-int as3722_write(struct udevice *pmic, u8 reg, u8 value)
-{
-       int err;
-
-       err = dm_i2c_write(pmic, reg, &value, 1);
-       if (err < 0)
-               return err;
-
-       return 0;
-}
-
-static int as3722_read_id(struct udevice *pmic, u8 *id, u8 *revision)
-{
-       int err;
-
-       err = as3722_read(pmic, AS3722_ASIC_ID1, id);
-       if (err) {
-               error("failed to read ID1 register: %d", err);
-               return err;
-       }
-
-       err = as3722_read(pmic, AS3722_ASIC_ID2, revision);
-       if (err) {
-               error("failed to read ID2 register: %d", err);
-               return err;
-       }
-
-       return 0;
-}
-
-int as3722_sd_enable(struct udevice *pmic, unsigned int sd)
-{
-       u8 value;
-       int err;
-
-       if (sd > 6)
-               return -EINVAL;
-
-       err = as3722_read(pmic, AS3722_SD_CONTROL, &value);
-       if (err) {
-               error("failed to read SD control register: %d", err);
-               return err;
-       }
-
-       value |= 1 << sd;
-
-       err = as3722_write(pmic, AS3722_SD_CONTROL, value);
-       if (err < 0) {
-               error("failed to write SD control register: %d", err);
-               return err;
-       }
-
-       return 0;
-}
-
-int as3722_sd_set_voltage(struct udevice *pmic, unsigned int sd, u8 value)
-{
-       int err;
-
-       if (sd > 6)
-               return -EINVAL;
-
-       err = as3722_write(pmic, AS3722_SD_VOLTAGE(sd), value);
-       if (err < 0) {
-               error("failed to write SD%u voltage register: %d", sd, err);
-               return err;
-       }
-
-       return 0;
-}
-
-int as3722_ldo_enable(struct udevice *pmic, unsigned int ldo)
-{
-       u8 value;
-       int err;
-
-       if (ldo > 11)
-               return -EINVAL;
-
-       err = as3722_read(pmic, AS3722_LDO_CONTROL, &value);
-       if (err) {
-               error("failed to read LDO control register: %d", err);
-               return err;
-       }
-
-       value |= 1 << ldo;
-
-       err = as3722_write(pmic, AS3722_LDO_CONTROL, value);
-       if (err < 0) {
-               error("failed to write LDO control register: %d", err);
-               return err;
-       }
-
-       return 0;
-}
-
-int as3722_ldo_set_voltage(struct udevice *pmic, unsigned int ldo, u8 value)
-{
-       int err;
-
-       if (ldo > 11)
-               return -EINVAL;
-
-       err = as3722_write(pmic, AS3722_LDO_VOLTAGE(ldo), value);
-       if (err < 0) {
-               error("failed to write LDO%u voltage register: %d", ldo,
-                     err);
-               return err;
-       }
-
-       return 0;
-}
-
-int as3722_gpio_configure(struct udevice *pmic, unsigned int gpio,
-                         unsigned long flags)
-{
-       u8 value = 0;
-       int err;
-
-       if (flags & AS3722_GPIO_OUTPUT_VDDH)
-               value |= AS3722_GPIO_CONTROL_MODE_OUTPUT_VDDH;
-
-       if (flags & AS3722_GPIO_INVERT)
-               value |= AS3722_GPIO_CONTROL_INVERT;
-
-       err = as3722_write(pmic, AS3722_GPIO_CONTROL(gpio), value);
-       if (err) {
-               error("failed to configure GPIO#%u: %d", gpio, err);
-               return err;
-       }
-
-       return 0;
-}
-
-static int as3722_gpio_set(struct udevice *pmic, unsigned int gpio,
-                          unsigned int level)
-{
-       const char *l;
-       u8 value;
-       int err;
-
-       if (gpio > 7)
-               return -EINVAL;
-
-       err = as3722_read(pmic, AS3722_GPIO_SIGNAL_OUT, &value);
-       if (err < 0) {
-               error("failed to read GPIO signal out register: %d", err);
-               return err;
-       }
-
-       if (level == 0) {
-               value &= ~(1 << gpio);
-               l = "low";
-       } else {
-               value |= 1 << gpio;
-               l = "high";
-       }
-
-       err = as3722_write(pmic, AS3722_GPIO_SIGNAL_OUT, value);
-       if (err) {
-               error("failed to set GPIO#%u %s: %d", gpio, l, err);
-               return err;
-       }
-
-       return 0;
-}
-
-int as3722_gpio_direction_output(struct udevice *pmic, unsigned int gpio,
-                                unsigned int level)
-{
-       u8 value;
-       int err;
-
-       if (gpio > 7)
-               return -EINVAL;
-
-       if (level == 0)
-               value = AS3722_GPIO_CONTROL_MODE_OUTPUT_VDDL;
-       else
-               value = AS3722_GPIO_CONTROL_MODE_OUTPUT_VDDH;
-
-       err = as3722_write(pmic, AS3722_GPIO_CONTROL(gpio), value);
-       if (err) {
-               error("failed to configure GPIO#%u as output: %d", gpio, err);
-               return err;
-       }
-
-       err = as3722_gpio_set(pmic, gpio, level);
-       if (err < 0) {
-               error("failed to set GPIO#%u high: %d", gpio, err);
-               return err;
-       }
-
-       return 0;
-}
-
-/* Temporary function until we get the pmic framework */
-int as3722_get(struct udevice **devp)
-{
-       int bus = 0;
-       int address = 0x40;
-
-       return i2c_get_chip_for_busnum(bus, address, 1, devp);
-}
-
-int as3722_init(struct udevice **devp)
-{
-       struct udevice *pmic;
-       u8 id, revision;
-       const unsigned int bus = 0;
-       const unsigned int address = 0x40;
-       int err;
-
-       err = i2c_get_chip_for_busnum(bus, address, 1, &pmic);
-       if (err)
-               return err;
-       err = as3722_read_id(pmic, &id, &revision);
-       if (err < 0) {
-               error("failed to read ID: %d", err);
-               return err;
-       }
-
-       if (id != AS3722_DEVICE_ID) {
-               error("unknown device");
-               return -ENOENT;
-       }
-
-       debug("AS3722 revision %#x found on I2C bus %u, address %#x\n",
-             revision, bus, address);
-       if (devp)
-               *devp = pmic;
-
-       return 0;
-}

diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile
index 40240c79362c91e3f647419fad2dca8cc546e876..5f1bef33cddc38142349a7a61a5677517b049f60 100644 (file)
--- a/drivers/power/pmic/Makefile
+++ b/drivers/power/pmic/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_DM_PMIC_PFUZE100) += pfuze100.o
 obj-$(CONFIG_PMIC_S2MPS11) += s2mps11.o
 obj-$(CONFIG_DM_PMIC_SANDBOX) += sandbox.o i2c_pmic_emul.o
 obj-$(CONFIG_PMIC_ACT8846) += act8846.o
+obj-$(CONFIG_PMIC_AS3722) += as3722.o
 obj-$(CONFIG_PMIC_MAX8997) += max8997.o
 obj-$(CONFIG_PMIC_PM8916) += pm8916.o
 obj-$(CONFIG_PMIC_RK808) += rk808.o

diff --git a/drivers/power/pmic/as3722.c b/drivers/power/pmic/as3722.c
new file mode 100644 (file)
index 0000000..c09e1de
--- /dev/null
+++ b/drivers/power/pmic/as3722.c
@@ -0,0 +1,274 @@
+/*
+ * Copyright (C) 2014 NVIDIA Corporation
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#define pr_fmt(fmt) "as3722: " fmt
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <fdtdec.h>
+#include <i2c.h>
+
+#include <power/as3722.h>
+
+#define AS3722_SD_VOLTAGE(n) (0x00 + (n))
+#define AS3722_GPIO_CONTROL(n) (0x08 + (n))
+#define  AS3722_GPIO_CONTROL_MODE_OUTPUT_VDDH (1 << 0)
+#define  AS3722_GPIO_CONTROL_MODE_OUTPUT_VDDL (7 << 0)
+#define  AS3722_GPIO_CONTROL_INVERT (1 << 7)
+#define AS3722_LDO_VOLTAGE(n) (0x10 + (n))
+#define AS3722_GPIO_SIGNAL_OUT 0x20
+#define AS3722_SD_CONTROL 0x4d
+#define AS3722_LDO_CONTROL 0x4e
+#define AS3722_ASIC_ID1 0x90
+#define  AS3722_DEVICE_ID 0x0c
+#define AS3722_ASIC_ID2 0x91
+
+int as3722_read(struct udevice *pmic, u8 reg, u8 *value)
+{
+       int err;
+
+       err = dm_i2c_read(pmic, reg, value, 1);
+       if (err < 0)
+               return err;
+
+       return 0;
+}
+
+int as3722_write(struct udevice *pmic, u8 reg, u8 value)
+{
+       int err;
+
+       err = dm_i2c_write(pmic, reg, &value, 1);
+       if (err < 0)
+               return err;
+
+       return 0;
+}
+
+static int as3722_read_id(struct udevice *pmic, u8 *id, u8 *revision)
+{
+       int err;
+
+       err = as3722_read(pmic, AS3722_ASIC_ID1, id);
+       if (err) {
+               error("failed to read ID1 register: %d", err);
+               return err;
+       }
+
+       err = as3722_read(pmic, AS3722_ASIC_ID2, revision);
+       if (err) {
+               error("failed to read ID2 register: %d", err);
+               return err;
+       }
+
+       return 0;
+}
+
+int as3722_sd_enable(struct udevice *pmic, unsigned int sd)
+{
+       u8 value;
+       int err;
+
+       if (sd > 6)
+               return -EINVAL;
+
+       err = as3722_read(pmic, AS3722_SD_CONTROL, &value);
+       if (err) {
+               error("failed to read SD control register: %d", err);
+               return err;
+       }
+
+       value |= 1 << sd;
+
+       err = as3722_write(pmic, AS3722_SD_CONTROL, value);
+       if (err < 0) {
+               error("failed to write SD control register: %d", err);
+               return err;
+       }
+
+       return 0;
+}
+
+int as3722_sd_set_voltage(struct udevice *pmic, unsigned int sd, u8 value)
+{
+       int err;
+
+       if (sd > 6)
+               return -EINVAL;
+
+       err = as3722_write(pmic, AS3722_SD_VOLTAGE(sd), value);
+       if (err < 0) {
+               error("failed to write SD%u voltage register: %d", sd, err);
+               return err;
+       }
+
+       return 0;
+}
+
+int as3722_ldo_enable(struct udevice *pmic, unsigned int ldo)
+{
+       u8 value;
+       int err;
+
+       if (ldo > 11)
+               return -EINVAL;
+
+       err = as3722_read(pmic, AS3722_LDO_CONTROL, &value);
+       if (err) {
+               error("failed to read LDO control register: %d", err);
+               return err;
+       }
+
+       value |= 1 << ldo;
+
+       err = as3722_write(pmic, AS3722_LDO_CONTROL, value);
+       if (err < 0) {
+               error("failed to write LDO control register: %d", err);
+               return err;
+       }
+
+       return 0;
+}
+
+int as3722_ldo_set_voltage(struct udevice *pmic, unsigned int ldo, u8 value)
+{
+       int err;
+
+       if (ldo > 11)
+               return -EINVAL;
+
+       err = as3722_write(pmic, AS3722_LDO_VOLTAGE(ldo), value);
+       if (err < 0) {
+               error("failed to write LDO%u voltage register: %d", ldo,
+                     err);
+               return err;
+       }
+
+       return 0;
+}
+
+int as3722_gpio_configure(struct udevice *pmic, unsigned int gpio,
+                         unsigned long flags)
+{
+       u8 value = 0;
+       int err;
+
+       if (flags & AS3722_GPIO_OUTPUT_VDDH)
+               value |= AS3722_GPIO_CONTROL_MODE_OUTPUT_VDDH;
+
+       if (flags & AS3722_GPIO_INVERT)
+               value |= AS3722_GPIO_CONTROL_INVERT;
+
+       err = as3722_write(pmic, AS3722_GPIO_CONTROL(gpio), value);
+       if (err) {
+               error("failed to configure GPIO#%u: %d", gpio, err);
+               return err;
+       }
+
+       return 0;
+}
+
+static int as3722_gpio_set(struct udevice *pmic, unsigned int gpio,
+                          unsigned int level)
+{
+       const char *l;
+       u8 value;
+       int err;
+
+       if (gpio > 7)
+               return -EINVAL;
+
+       err = as3722_read(pmic, AS3722_GPIO_SIGNAL_OUT, &value);
+       if (err < 0) {
+               error("failed to read GPIO signal out register: %d", err);
+               return err;
+       }
+
+       if (level == 0) {
+               value &= ~(1 << gpio);
+               l = "low";
+       } else {
+               value |= 1 << gpio;
+               l = "high";
+       }
+
+       err = as3722_write(pmic, AS3722_GPIO_SIGNAL_OUT, value);
+       if (err) {
+               error("failed to set GPIO#%u %s: %d", gpio, l, err);
+               return err;
+       }
+
+       return 0;
+}
+
+int as3722_gpio_direction_output(struct udevice *pmic, unsigned int gpio,
+                                unsigned int level)
+{
+       u8 value;
+       int err;
+
+       if (gpio > 7)
+               return -EINVAL;
+
+       if (level == 0)
+               value = AS3722_GPIO_CONTROL_MODE_OUTPUT_VDDL;
+       else
+               value = AS3722_GPIO_CONTROL_MODE_OUTPUT_VDDH;
+
+       err = as3722_write(pmic, AS3722_GPIO_CONTROL(gpio), value);
+       if (err) {
+               error("failed to configure GPIO#%u as output: %d", gpio, err);
+               return err;
+       }
+
+       err = as3722_gpio_set(pmic, gpio, level);
+       if (err < 0) {
+               error("failed to set GPIO#%u high: %d", gpio, err);
+               return err;
+       }
+
+       return 0;
+}
+
+/* Temporary function until we get the pmic framework */
+int as3722_get(struct udevice **devp)
+{
+       int bus = 0;
+       int address = 0x40;
+
+       return i2c_get_chip_for_busnum(bus, address, 1, devp);
+}
+
+int as3722_init(struct udevice **devp)
+{
+       struct udevice *pmic;
+       u8 id, revision;
+       const unsigned int bus = 0;
+       const unsigned int address = 0x40;
+       int err;
+
+       err = i2c_get_chip_for_busnum(bus, address, 1, &pmic);
+       if (err)
+               return err;
+       err = as3722_read_id(pmic, &id, &revision);
+       if (err < 0) {
+               error("failed to read ID: %d", err);
+               return err;
+       }
+
+       if (id != AS3722_DEVICE_ID) {
+               error("unknown device");
+               return -ENOENT;
+       }
+
+       debug("AS3722 revision %#x found on I2C bus %u, address %#x\n",
+             revision, bus, address);
+       if (devp)
+               *devp = pmic;
+
+       return 0;
+}