linaro-dev April 2012

linaro-dev@lists.linaro.org

113 participants
85 discussions

Booting linux-linaro-2.6.37 on Beagle Board

by Avik Sil

Hi, I tried booting linux-linaro-2.6.37 kernel on my beagle board C4. I executed following: 1. Installed linaro on a 4 GB SD card using linaro-image-tools 0.4.1 with hwpack daily snapshot hwpack_linaro-omap3_20110125-0_armel_supported.tar.gz and linaro-natty-headless-tar-20101202-1.tar.gz. It was booting properly on my BB. 2. Cloned linux-linaro-2.6.37. Changed to source directory 3. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- omap2plus_defconfig 4. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- menuconfig (enabled EARLY_PRINTK) 5. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- uImage 6. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- modules 7. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- modules_install INSTALL_MOD_PATH=/media/rootfs 8. cp arch/arm/boot/uImage /media/boot; sync Everything went on smoothly. Then I put the SD card on BB and powered it on. I got a kernel panic: http://paste.ubuntu.com/560562 Please help me figuring out the problem. Is it because I didn't create uInitrd? If so, then how to create it for ARM? Regards, Avik

11 years, 3 months

ARM A9 oprofile

by Dmitry Antipov

Hello Ming, could you please give some pointers to observe an overall status of oprofile support on ARM A9 cores? IIUC, now it doesn't work without oprofile.timer=1 kernel option, at least for Linus' tree; searching gives a lot of discussion/patches fragments and similar stuff, but I was unable to find a complete patch/git tree/whatever else to try. Thanks in advance, Dmitry

11 years, 6 months

[PATCH 1/2] mfd: Add Freescale's PMIC MC34708 support

by Ying-Chun Liu (PaulLiu)

From: "Ying-Chun Liu (PaulLiu)" <paul.liu(a)linaro.org> Freescale MC34708 is a PMIC which supports the following features: * 6 multi-mode buck regulators * Boost regulator for USB OTG. * 8 regulators for thermal budget optimization * 10-bit ADC * Real time clock Signed-off-by: Robin Gong <B38343(a)freescale.com> Signed-off-by: Ying-Chun Liu (PaulLiu) <paul.liu(a)linaro.org> Cc: Samuel Ortiz <sameo(a)linux.intel.com> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: Shawn Guo <shawn.guo(a)linaro.org> --- Documentation/devicetree/bindings/mfd/mc34708.txt | 61 ++ drivers/mfd/Kconfig | 11 + drivers/mfd/Makefile | 1 + drivers/mfd/mc34708-core.c | 634 +++++++++++++++++++++ include/linux/mfd/mc34708.h | 134 +++++ 5 files changed, 841 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/mc34708.txt create mode 100644 drivers/mfd/mc34708-core.c create mode 100644 include/linux/mfd/mc34708.h diff --git a/Documentation/devicetree/bindings/mfd/mc34708.txt b/Documentation/devicetree/bindings/mfd/mc34708.txt new file mode 100644 index 0000000..2bb5c9e --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/mc34708.txt @@ -0,0 +1,61 @@ +* Freescale MC34708 Power Management Integrated Circuit (PMIC) + +Required properties: +- compatible : Must be "fsl,mc34708" + +Optional properties: +- fsl,mc34708-uses-adc : Indicate the ADC is being used +- fsl,mc34708-uses-rtc : Indicate the RTC is being used +- fsl,mc34708-uses-ts : Indicate the touchscreen controller is being used + +Sub-nodes: +- regulators : Contain the regulator nodes. The MC34708 regulators are + bound using their names as listed below for enabling. + + mc34708__sw1a : regulator SW1A + mc34708__sw1b : regulator SW1B + mc34708__sw2 : regulator SW2 + mc34708__sw3 : regulator SW3 + mc34708__sw4A : regulator SW4A + mc34708__sw4b : regulator SW4B + mc34708__swbst : regulator SWBST + mc34708__vpll : regulator VPLL + mc34708__vrefddr : regulator VREFDDR + mc34708__vusb : regulator VUSB + mc34708__vusb2 : regulator VUSB2 + mc34708__vdac : regulator VDAC + mc34708__vgen1 : regulator VGEN1 + mc34708__vgen2 : regulator VGEN2 + + The bindings details of individual regulator device can be found in: + Documentation/devicetree/bindings/regulator/regulator.txt + +Examples: + +i2c@63fc8000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx53-i2c", "fsl,imx1-i2c"; + reg = <0x63fc8000 0x4000>; + interrupts = <62>; + status = "okay"; + + pmic: mc34708@8 { + compatible = "fsl,mc34708"; + reg = <0x08>; + + regulators { + mc34708__sw1a { + regulator-min-microvolt = <650000>; + regulator-max-microvolt = <1437500>; + regulator-boot-on; + regulator-always-on; + }; + + mc34708__vusb { + regulator-boot-on; + regulator-always-on; + }; + }; + }; +}; diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 29f463c..17b6cc5 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -600,6 +600,17 @@ config MFD_MC13XXX additional drivers must be enabled in order to use the functionality of the device. +config MFD_MC34708 + tristate "Support for Freescale's PMIC MC34708" + depends on I2C + depends on OF + select MFD_CORE + help + Support for the Freescale's PMIC MC34708 + This driver provides common support for accessing the device, + additional drivers must be enabled in order to use the + functionality of the device. + config ABX500_CORE bool "ST-Ericsson ABX500 Mixed Signal Circuit register functions" default y if ARCH_U300 || ARCH_U8500 diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 05fa538..b98d943 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -54,6 +54,7 @@ obj-$(CONFIG_TWL6030_PWM) += twl6030-pwm.o obj-$(CONFIG_TWL6040_CORE) += twl6040-core.o twl6040-irq.o obj-$(CONFIG_MFD_MC13XXX) += mc13xxx-core.o +obj-$(CONFIG_MFD_MC34708) += mc34708-core.o obj-$(CONFIG_MFD_CORE) += mfd-core.o diff --git a/drivers/mfd/mc34708-core.c b/drivers/mfd/mc34708-core.c new file mode 100644 index 0000000..54f469b --- /dev/null +++ b/drivers/mfd/mc34708-core.c @@ -0,0 +1,634 @@ +/* + * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/mutex.h> +#include <linux/interrupt.h> +#include <linux/i2c.h> +#include <linux/mfd/core.h> +#include <linux/mfd/mc34708.h> +#include <linux/delay.h> +#include <linux/of.h> +#include <linux/of_device.h> + +struct mc34708 { + struct i2c_client *i2c_client; + struct mutex lock; + int irq; + + irq_handler_t irqhandler[MC34708_NUM_IRQ]; + void *irqdata[MC34708_NUM_IRQ]; +}; + +/*! + * This is the enumeration of versions of PMIC + */ +enum mc34708_id { + MC_PMIC_ID_MC34708, + MC_PMIC_ID_INVALID, +}; + +struct mc34708_version_t { + /*! + * PMIC version identifier. + */ + enum mc34708_id id; + /*! + * Revision of the PMIC. + */ + int revision; +}; + +#define PMIC_I2C_RETRY_TIMES 10 + +static const struct i2c_device_id mc34708_device_id[] = { + {"mc34708", MC_PMIC_ID_MC34708}, + {}, +}; + +static const char * const mc34708_chipname[] = { + [MC_PMIC_ID_MC34708] = "mc34708", +}; + +void mc34708_lock(struct mc34708 *mc_pmic) +{ + if (!mutex_trylock(&mc_pmic->lock)) { + dev_dbg(&mc_pmic->i2c_client->dev, "wait for %s from %pf\n", + __func__, __builtin_return_address(0)); + + mutex_lock(&mc_pmic->lock); + } + dev_dbg(&mc_pmic->i2c_client->dev, "%s from %pf\n", + __func__, __builtin_return_address(0)); +} +EXPORT_SYMBOL(mc34708_lock); + +void mc34708_unlock(struct mc34708 *mc_pmic) +{ + dev_dbg(&mc_pmic->i2c_client->dev, "%s from %pf\n", + __func__, __builtin_return_address(0)); + mutex_unlock(&mc_pmic->lock); +} +EXPORT_SYMBOL(mc34708_unlock); + +static int mc34708_i2c_24bit_read(struct i2c_client *client, + unsigned int offset, + unsigned int *value) +{ + unsigned char buf[3]; + int ret; + int i; + + memset(buf, 0, 3); + for (i = 0; i < PMIC_I2C_RETRY_TIMES; i++) { + ret = i2c_smbus_read_i2c_block_data(client, offset, 3, buf); + if (ret == 3) + break; + usleep_range(1000, 1500); + } + + if (ret == 3) { + *value = buf[0] << 16 | buf[1] << 8 | buf[2]; + return ret; + } else { + dev_err(&client->dev, "24bit read error, ret = %d\n", ret); + return -1; /* return -1 on failure */ + } +} + +int mc34708_reg_read(struct mc34708 *mc_pmic, unsigned int offset, + u32 *val) +{ + BUG_ON(!mutex_is_locked(&mc_pmic->lock)); + + if (offset > MC34708_NUMREGS) + return -EINVAL; + + if (mc34708_i2c_24bit_read(mc_pmic->i2c_client, offset, val) == -1) + return -1; + *val &= 0xffffff; + + dev_vdbg(&mc_pmic->i2c_client->dev, "mc_pmic read [%02d] -> 0x%06x\n", + offset, *val); + + return 0; +} +EXPORT_SYMBOL(mc34708_reg_read); + +static int mc34708_i2c_24bit_write(struct i2c_client *client, + unsigned int offset, unsigned int reg_val) +{ + char buf[3]; + int ret; + int i; + + buf[0] = (reg_val >> 16) & 0xff; + buf[1] = (reg_val >> 8) & 0xff; + buf[2] = (reg_val) & 0xff; + + for (i = 0; i < PMIC_I2C_RETRY_TIMES; i++) { + ret = i2c_smbus_write_i2c_block_data(client, offset, 3, buf); + if (ret == 0) + break; + usleep_range(1000, 1500); + } + if (i == PMIC_I2C_RETRY_TIMES) + dev_err(&client->dev, "24bit write error, ret = %d\n", ret); + + return ret; +} + +int mc34708_reg_write(struct mc34708 *mc_pmic, unsigned int offset, u32 val) +{ + BUG_ON(!mutex_is_locked(&mc_pmic->lock)); + + if (offset > MC34708_NUMREGS) + return -EINVAL; + + if (mc34708_i2c_24bit_write(mc_pmic->i2c_client, offset, val)) + return -1; + val &= 0xffffff; + + dev_vdbg(&mc_pmic->i2c_client->dev, "mc_pmic write[%02d] -> 0x%06x\n", + offset, val); + + return 0; +} +EXPORT_SYMBOL(mc34708_reg_write); + +int mc34708_reg_rmw(struct mc34708 *mc_pmic, unsigned int offset, u32 mask, + u32 val) +{ + int ret; + u32 valread; + + BUG_ON(val & ~mask); + + ret = mc34708_reg_read(mc_pmic, offset, &valread); + if (ret) + return ret; + + valread = (valread & ~mask) | val; + + return mc34708_reg_write(mc_pmic, offset, valread); +} +EXPORT_SYMBOL(mc34708_reg_rmw); + +int mc34708_irq_mask(struct mc34708 *mc_pmic, int irq) +{ + int ret; + unsigned int offmask = + irq < 24 ? MC34708_REG_INT_MASK0 : MC34708_REG_INT_MASK1; + u32 irqbit = 1 << (irq < 24 ? irq : irq - 24); + u32 mask; + + if (irq < 0 || irq >= MC34708_NUM_IRQ) + return -EINVAL; + + ret = mc34708_reg_read(mc_pmic, offmask, &mask); + if (ret) + return ret; + + if (mask & irqbit) + /* already masked */ + return 0; + + return mc34708_reg_write(mc_pmic, offmask, mask | irqbit); +} +EXPORT_SYMBOL(mc34708_irq_mask); + +int mc34708_irq_unmask(struct mc34708 *mc_pmic, int irq) +{ + int ret; + unsigned int offmask = + irq < 24 ? MC34708_REG_INT_MASK0 : MC34708_REG_INT_MASK1; + u32 irqbit = 1 << (irq < 24 ? irq : irq - 24); + u32 mask; + + if (irq < 0 || irq >= MC34708_NUM_IRQ) + return -EINVAL; + + ret = mc34708_reg_read(mc_pmic, offmask, &mask); + if (ret) + return ret; + + if (!(mask & irqbit)) + /* already unmasked */ + return 0; + + return mc34708_reg_write(mc_pmic, offmask, mask & ~irqbit); +} +EXPORT_SYMBOL(mc34708_irq_unmask); + +int mc34708_irq_status(struct mc34708 *mc_pmic, int irq, int *enabled, + int *pending) +{ + int ret; + unsigned int offmask = + irq < 24 ? MC34708_REG_INT_MASK0 : MC34708_REG_INT_MASK1; + unsigned int offstat = + irq < 24 ? MC34708_REG_INT_STATUS0 : MC34708_REG_INT_STATUS1; + u32 irqbit = 1 << (irq < 24 ? irq : irq - 24); + + if (irq < 0 || irq >= MC34708_NUM_IRQ) + return -EINVAL; + + if (enabled) { + u32 mask; + + ret = mc34708_reg_read(mc_pmic, offmask, &mask); + if (ret) + return ret; + + *enabled = mask & irqbit; + } + + if (pending) { + u32 stat; + + ret = mc34708_reg_read(mc_pmic, offstat, &stat); + if (ret) + return ret; + + *pending = stat & irqbit; + } + + return 0; +} +EXPORT_SYMBOL(mc34708_irq_status); + +int mc34708_irq_ack(struct mc34708 *mc_pmic, int irq) +{ + unsigned int offstat = + irq < 24 ? MC34708_REG_INT_STATUS0 : MC34708_REG_INT_STATUS1; + unsigned int val = 1 << (irq < 24 ? irq : irq - 24); + + BUG_ON(irq < 0 || irq >= MC34708_NUM_IRQ); + + return mc34708_reg_write(mc_pmic, offstat, val); +} +EXPORT_SYMBOL(mc34708_irq_ack); + +int mc34708_irq_request_nounmask(struct mc34708 *mc_pmic, int irq, + irq_handler_t handler, const char *name, + void *dev) +{ + BUG_ON(!mutex_is_locked(&mc_pmic->lock)); + BUG_ON(!handler); + + if (irq < 0 || irq >= MC34708_NUM_IRQ) + return -EINVAL; + + if (mc_pmic->irqhandler[irq]) + return -EBUSY; + + mc_pmic->irqhandler[irq] = handler; + mc_pmic->irqdata[irq] = dev; + + return 0; +} +EXPORT_SYMBOL(mc34708_irq_request_nounmask); + +int mc34708_irq_request(struct mc34708 *mc_pmic, int irq, + irq_handler_t handler, const char *name, void *dev) +{ + int ret; + + ret = mc34708_irq_request_nounmask(mc_pmic, irq, handler, name, dev); + if (ret) + return ret; + + ret = mc34708_irq_unmask(mc_pmic, irq); + if (ret) { + mc_pmic->irqhandler[irq] = NULL; + mc_pmic->irqdata[irq] = NULL; + return ret; + } + + return 0; +} +EXPORT_SYMBOL(mc34708_irq_request); + +int mc34708_irq_free(struct mc34708 *mc_pmic, int irq, void *dev) +{ + int ret; + BUG_ON(!mutex_is_locked(&mc_pmic->lock)); + + if (irq < 0 || irq >= MC34708_NUM_IRQ || !mc_pmic->irqhandler[irq] || + mc_pmic->irqdata[irq] != dev) + return -EINVAL; + + ret = mc34708_irq_mask(mc_pmic, irq); + if (ret) + return ret; + + mc_pmic->irqhandler[irq] = NULL; + mc_pmic->irqdata[irq] = NULL; + + return 0; +} +EXPORT_SYMBOL(mc34708_irq_free); + +static inline irqreturn_t mc34708_irqhandler(struct mc34708 *mc_pmic, int irq) +{ + return mc_pmic->irqhandler[irq] (irq, mc_pmic->irqdata[irq]); +} + +/* + * returns: number of handled irqs or negative error + * locking: holds mc_pmic->lock + */ +static int mc34708_irq_handle(struct mc34708 *mc_pmic, + unsigned int offstat, unsigned int offmask, + int baseirq) +{ + u32 stat, mask; + int ret = mc34708_reg_read(mc_pmic, offstat, &stat); + int num_handled = 0; + + if (ret) + return ret; + + ret = mc34708_reg_read(mc_pmic, offmask, &mask); + if (ret) + return ret; + + while (stat & ~mask) { + int irq = __ffs(stat & ~mask); + + stat &= ~(1 << irq); + + if (likely(mc_pmic->irqhandler[baseirq + irq])) { + irqreturn_t handled; + + handled = mc34708_irqhandler(mc_pmic, baseirq + irq); + if (handled == IRQ_HANDLED) + num_handled++; + } else { + dev_err(&mc_pmic->i2c_client->dev, + "BUG: irq %u but no handler\n", baseirq + irq); + + mask |= 1 << irq; + + ret = mc34708_reg_write(mc_pmic, offmask, mask); + } + } + + return num_handled; +} + +static irqreturn_t mc34708_irq_thread(int irq, void *data) +{ + struct mc34708 *mc_pmic = data; + irqreturn_t ret; + int handled = 0; + + mc34708_lock(mc_pmic); + + ret = mc34708_irq_handle(mc_pmic, MC34708_REG_INT_STATUS0, + MC34708_REG_INT_MASK0, 0); + if (ret > 0) + handled = 1; + + ret = mc34708_irq_handle(mc_pmic, MC34708_REG_INT_STATUS1, + MC34708_REG_INT_MASK1, 24); + if (ret > 0) + handled = 1; + + mc34708_unlock(mc_pmic); + + return IRQ_RETVAL(handled); +} + +#define maskval(reg, mask) (((reg) & (mask)) >> __ffs(mask)) +static int mc34708_identify(struct mc34708 *mc_pmic, + struct mc34708_version_t *ver) +{ + int rev_id = 0; + int rev1 = 0; + int rev2 = 0; + int finid = 0; + int icid = 0; + int ret; + ret = mc34708_reg_read(mc_pmic, MC34708_REG_IDENTIFICATION, &rev_id); + if (ret) { + dev_dbg(&mc_pmic->i2c_client->dev, "read ID error!%x\n", ret); + return ret; + } + rev1 = (rev_id & 0x018) >> 3; + rev2 = (rev_id & 0x007); + icid = (rev_id & 0x01C0) >> 6; + finid = (rev_id & 0x01E00) >> 9; + ver->id = MC_PMIC_ID_MC34708; + + ver->revision = ((rev1 * 10) + rev2); + dev_dbg(&mc_pmic->i2c_client->dev, + "mc_pmic Rev %d.%d FinVer %x detected\n", rev1, rev2, finid); + + return 0; +} + +static const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id, + const struct i2c_client *client) +{ + while (id->name[0]) { + if (strcmp(client->name, id->name) == 0) + return id; + id++; + } + + return NULL; +} + +static const struct i2c_device_id *i2c_get_device_id(const struct i2c_client + *idev) +{ + const struct i2c_driver *idrv = to_i2c_driver(idev->dev.driver); + + return i2c_match_id(idrv->id_table, idev); +} + +static const char *mc34708_get_chipname(struct mc34708 *mc_pmic) +{ + const struct i2c_device_id *devid = + i2c_get_device_id(mc_pmic->i2c_client); + + if (!devid) + return NULL; + + return mc34708_chipname[devid->driver_data]; +} + +int mc34708_get_flags(struct mc34708 *mc_pmic) +{ + struct mc34708_platform_data *pdata = + dev_get_platdata(&mc_pmic->i2c_client->dev); + + return pdata->flags; +} +EXPORT_SYMBOL(mc34708_get_flags); + +static int mc34708_add_subdevice_pdata(struct mc34708 *mc_pmic, + const char *format, void *pdata, + size_t pdata_size) +{ + char buf[30]; + const char *name = mc34708_get_chipname(mc_pmic); + + struct mfd_cell cell = { + .platform_data = pdata, + .pdata_size = pdata_size, + }; + + /* there is no asnprintf in the kernel :-( */ + if (snprintf(buf, sizeof(buf), format, name) > sizeof(buf)) + return -E2BIG; + + cell.name = kmemdup(buf, strlen(buf) + 1, GFP_KERNEL); + if (!cell.name) + return -ENOMEM; + + return mfd_add_devices(&mc_pmic->i2c_client->dev, -1, &cell, 1, NULL, + 0); +} + +static int mc34708_add_subdevice(struct mc34708 *mc_pmic, const char *format) +{ + return mc34708_add_subdevice_pdata(mc_pmic, format, NULL, 0); +} + +static int mc34708_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct mc34708 *mc_pmic; + struct mc34708_version_t version; + struct mc34708_platform_data *pdata = client->dev.platform_data; + struct device_node *np = client->dev.of_node; + int ret; + + mc_pmic = kzalloc(sizeof(*mc_pmic), GFP_KERNEL); + if (!mc_pmic) + return -ENOMEM; + i2c_set_clientdata(client, mc_pmic); + mc_pmic->i2c_client = client; + + mutex_init(&mc_pmic->lock); + mc34708_lock(mc_pmic); + mc34708_identify(mc_pmic, &version); + /* mask all irqs */ + ret = mc34708_reg_write(mc_pmic, MC34708_REG_INT_MASK0, 0x00ffffff); + if (ret) + goto err_mask; + + ret = mc34708_reg_write(mc_pmic, MC34708_REG_INT_MASK1, 0x00ffffff); + if (ret) + goto err_mask; + + ret = request_threaded_irq(client->irq, NULL, mc34708_irq_thread, + IRQF_ONESHOT | IRQF_TRIGGER_HIGH, "mc_pmic", + mc_pmic); + + if (ret) { + err_mask: + mc34708_unlock(mc_pmic); + dev_set_drvdata(&client->dev, NULL); + kfree(mc_pmic); + return ret; + } + + mc34708_unlock(mc_pmic); + + if (pdata && pdata->flags & MC34708_USE_ADC) + mc34708_add_subdevice(mc_pmic, "%s-adc"); + else if (of_get_property(np, "fsl,mc34708-uses-adc", NULL)) + mc34708_add_subdevice(mc_pmic, "%s-adc"); + + + if (pdata && pdata->flags & MC34708_USE_REGULATOR) { + struct mc34708_regulator_platform_data regulator_pdata = { + .num_regulators = pdata->num_regulators, + .regulators = pdata->regulators, + }; + + mc34708_add_subdevice_pdata(mc_pmic, "%s-regulator", + &regulator_pdata, + sizeof(regulator_pdata)); + } else if (of_find_node_by_name(np, "regulators")) { + mc34708_add_subdevice(mc_pmic, "%s-regulator"); + } + + if (pdata && pdata->flags & MC34708_USE_RTC) + mc34708_add_subdevice(mc_pmic, "%s-rtc"); + else if (of_get_property(np, "fsl,mc34708-uses-rtc", NULL)) + mc34708_add_subdevice(mc_pmic, "%s-rtc"); + + if (pdata && pdata->flags & MC34708_USE_TOUCHSCREEN) + mc34708_add_subdevice(mc_pmic, "%s-ts"); + else if (of_get_property(np, "fsl,mc34708-uses-ts", NULL)) + mc34708_add_subdevice(mc_pmic, "%s-ts"); + + return 0; +} + +static int __devexit mc34708_remove(struct i2c_client *client) +{ + struct mc34708 *mc_pmic = dev_get_drvdata(&client->dev); + + free_irq(mc_pmic->i2c_client->irq, mc_pmic); + + mfd_remove_devices(&client->dev); + + kfree(mc_pmic); + + return 0; +} + +static const struct of_device_id mc34708_dt_ids[] = { + { .compatible = "fsl,mc34708" }, + { /* sentinel */ } +}; + +static struct i2c_driver mc34708_driver = { + .id_table = mc34708_device_id, + .driver = { + .name = "mc34708", + .owner = THIS_MODULE, + .of_match_table = mc34708_dt_ids, + }, + .probe = mc34708_probe, + .remove = __devexit_p(mc34708_remove), +}; + +static int __init mc34708_init(void) +{ + return i2c_add_driver(&mc34708_driver); +} +subsys_initcall(mc34708_init); + +static void __exit mc34708_exit(void) +{ + i2c_del_driver(&mc34708_driver); +} +module_exit(mc34708_exit); + +MODULE_DESCRIPTION("Core driver for Freescale MC34708 PMIC"); +MODULE_AUTHOR("Robin Gong <B38343(a)freescale.com>, " + "Ying-Chun Liu (PaulLiu) <paul.liu(a)linaro.org>"); +MODULE_LICENSE("GPL v2"); diff --git a/include/linux/mfd/mc34708.h b/include/linux/mfd/mc34708.h new file mode 100644 index 0000000..505813d --- /dev/null +++ b/include/linux/mfd/mc34708.h @@ -0,0 +1,134 @@ +/* For mc34708's pmic driver + * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. + * + * based on: + * Copyright 2009-2010 Pengutronix, Uwe Kleine-Koenig + * <u.kleine-koenig(a)pengutronix.de> + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License version 2 as published by the + * Free Software Foundation. + */ +#ifndef __LINUX_MFD_MC_34708_H +#define __LINUX_MFD_MC_34708_H + +#include <linux/interrupt.h> +#include <linux/regulator/driver.h> + +struct mc34708; + +void mc34708_lock(struct mc34708 *mc_pmic); +void mc34708_unlock(struct mc34708 *mc_pmic); + +int mc34708_reg_read(struct mc34708 *mc_pmic, unsigned int offset, u32 *val); +int mc34708_reg_write(struct mc34708 *mc_pmic, unsigned int offset, u32 val); +int mc34708_reg_rmw(struct mc34708 *mc_pmic, unsigned int offset, + u32 mask, u32 val); + +int mc34708_get_flags(struct mc34708 *mc_pmic); + +int mc34708_irq_request(struct mc34708 *mc_pmic, int irq, + irq_handler_t handler, const char *name, void *dev); +int mc34708_irq_request_nounmask(struct mc34708 *mc_pmic, int irq, + irq_handler_t handler, const char *name, + void *dev); +int mc34708_irq_free(struct mc34708 *mc_pmic, int irq, void *dev); +int mc34708_irq_mask(struct mc34708 *mc_pmic, int irq); +int mc34708_irq_unmask(struct mc34708 *mc_pmic, int irq); +int mc34708_irq_status(struct mc34708 *mc_pmic, int irq, + int *enabled, int *pending); +int mc34708_irq_ack(struct mc34708 *mc_pmic, int irq); + +int mc34708_get_flags(struct mc34708 *mc_pmic); + +#define MC34708_SW1A 0 +#define MC34708_SW1B 1 +#define MC34708_SW2 2 +#define MC34708_SW3 3 +#define MC34708_SW4A 4 +#define MC34708_SW4B 5 +#define MC34708_SW5 6 +#define MC34708_SWBST 7 +#define MC34708_VPLL 8 +#define MC34708_VREFDDR 9 +#define MC34708_VUSB 10 +#define MC34708_VUSB2 11 +#define MC34708_VDAC 12 +#define MC34708_VGEN1 13 +#define MC34708_VGEN2 14 +#define MC34708_REGU_NUM 15 + +#define MC34708_REG_INT_STATUS0 0 +#define MC34708_REG_INT_MASK0 1 +#define MC34708_REG_INT_STATUS1 3 +#define MC34708_REG_INT_MASK1 4 +#define MC34708_REG_IDENTIFICATION 7 + +#define MC34708_IRQ_ADCDONE 0 +#define MC34708_IRQ_TSDONE 1 +#define MC34708_IRQ_TSPENDET 2 +#define MC34708_IRQ_USBDET 3 +#define MC34708_IRQ_AUXDET 4 +#define MC34708_IRQ_USBOVP 5 +#define MC34708_IRQ_AUXOVP 6 +#define MC34708_IRQ_CHRTIMEEXP 7 +#define MC34708_IRQ_BATTOTP 8 +#define MC34708_IRQ_BATTOVP 9 +#define MC34708_IRQ_CHRCMPL 10 +#define MC34708_IRQ_WKVBUSDET 11 +#define MC34708_IRQ_WKAUXDET 12 +#define MC34708_IRQ_LOWBATT 13 +#define MC34708_IRQ_VBUSREGMI 14 +#define MC34708_IRQ_ATTACH 15 +#define MC34708_IRQ_DETACH 16 +#define MC34708_IRQ_KP 17 +#define MC34708_IRQ_LKP 18 +#define MC34708_IRQ_LKR 19 +#define MC34708_IRQ_UKNOW_ATTA 20 +#define MC34708_IRQ_ADC_CHANGE 21 +#define MC34708_IRQ_STUCK_KEY 22 +#define MC34708_IRQ_STUCK_KEY_RCV 23 +#define MC34708_IRQ_1HZ 24 +#define MC34708_IRQ_TODA 25 +#define MC34708_IRQ_UNUSED1 26 +#define MC34708_IRQ_PWRON1 27 +#define MC34708_IRQ_PWRON2 28 +#define MC34708_IRQ_WDIRESET 29 +#define MC34708_IRQ_SYSRST 30 +#define MC34708_IRQ_RTCRST 31 +#define MC34708_IRQ_PCI 32 +#define MC34708_IRQ_WARM 33 +#define MC34708_IRQ_MEMHLD 34 +#define MC34708_IRQ_UNUSED2 35 +#define MC34708_IRQ_THWARNL 36 +#define MC34708_IRQ_THWARNH 37 +#define MC34708_IRQ_CLK 38 +#define MC34708_IRQ_UNUSED3 39 +#define MC34708_IRQ_SCP 40 +#define MC34708_NUMREGS 0x3f +#define MC34708_NUM_IRQ 46 + +struct mc34708_regulator_init_data { + int id; + struct regulator_init_data *init_data; +}; + +struct mc34708_regulator_platform_data { + int num_regulators; + struct mc34708_regulator_init_data *regulators; +}; + +struct mc34708_platform_data { +#define MC34708_USE_TOUCHSCREEN (1 << 0) +#define MC34708_USE_CODEC (1 << 1) +#define MC34708_USE_ADC (1 << 2) +#define MC34708_USE_RTC (1 << 3) +#define MC34708_USE_REGULATOR (1 << 4) +#define MC34708_USE_LED (1 << 5) + unsigned int flags; + + int num_regulators; + struct mc34708_regulator_init_data *regulators; +}; + +#endif /* ifndef __LINUX_MFD_MC_PMIC_H */ -- 1.7.9.5

11 years, 9 months

[PATCH] cpuidle : use percpu cpuidle in the core code

by Daniel Lezcano

The usual cpuidle initialization routines are to register the driver, then register a cpuidle device per cpu. With the device's state count default initialization with the driver's state count, the code initialization remains mostly the same in the different drivers. We can then add a new function 'cpuidle_register' where we register the driver and the devices. These devices can be defined in a global static variable in cpuidle.c. We will be able to factor out and remove a lot of duplicate lines of code. As we still have some drivers, with different initialization routines, we keep 'cpuidle_register_driver' and 'cpuidle_register_device' as low level initialization routines to do some specific operations on the cpuidle devices. Signed-off-by: Daniel Lezcano <daniel.lezcano(a)linaro.org> --- drivers/cpuidle/cpuidle.c | 34 ++++++++++++++++++++++++++++++++++ include/linux/cpuidle.h | 3 +++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index b8a1faf..2a174e8 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -23,6 +23,7 @@ #include "cpuidle.h" DEFINE_PER_CPU(struct cpuidle_device *, cpuidle_devices); +DEFINE_PER_CPU(struct cpuidle_device, cpuidle_device); DEFINE_MUTEX(cpuidle_lock); LIST_HEAD(cpuidle_detected_devices); @@ -391,6 +392,39 @@ int cpuidle_register_device(struct cpuidle_device *dev) EXPORT_SYMBOL_GPL(cpuidle_register_device); +int cpuidle_register(struct cpuidle_driver *drv) +{ + int ret, cpu; + struct cpuidle_device *dev; + + ret = cpuidle_register_driver(drv); + if (ret) + return ret; + + for_each_online_cpu(cpu) { + dev = &per_cpu(cpuidle_device, cpu); + dev->cpu = cpu; + + ret = cpuidle_register_device(dev); + if (ret) + goto out_unregister; + } + +out: + return ret; + +out_unregister: + for_each_online_cpu(cpu) { + dev = &per_cpu(cpuidle_device, cpu); + cpuidle_unregister_device(dev); + } + + cpuidle_unregister_driver(drv); + + goto out; +} +EXPORT_SYMBOL_GPL(cpuidle_register); + /** * cpuidle_unregister_device - unregisters a CPU's idle PM feature * @dev: the cpu diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index f3ebbba..17e3d33 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -133,6 +133,7 @@ struct cpuidle_driver { #ifdef CONFIG_CPU_IDLE extern void disable_cpuidle(void); extern int cpuidle_idle_call(void); +extern int cpuidle_register(struct cpuidle_driver *drv); extern int cpuidle_register_driver(struct cpuidle_driver *drv); struct cpuidle_driver *cpuidle_get_driver(void); extern void cpuidle_unregister_driver(struct cpuidle_driver *drv); @@ -150,6 +151,8 @@ extern int cpuidle_wrap_enter(struct cpuidle_device *dev, #else static inline void disable_cpuidle(void) { } static inline int cpuidle_idle_call(void) { return -ENODEV; } +static inline int cpuidle_register(struct cpuidle_driver *drv) +{return -ENODEV; } static inline int cpuidle_register_driver(struct cpuidle_driver *drv) {return -ENODEV; } static inline struct cpuidle_driver *cpuidle_get_driver(void) {return NULL; } -- 1.7.5.4

11 years, 11 months

[PATCH][V3] cpuidle : use percpu cpuidle in the core code

by Daniel Lezcano

The usual cpuidle initialization routines register the driver and then register a cpuidle device per cpu. By default, most drivers initialize the device state count with the driver state count. We can then add a new function 'cpuidle_register' where we register the driver and the devices. These devices can be defined in a global static variable in cpuidle.c. We will be able to factor out and remove a lot of duplicate lines of code. As we still have some drivers, with different initialization routines, we keep 'cpuidle_register_driver' and 'cpuidle_register_device' as low level initialization routines to do some specific operations on the cpuidle devices. Signed-off-by: Daniel Lezcano <daniel.lezcano(a)linaro.org> --- drivers/cpuidle/cpuidle.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/linux/cpuidle.h | 3 +++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index 87411ce..4d1f79b 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -23,6 +23,7 @@ #include "cpuidle.h" DEFINE_PER_CPU(struct cpuidle_device *, cpuidle_devices); +DEFINE_PER_CPU(struct cpuidle_device, cpuidle_device); DEFINE_MUTEX(cpuidle_lock); LIST_HEAD(cpuidle_detected_devices); @@ -419,6 +420,47 @@ int cpuidle_register_device(struct cpuidle_device *dev) EXPORT_SYMBOL_GPL(cpuidle_register_device); +/* + * cpuidle_register : register cpuidle driver and devices + * Note this function must be called after smp_init. + * @drv : the cpuidle driver + * Returns 0 on success, < 0 otherwise + */ +int cpuidle_register(struct cpuidle_driver *drv) +{ + int ret, cpu, i; + struct cpuidle_device *dev; + + ret = cpuidle_register_driver(drv); + if (ret) + return ret; + + for_each_online_cpu(cpu) { + dev = &per_cpu(cpuidle_device, cpu); + dev->cpu = cpu; + + ret = cpuidle_register_device(dev); + if (ret) + goto out_unregister; + } + +out: + return ret; + +out_unregister: + for_each_online_cpu(i) { + if (i == cpu) + break; + dev = &per_cpu(cpuidle_device, i); + cpuidle_unregister_device(dev); + } + + cpuidle_unregister_driver(drv); + + goto out; +} +EXPORT_SYMBOL_GPL(cpuidle_register); + /** * cpuidle_unregister_device - unregisters a CPU's idle PM feature * @dev: the cpu diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 6c26a3d..3475294 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -135,6 +135,7 @@ struct cpuidle_driver { #ifdef CONFIG_CPU_IDLE extern void disable_cpuidle(void); extern int cpuidle_idle_call(void); +extern int cpuidle_register(struct cpuidle_driver *drv); extern int cpuidle_register_driver(struct cpuidle_driver *drv); struct cpuidle_driver *cpuidle_get_driver(void); extern void cpuidle_unregister_driver(struct cpuidle_driver *drv); @@ -154,6 +155,8 @@ extern int cpuidle_play_dead(void); #else static inline void disable_cpuidle(void) { } static inline int cpuidle_idle_call(void) { return -ENODEV; } +static inline int cpuidle_register(struct cpuidle_driver *drv) +{return -ENODEV; } static inline int cpuidle_register_driver(struct cpuidle_driver *drv) {return -ENODEV; } static inline struct cpuidle_driver *cpuidle_get_driver(void) {return NULL; } -- 1.7.5.4

11 years, 11 months

[PATCH v5 0/4] Device tree support for regulators

by Rajendra Nayak

v5 is based on 3.2-rc2 and has the following changes -1- Used microvolt/microamp in bindings instead of uV/uA -2- Added more documentation surrounding regulator-consumer mapping in the core bindings -3- Dropped CONFIG_OF_REGULATOR and use just CONFIG_OF -4- Reused core regulator bindings on Fixed regulator bindings -5- Corrected the gpio binding for Fixed regulator The patches can be found here: git://gitorious.org/omap-pm/linux.git for-dt/regulator For the first 2 patches (1/4 and 2/4) I have dropped Acks from Mark, since they have changed to some extent from the last post and retained the Acks recieved on the last 2 patches (3/4 and 4/4) as they remain unchanged. regards, Rajendra Rajendra Nayak (4): regulator: helper routine to extract regulator_init_data regulator: adapt fixed regulator driver to dt regulator: pass additional of_node to regulator_register() regulator: map consumer regulator based on device tree .../bindings/regulator/fixed-regulator.txt | 29 +++++++ .../devicetree/bindings/regulator/regulator.txt | 54 +++++++++++++ drivers/regulator/88pm8607.c | 2 +- drivers/regulator/Makefile | 1 + drivers/regulator/aat2870-regulator.c | 2 +- drivers/regulator/ab3100.c | 2 +- drivers/regulator/ab8500.c | 2 +- drivers/regulator/ad5398.c | 2 +- drivers/regulator/bq24022.c | 2 +- drivers/regulator/core.c | 82 ++++++++++++++++--- drivers/regulator/da903x.c | 2 +- drivers/regulator/db8500-prcmu.c | 2 +- drivers/regulator/dummy.c | 2 +- drivers/regulator/fixed.c | 62 +++++++++++++++- drivers/regulator/isl6271a-regulator.c | 2 +- drivers/regulator/lp3971.c | 2 +- drivers/regulator/lp3972.c | 2 +- drivers/regulator/max1586.c | 2 +- drivers/regulator/max8649.c | 2 +- drivers/regulator/max8660.c | 2 +- drivers/regulator/max8925-regulator.c | 2 +- drivers/regulator/max8952.c | 2 +- drivers/regulator/max8997.c | 2 +- drivers/regulator/max8998.c | 2 +- drivers/regulator/mc13783-regulator.c | 2 +- drivers/regulator/mc13892-regulator.c | 2 +- drivers/regulator/of_regulator.c | 81 +++++++++++++++++++ drivers/regulator/pcap-regulator.c | 2 +- drivers/regulator/pcf50633-regulator.c | 2 +- drivers/regulator/tps6105x-regulator.c | 3 +- drivers/regulator/tps65023-regulator.c | 2 +- drivers/regulator/tps6507x-regulator.c | 2 +- drivers/regulator/tps6524x-regulator.c | 2 +- drivers/regulator/tps6586x-regulator.c | 2 +- drivers/regulator/tps65910-regulator.c | 2 +- drivers/regulator/tps65912-regulator.c | 2 +- drivers/regulator/twl-regulator.c | 2 +- drivers/regulator/wm831x-dcdc.c | 8 +- drivers/regulator/wm831x-isink.c | 2 +- drivers/regulator/wm831x-ldo.c | 6 +- drivers/regulator/wm8350-regulator.c | 2 +- drivers/regulator/wm8400-regulator.c | 2 +- drivers/regulator/wm8994-regulator.c | 2 +- include/linux/regulator/driver.h | 4 +- include/linux/regulator/of_regulator.h | 20 +++++ sound/soc/codecs/sgtl5000.c | 2 +- 46 files changed, 362 insertions(+), 58 deletions(-) create mode 100644 Documentation/devicetree/bindings/regulator/fixed-regulator.txt create mode 100644 Documentation/devicetree/bindings/regulator/regulator.txt create mode 100644 drivers/regulator/of_regulator.c create mode 100644 include/linux/regulator/of_regulator.h

11 years, 11 months

Optimized kernel memcpy/memset

by Christian Robottom Reis

Hey there, I was asked today in the board meeting about the use of NEON routines in the kernel; I said we had looked into this but hadn't done it because a) it wasn't conclusively better and b) if better, it would need to be done conditionally per-platform. But I wanted to double-check that's actually true (and I'm copying Vijay to keep me honest). I have some references: http://lists.linaro.org/pipermail/linaro-toolchain/2011-January/000722.html http://groups.google.com/group/beagleboard/browse_thread/thread/12c7bd415fb… http://www.spinics.net/lists/arm-kernel/msg106503.html http://dev.gentoo.org/~armin76/arm/memcpy-neon_result.txt https://wiki.linaro.org/WorkingGroups/ToolChain/Benchmarks/InitialMemcpy?hi… https://wiki.linaro.org/WorkingGroups/ToolChain/StringRoutines?highlight=%2… Incidentally, this ties into the question sent earlier this week which had to do with Nico's work item in: https://blueprints.launchpad.net/linux-linaro/+spec/other-kernel-thumb2 Which IIRC Nico says probably isn't worth it, right? -- Christian Robottom Reis | [+55] 16 9112 6430 | http://launchpad.net/~kiko Linaro Engineering VP | [ +1] 612 216 4935 | http://async.com.br/~kiko

11 years, 11 months

[RESEND PATCH 1/2] ARM: OMAP2+: nand: Make board_onenand_init() visible to board code

by Javier Martinez Canillas

board_onenand_init() and board_nand_init() initialization functions are used to initialize OneNAND and NAND memories respectively. But only board_nand_init() was visible to be used from board code. This patch makes possible to initialize a OneNAND flash memory within platform code. Signed-off-by: Javier Martinez Canillas <javier(a)dowhile0.org> --- arch/arm/mach-omap2/board-flash.c | 4 ++-- arch/arm/mach-omap2/board-flash.h | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c index 0349fd2..70a81f9 100644 --- a/arch/arm/mach-omap2/board-flash.c +++ b/arch/arm/mach-omap2/board-flash.c @@ -87,7 +87,7 @@ static struct omap_onenand_platform_data board_onenand_data = { .dma_channel = -1, /* disable DMA in OMAP OneNAND driver */ }; -static void +void __init board_onenand_init(struct mtd_partition *onenand_parts, u8 nr_parts, u8 cs) { @@ -98,7 +98,7 @@ __init board_onenand_init(struct mtd_partition *onenand_parts, gpmc_onenand_init(&board_onenand_data); } #else -static void +void __init board_onenand_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs) { } diff --git a/arch/arm/mach-omap2/board-flash.h b/arch/arm/mach-omap2/board-flash.h index d25503a..c44b70d 100644 --- a/arch/arm/mach-omap2/board-flash.h +++ b/arch/arm/mach-omap2/board-flash.h @@ -47,3 +47,14 @@ static inline void board_nand_init(struct mtd_partition *nand_parts, { } #endif + +#if defined(CONFIG_MTD_ONENAND_OMAP2) || \ + defined(CONFIG_MTD_ONENAND_OMAP2_MODULE) +extern void board_onenand_init(struct mtd_partition *nand_parts, + u8 nr_parts, u8 cs); +#else +static inline void board_onenand_init(struct mtd_partition *nand_parts, + u8 nr_parts, u8 cs) +{ +} +#endif -- 1.7.7.6

11 years, 11 months

[PATCH] ARM: exynos: Adapt to cpuidle core time keeping and irq enable

by Amit Daniel Kachhap

This patch enables core cpuidle timekeeping and irq enabling and remove those redundant parts from the exynos cpuidle drivers CC: Daniel Lezcano <daniel.lezcano(a)linaro.org> CC: Robert Lee <rob.lee(a)linaro.org> Signed-off-by: Amit Daniel <amit.kachhap(a)linaro.org> --- arch/arm/mach-exynos/cpuidle.c | 53 ++++----------------------------------- 1 files changed, 6 insertions(+), 47 deletions(-) diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index 33ab4e7..26dac28 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c @@ -20,6 +20,7 @@ #include <asm/smp_scu.h> #include <asm/suspend.h> #include <asm/unified.h> +#include <asm/cpuidle.h> #include <mach/regs-pmu.h> #include <mach/pmu.h> @@ -34,22 +35,12 @@ #define S5P_CHECK_AFTR 0xFCBA0D10 -static int exynos4_enter_idle(struct cpuidle_device *dev, - struct cpuidle_driver *drv, - int index); static int exynos4_enter_lowpower(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index); static struct cpuidle_state exynos4_cpuidle_set[] __initdata = { - [0] = { - .enter = exynos4_enter_idle, - .exit_latency = 1, - .target_residency = 100000, - .flags = CPUIDLE_FLAG_TIME_VALID, - .name = "C0", - .desc = "ARM clock gating(WFI)", - }, + [0] = ARM_CPUIDLE_WFI_STATE, [1] = { .enter = exynos4_enter_lowpower, .exit_latency = 300, @@ -63,8 +54,9 @@ static struct cpuidle_state exynos4_cpuidle_set[] __initdata = { static DEFINE_PER_CPU(struct cpuidle_device, exynos4_cpuidle_device); static struct cpuidle_driver exynos4_idle_driver = { - .name = "exynos4_idle", - .owner = THIS_MODULE, + .name = "exynos4_idle", + .owner = THIS_MODULE, + .en_core_tk_irqen = 1, }; /* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */ @@ -103,13 +95,8 @@ static int exynos4_enter_core0_aftr(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) { - struct timeval before, after; - int idle_time; unsigned long tmp; - local_irq_disable(); - do_gettimeofday(&before); - exynos4_set_wakeupmask(); /* Set value of power down register for aftr mode */ @@ -150,34 +137,6 @@ static int exynos4_enter_core0_aftr(struct cpuidle_device *dev, /* Clear wakeup state register */ __raw_writel(0x0, S5P_WAKEUP_STAT); - do_gettimeofday(&after); - - local_irq_enable(); - idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC + - (after.tv_usec - before.tv_usec); - - dev->last_residency = idle_time; - return index; -} - -static int exynos4_enter_idle(struct cpuidle_device *dev, - struct cpuidle_driver *drv, - int index) -{ - struct timeval before, after; - int idle_time; - - local_irq_disable(); - do_gettimeofday(&before); - - cpu_do_idle(); - - do_gettimeofday(&after); - local_irq_enable(); - idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC + - (after.tv_usec - before.tv_usec); - - dev->last_residency = idle_time; return index; } @@ -192,7 +151,7 @@ static int exynos4_enter_lowpower(struct cpuidle_device *dev, new_index = drv->safe_state_index; if (new_index == 0) - return exynos4_enter_idle(dev, drv, new_index); + return arm_cpuidle_simple_enter(dev, drv, new_index); else return exynos4_enter_core0_aftr(dev, drv, new_index); } -- 1.7.1

11 years, 11 months

linux-linaro-core-tracking tree created

by Andrey Konovalov

Greetings, I've just created linux-linaro-core-tracking branch in git://git.linaro.org/kernel/linux-linaro-tracking.git. It is based on mainline tip, and has all the Platform and Working Groups topics which would appear in the next linux-linaro kernel release. No topics from the Landing Teams there (this is what "core" implies). This tree will be the basis for the next (12.05) linux-linaro kernel release. So if you have a topic to be added to 12.05 you can ask me to add it (the sooner you ask, the better), and it will appear in linux-linaro-core-tracking first. The request to add a topic must include the git tree location for me to pull the topic from, and the base used by this topic (mainline, or another topic). If no base for the topic is specified, the mainline is assumed. If needed, this is ok to rebase the topic; this would be easier for me to handle than e.g. reconfiguring my scripts to use topic-3.4rc5 branch instead of topic-3.4rc4 branch used so far etc. Again, starting from now this tree is open for the next release (12.05) topics. The linux-linaro-core-tracking tree is first of all to identify the conflicts early, so it could fail to build sometimes, or the kernel built from it may not boot etc. The plan is to rebase this tree on the current mainline tip daily. The topics causing the conflicts would be excluded from the linux-linaro-core-tracking tree, and would be brought back into it after the conflicts are resolved by the topic owners. Thanks, Andrey

11 years, 11 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev April 2012