Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b52a2c47 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'davinci-v3.6-soc' of git://gitorious.org/linux-davinci/linux-davinci into next/soc 

From Sekhar Nori <nsekhar@ti.com>:

DaVinci SoC updates for v3.6

Add IRQ domain support for cp_intc and
runtime PM core support for DaVinci devices.

* tag 'davinci-v3.6-soc' of git://gitorious.org/linux-davinci/linux-davinci

:
  ARM: davinci: add runtime PM support for clock management
  ARM: davinci: cp_intc: Add irq domain support

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ddb30594 ce9dcb87

arch/arm/mach-davinci/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config AINTC 
	bool



config CP_INTC

	select IRQ_DOMAIN

	bool



config ARCH_DAVINCI_DMx

arch/arm/mach-davinci/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -39,3 +39,4 @@ obj-$(CONFIG_MACH_OMAPL138_HAWKBOARD) += board-omapl138-hawk.o 
obj-$(CONFIG_CPU_FREQ)			+= cpufreq.o

obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o

obj-$(CONFIG_SUSPEND)			+= pm.o sleep.o

obj-$(CONFIG_HAVE_CLK)			+= pm_domain.o

arch/arm/mach-davinci/cp_intc.c

+49 −14
Original line number Diff line number Diff line
@@ -9,8 +9,10 @@ 
 * kind, whether express or implied.

 */



#include <linux/export.h>

#include <linux/init.h>

#include <linux/irq.h>

#include <linux/irqdomain.h>

#include <linux/io.h>



#include <mach/common.h>
@@ -28,7 +30,7 @@ static inline void cp_intc_write(unsigned long value, unsigned offset) 


static void cp_intc_ack_irq(struct irq_data *d)

{

	cp_intc_write(d->irq, CP_INTC_SYS_STAT_IDX_CLR);

	cp_intc_write(d->hwirq, CP_INTC_SYS_STAT_IDX_CLR);

}



/* Disable interrupt */
@@ -36,20 +38,20 @@ static void cp_intc_mask_irq(struct irq_data *d) 
{

	/* XXX don't know why we need to disable nIRQ here... */

	cp_intc_write(1, CP_INTC_HOST_ENABLE_IDX_CLR);

	cp_intc_write(d->irq, CP_INTC_SYS_ENABLE_IDX_CLR);

	cp_intc_write(d->hwirq, CP_INTC_SYS_ENABLE_IDX_CLR);

	cp_intc_write(1, CP_INTC_HOST_ENABLE_IDX_SET);

}



/* Enable interrupt */

static void cp_intc_unmask_irq(struct irq_data *d)

{

	cp_intc_write(d->irq, CP_INTC_SYS_ENABLE_IDX_SET);

	cp_intc_write(d->hwirq, CP_INTC_SYS_ENABLE_IDX_SET);

}



static int cp_intc_set_irq_type(struct irq_data *d, unsigned int flow_type)

{

	unsigned reg		= BIT_WORD(d->irq);

	unsigned mask		= BIT_MASK(d->irq);

	unsigned reg		= BIT_WORD(d->hwirq);

	unsigned mask		= BIT_MASK(d->hwirq);

	unsigned polarity	= cp_intc_read(CP_INTC_SYS_POLARITY(reg));

	unsigned type		= cp_intc_read(CP_INTC_SYS_TYPE(reg));
@@ -99,18 +101,36 @@ static struct irq_chip cp_intc_irq_chip = { 
	.irq_set_wake	= cp_intc_set_wake,

};



void __init cp_intc_init(void)

static struct irq_domain *cp_intc_domain;



static int cp_intc_host_map(struct irq_domain *h, unsigned int virq,

			  irq_hw_number_t hw)

{

	pr_debug("cp_intc_host_map(%d, 0x%lx)\n", virq, hw);



	irq_set_chip(virq, &cp_intc_irq_chip);

	set_irq_flags(virq, IRQF_VALID | IRQF_PROBE);

	irq_set_handler(virq, handle_edge_irq);

	return 0;

}



static const struct irq_domain_ops cp_intc_host_ops = {

	.map = cp_intc_host_map,

	.xlate = irq_domain_xlate_onetwocell,

};



int __init __cp_intc_init(struct device_node *node)

{

	unsigned long num_irq	= davinci_soc_info.intc_irq_num;

	u32 num_irq		= davinci_soc_info.intc_irq_num;

	u8 *irq_prio		= davinci_soc_info.intc_irq_prios;

	u32 *host_map		= davinci_soc_info.intc_host_map;

	unsigned num_reg	= BITS_TO_LONGS(num_irq);

	int i;

	int i, irq_base;



	davinci_intc_type = DAVINCI_INTC_TYPE_CP_INTC;

	davinci_intc_base = ioremap(davinci_soc_info.intc_base, SZ_8K);

	if (WARN_ON(!davinci_intc_base))

		return;

		return -EINVAL;



	cp_intc_write(0, CP_INTC_GLOBAL_ENABLE);
@@ -165,13 +185,28 @@ void __init cp_intc_init(void) 
		for (i = 0; host_map[i] != -1; i++)

			cp_intc_write(host_map[i], CP_INTC_HOST_MAP(i));



	/* Set up genirq dispatching for cp_intc */

	for (i = 0; i < num_irq; i++) {

		irq_set_chip(i, &cp_intc_irq_chip);

		set_irq_flags(i, IRQF_VALID | IRQF_PROBE);

		irq_set_handler(i, handle_edge_irq);

	irq_base = irq_alloc_descs(-1, 0, num_irq, 0);

	if (irq_base < 0) {

		pr_warn("Couldn't allocate IRQ numbers\n");

		irq_base = 0;

	}



	/* create a legacy host */

	cp_intc_domain = irq_domain_add_legacy(node, num_irq,

					irq_base, 0, &cp_intc_host_ops, NULL);



	if (!cp_intc_domain) {

		pr_err("cp_intc: failed to allocate irq host!\n");

		return -EINVAL;

	}



	/* Enable global interrupt */

	cp_intc_write(1, CP_INTC_GLOBAL_ENABLE);



	return 0;

}



void __init cp_intc_init(void)

{

	__cp_intc_init(NULL);

}

arch/arm/mach-davinci/pm_domain.c

0 → 100644
+64 −0
Original line number Diff line number Diff line 
/*

 * Runtime PM support code for DaVinci

 *

 * Author: Kevin Hilman

 *

 * Copyright (C) 2012 Texas Instruments, Inc.

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2. This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */

#include <linux/init.h>

#include <linux/pm_runtime.h>

#include <linux/pm_clock.h>

#include <linux/platform_device.h>



#ifdef CONFIG_PM_RUNTIME

static int davinci_pm_runtime_suspend(struct device *dev)

{

	int ret;



	dev_dbg(dev, "%s\n", __func__);



	ret = pm_generic_runtime_suspend(dev);

	if (ret)

		return ret;



	ret = pm_clk_suspend(dev);

	if (ret) {

		pm_generic_runtime_resume(dev);

		return ret;

	}



	return 0;

}



static int davinci_pm_runtime_resume(struct device *dev)

{

	dev_dbg(dev, "%s\n", __func__);



	pm_clk_resume(dev);

	return pm_generic_runtime_resume(dev);

}

#endif



static struct dev_pm_domain davinci_pm_domain = {

	.ops = {

		SET_RUNTIME_PM_OPS(davinci_pm_runtime_suspend,

				   davinci_pm_runtime_resume, NULL)

		USE_PLATFORM_PM_SLEEP_OPS

	},

};



static struct pm_clk_notifier_block platform_bus_notifier = {

	.pm_domain = &davinci_pm_domain,

};



static int __init davinci_pm_runtime_init(void)

{

	pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier);



	return 0;

}

core_initcall(davinci_pm_runtime_init);