summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/boot/dts/omap3-minnow.dtsi8
-rw-r--r--drivers/mfd/m4sensorhub-core.c16
-rw-r--r--drivers/misc/c55_ctrl.c74
3 files changed, 59 insertions, 39 deletions
diff --git a/arch/arm/boot/dts/omap3-minnow.dtsi b/arch/arm/boot/dts/omap3-minnow.dtsi
index ee94d51d5fe..41bd4570438 100644
--- a/arch/arm/boot/dts/omap3-minnow.dtsi
+++ b/arch/arm/boot/dts/omap3-minnow.dtsi
@@ -94,7 +94,6 @@
compatible = "ti,c55-ctrl";
reg = <0 0>;
gpios = <&gpio3 12 1>, /* IRQ gpio_ap_int gpio-076 */
- <&gpio3 16 0>, /* gpio_reset gpio-80*/
<&gpio3 17 2>; /* gpio_c55_int gpio-81*/
vddc-supply = <&ldo9_reg>;
vddldo-supply = <&ldo3_reg>;
@@ -524,10 +523,9 @@
0x0b0 0x001 /* DSS_DATA2, MODE1 | OUTPUT */
0x0b2 0x001 /* DSS_DATA3, MODE1 | OUTPUT */
0x0b8 0x104 /* DSS_DATA6, MODE4 | INPUT */
- 0x0c0 0x004 /* DSS_DATA10, MODE4 | OUTPUT */
0x0c2 0x004 /* DSS_DATA11, MODE4 | OUTPUT */
0x0c6 0x004 /* DSS_DATA13, MODE4 | OUTPUT */
- 0x0dc 0x004 /* CAM_HS, MODE7 | OUTPUT */
+ 0x0dc 0x004 /* CAM_HS, MODE4 | OUTPUT */
0x0ea 0x004 /* MUXCAM_D2, MODE4 | OUTPUT */
0x0e4 0x004 /* CAM_FLD, MODE4 | OUTPUT */
0x0e6 0x11c /* CAM_D0, MODE4 | INPUT_PULLUP */
@@ -591,13 +589,13 @@
wdi_phy_gpio_mode: pinmux_wdi_phy_gpio_mode {
pinctrl-single,pins = <
- 0x142 0x004 /* MCBSP_FSX | OUTPUT */
+ 0x142 0x004 /* MCBSP3_FSX | OUTPUT */
>;
};
wdi_phy_safe_mode: pinmux_wdi_phy_safe_mode {
pinctrl-single,pins = <
- 0x142 0x10F /* MCBSP_FSX | INPUT | PULLDOWN */
+ 0x142 0x10F /* MCBSP3_FSX | INPUT | PULLDOWN */
>;
};
diff --git a/drivers/mfd/m4sensorhub-core.c b/drivers/mfd/m4sensorhub-core.c
index 0da3d71dd41..f6f56229ac0 100644
--- a/drivers/mfd/m4sensorhub-core.c
+++ b/drivers/mfd/m4sensorhub-core.c
@@ -710,29 +710,17 @@ static int __exit m4sensorhub_remove(struct i2c_client *client)
#ifdef CONFIG_PM
static int m4sensorhub_suspend(struct i2c_client *client, pm_message_t mesg)
{
- int err = 0;
KDEBUG(M4SH_INFO, "%s\n", __func__);
m4sensorhub_irq_pm_dbg_suspend();
- if (m4sensorhub_reg_write_1byte(
- &m4sensorhub_misc_data,
- M4SH_REG_USERSETTINGS_SCREENSTATUS, 0x00, 0xFF
- ) != 1)
- KDEBUG(M4SH_ERROR, "Unable to set screen status to 0x00\n");
- return err;
+ return 0;
}
static int m4sensorhub_resume(struct i2c_client *client)
{
- int err = 0;
KDEBUG(M4SH_INFO, "%s\n", __func__);
m4sensorhub_irq_pm_dbg_resume();
- if (m4sensorhub_reg_write_1byte(
- &m4sensorhub_misc_data,
- M4SH_REG_USERSETTINGS_SCREENSTATUS, 0x01, 0xFF
- ) != 1)
- KDEBUG(M4SH_ERROR, "Unable to set screen status to 0x01\n");
- return err;
+ return 0;
}
#endif /* CONFIG_PM */
diff --git a/drivers/misc/c55_ctrl.c b/drivers/misc/c55_ctrl.c
index 3c126eabebd..584754bfe50 100644
--- a/drivers/misc/c55_ctrl.c
+++ b/drivers/misc/c55_ctrl.c
@@ -15,6 +15,7 @@
#include <linux/gpio.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
+#include <linux/m4sensorhub.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/regulator/consumer.h>
@@ -31,7 +32,8 @@ enum {
};
struct c55_ctrl_data {
- int int_gpio;
+ int c55_ap_int_gpio;
+ int ap_c55_int_gpio;
struct wake_lock wake_lock;
struct regulator *reg_vddc;
struct regulator *reg_vddldo;
@@ -39,11 +41,10 @@ struct c55_ctrl_data {
struct mutex ctrl_mutex; /* mutex to handle critical area */
};
-#define NUM_GPIOS 3
+#define NUM_GPIOS 2
const char *gpio_labels[NUM_GPIOS] = {
"gpio_ap_int",
- "gpio_reset",
"gpio_c55_int"
};
@@ -51,10 +52,11 @@ static irqreturn_t c55_ctrl_isr(int irq, void *data)
{
struct c55_ctrl_data *cdata = data;
- pr_debug("%s: value=%d\n", __func__, gpio_get_value(cdata->int_gpio));
+ pr_debug("%s: value=%d\n", __func__,
+ gpio_get_value(cdata->c55_ap_int_gpio));
/* Interrupt is active low */
- if (gpio_get_value(cdata->int_gpio) == 0)
+ if (gpio_get_value(cdata->c55_ap_int_gpio) == 0)
wake_lock(&cdata->wake_lock);
else
wake_unlock(&cdata->wake_lock);
@@ -68,7 +70,7 @@ static void c55_ctrl_int_setup(struct c55_ctrl_data *cdata, int gpio)
int irq = __gpio_to_irq(gpio);
unsigned int flags = 0;
- if (cdata->int_gpio >= 0) {
+ if (cdata->c55_ap_int_gpio >= 0) {
/* Interrupt already registered */
return;
}
@@ -85,7 +87,7 @@ static void c55_ctrl_int_setup(struct c55_ctrl_data *cdata, int gpio)
}
enable_irq_wake(irq);
- cdata->int_gpio = gpio;
+ cdata->c55_ap_int_gpio = gpio;
}
static int c55_ctrl_gpio_setup(struct c55_ctrl_data *cdata, struct device *dev)
@@ -116,6 +118,7 @@ static int c55_ctrl_gpio_setup(struct c55_ctrl_data *cdata, struct device *dev)
gpio_direction_input(gpio);
c55_ctrl_int_setup(cdata, gpio);
} else {
+ cdata->ap_c55_int_gpio = gpio;
if ((flags & GPIOF_OUT_INIT_HIGH) == GPIOF_OUT_INIT_HIGH)
gpio_direction_output(gpio, 1);
else
@@ -130,6 +133,7 @@ static ssize_t c55_ctrl_enable(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
struct c55_ctrl_data *cdata = dev_get_drvdata(dev);
+ struct m4sensorhub_data *m4sensorhub = m4sensorhub_client_get_drvdata();
int mode;
if (kstrtoint(buf, 10, &mode) < 0)
@@ -140,35 +144,60 @@ static ssize_t c55_ctrl_enable(struct device *dev,
return -EINVAL;
}
+ if (m4sensorhub->mode != NORMALMODE) {
+ dev_err(dev, "M4 not ready, Unable to set screen status\n");
+ return -EINVAL;
+ }
+
if (mode == cdata->c55_mode)
return count;
mutex_lock(&cdata->ctrl_mutex);
if (mode == C55_ON) {
- if (cdata->reg_vddc && regulator_enable(cdata->reg_vddc))
- dev_err(dev, "regulator_enable failed for vddc\n");
- if (cdata->reg_vddldo && regulator_enable(cdata->reg_vddldo))
- dev_err(dev, "regulator_enable failed for vddldo\n");
+ gpio_set_value(cdata->ap_c55_int_gpio, 1);
+
+ if (m4sensorhub_reg_write_1byte
+ (m4sensorhub, M4SH_REG_USERSETTINGS_SCREENSTATUS, 0x01, 0xFF
+ ) != 1) {
+ dev_err(dev, "Unable to set screen status to 0x01\n");
+ mutex_unlock(&cdata->ctrl_mutex);
+ return -EINVAL;
+ }
+
+ enable_irq_wake(__gpio_to_irq(cdata->c55_ap_int_gpio));
} else {
- if (cdata->reg_vddldo)
- regulator_disable(cdata->reg_vddldo);
- if (cdata->reg_vddc)
- regulator_disable(cdata->reg_vddc);
+ /* Disable C55->AP IRQ when turning off C55 */
+ disable_irq_wake(__gpio_to_irq(cdata->c55_ap_int_gpio));
+
+ if (m4sensorhub_reg_write_1byte
+ (m4sensorhub, M4SH_REG_USERSETTINGS_SCREENSTATUS, 0x00, 0xFF
+ ) != 1) {
+ dev_err(dev, "Unable to set screen status to 0x00\n");
+ mutex_unlock(&cdata->ctrl_mutex);
+ return -EINVAL;
+ }
+
+ /* AP->C55 interrupt needs to be set low when C55 is off
+ * for current drain reasons */
+ gpio_set_value(cdata->ap_c55_int_gpio, 0);
+
+ /* Unlock wake lock in case it is active */
+ wake_unlock(&cdata->wake_lock);
}
cdata->c55_mode = mode;
mutex_unlock(&cdata->ctrl_mutex);
- dev_info(dev, "%s: power = %d\n", __func__, mode);
+ dev_info(dev, "%s: enable = %d\n", __func__, mode);
return count;
}
-static DEVICE_ATTR(enable, S_IWUSR, NULL, c55_ctrl_enable);
+static DEVICE_ATTR(enable, S_IWUSR | S_IWGRP, NULL, c55_ctrl_enable);
-static int c55_ctrl_probe(struct platform_device *pdev)
+static int c55_ctrl_probe(struct platform_device *pdev)
{
struct c55_ctrl_data *cdata;
int ret;
@@ -186,7 +215,8 @@ static int c55_ctrl_probe(struct platform_device *pdev)
mutex_init(&cdata->ctrl_mutex);
- cdata->int_gpio = -1;
+ cdata->c55_ap_int_gpio = -1;
+ cdata->ap_c55_int_gpio = -1;
ret = c55_ctrl_gpio_setup(cdata, &pdev->dev);
if (ret) {
@@ -197,10 +227,14 @@ static int c55_ctrl_probe(struct platform_device *pdev)
cdata->reg_vddc = devm_regulator_get(&pdev->dev, "vddc");
if (IS_ERR(cdata->reg_vddc))
cdata->reg_vddc = NULL;
+ else if (regulator_enable(cdata->reg_vddc))
+ dev_err(&pdev->dev, "regulator_enable failed for vddc\n");
cdata->reg_vddldo = devm_regulator_get(&pdev->dev, "vddldo");
if (IS_ERR(cdata->reg_vddldo))
cdata->reg_vddldo = NULL;
+ else if (regulator_enable(cdata->reg_vddldo))
+ dev_err(&pdev->dev, "regulator_enable failed for vddldo\n");
cdata->c55_mode = C55_OFF;
@@ -217,7 +251,7 @@ static int c55_ctrl_probe(struct platform_device *pdev)
return 0;
}
-static int c55_ctrl_remove(struct platform_device *pdev)
+static int c55_ctrl_remove(struct platform_device *pdev)
{
device_remove_file(&pdev->dev, &dev_attr_enable);
return 0;
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2025-11-02 12:31:20 +0000