 a7726350e0
			
		
	
	
	a7726350e0
	
	
	
		
			
			Here is a collection of cleanup patches. Among the pieces that stand out are:
 
 - The deletion of h720x platforms
 - Split of at91 non-dt platforms to their own Kconfig file to keep them separate
 - General cleanups and refactoring of i.MX and MXS platforms
 - Some restructuring of clock tables for OMAP
 - Convertion of PMC driver for Tegra to dt-only
 - Some renames of sunxi -> sun4i (Allwinner A10)
 - ... plus a bunch of other stuff that I haven't mentioned
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJRggUqAAoJEIwa5zzehBx3HjEQAJwp7heRs/HwTDzmzcyHkRMV
 usbaa9dHBuAZ0DzsWjLK99xEn8VWD9TvbeP6hN5gNhxko06UVza3o8PI2iV1ztMB
 9K3u2+LS5on/5cOxnsU1va16h5hBZ0ZIgNx5NY+PZ5mBY6v1U3qTjljPP62iXp63
 w+sdXeZDe/c5JvuoDRbY0OBR++3Jp8cQg7KbU78jWz3r5D2rC1zwhkf2audcRY6b
 jIWTj9M8CHynh/D6OzKqDcOYorBHNSRj0YbiWS2nnMfm+0V8nya00EPRpCPRiBUb
 sobSy1CI9Qxiih3bOf6QCfzCRzJ5hbtE0zlI8g3bqtEZ1yOsE949HrKapWHJJdIU
 JNTXrxXORAnaRhbzvSPNpp/iJBSDQRsfEETgv5BuHg/4lzTQfzElySbcgb4EeoHr
 7Zt8ZR2/Du+u76qIPqs19ES3Wx+nOEOfSDAgZmlfPvlwmlGDYvqAXoeJ006VXnhG
 JacLuD/cFnJ1w00Bcl48ZXMIsVkoRqjvsCG5q688HGXMM1lU8DfgUpQY6OCWAbdu
 kFnBinJZk+HbE8FGS8O0BoQ+oiC0YIr2XhATL66PGHq7bLHb5ycwvZ7mrfC0AN9j
 M9hqTFednwfo9wF8vSj5nMsxXwP8/mky4ECGoFvLsMYDosunrNVnAHtTgDSE+ZgO
 6kQJ1P8jBBXn2LyjF88W
 =xCAx
 -----END PGP SIGNATURE-----
Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC cleanup from Olof Johansson:
 "Here is a collection of cleanup patches.  Among the pieces that stand
  out are:
   - The deletion of h720x platforms
   - Split of at91 non-dt platforms to their own Kconfig file to keep
     them separate
   - General cleanups and refactoring of i.MX and MXS platforms
   - Some restructuring of clock tables for OMAP
   - Convertion of PMC driver for Tegra to dt-only
   - Some renames of sunxi -> sun4i (Allwinner A10)
   - ... plus a bunch of other stuff that I haven't mentioned"
* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (119 commits)
  ARM: i.MX: remove unused ARCH_* configs
  ARM i.MX53: remove platform ahci support
  ARM: sunxi: Rework the restart code
  irqchip: sunxi: Rename sunxi to sun4i
  irqchip: sunxi: Make use of the IRQCHIP_DECLARE macro
  clocksource: sunxi: Rename sunxi to sun4i
  clocksource: sunxi: make use of CLKSRC_OF
  clocksource: sunxi: Cleanup the timer code
  ARM: at91: remove trailing semicolon from macros
  ARM: at91/setup: fix trivial typos
  ARM: EXYNOS: remove "config EXYNOS_DEV_DRM"
  ARM: EXYNOS: change the name of USB ohci header
  ARM: SAMSUNG: Remove unnecessary code for dma
  ARM: S3C24XX: Remove unused GPIO drive strength register definitions
  ARM: OMAP4+: PM: Restore CPU power state to ON with clockdomain force wakeup method
  ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412
  ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410
  ARM: S3C24XX: Removed unneeded dependency on ARCH_S3C24XX for boards
  ARM: SAMSUNG: Fix typo "CONFIG_SAMSUNG_DEV_RTC"
  ARM: S5P64X0: Fix typo "CONFIG_S5P64X0_SETUP_SDHCI"
  ...
		
	
			
		
			
				
	
	
		
			224 lines
		
	
	
	
		
			6.3 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			224 lines
		
	
	
	
		
			6.3 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
 | |
|  * Copyright 2008 Juergen Beisert, kernel@pengutronix.de
 | |
|  *
 | |
|  * 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/module.h>
 | |
| #include <linux/irq.h>
 | |
| #include <linux/irqdomain.h>
 | |
| #include <linux/io.h>
 | |
| #include <linux/of.h>
 | |
| #include <asm/mach/irq.h>
 | |
| #include <asm/exception.h>
 | |
| 
 | |
| #include "common.h"
 | |
| #include "hardware.h"
 | |
| #include "irq-common.h"
 | |
| 
 | |
| #define AVIC_INTCNTL		0x00	/* int control reg */
 | |
| #define AVIC_NIMASK		0x04	/* int mask reg */
 | |
| #define AVIC_INTENNUM		0x08	/* int enable number reg */
 | |
| #define AVIC_INTDISNUM		0x0C	/* int disable number reg */
 | |
| #define AVIC_INTENABLEH		0x10	/* int enable reg high */
 | |
| #define AVIC_INTENABLEL		0x14	/* int enable reg low */
 | |
| #define AVIC_INTTYPEH		0x18	/* int type reg high */
 | |
| #define AVIC_INTTYPEL		0x1C	/* int type reg low */
 | |
| #define AVIC_NIPRIORITY(x)	(0x20 + 4 * (7 - (x))) /* int priority */
 | |
| #define AVIC_NIVECSR		0x40	/* norm int vector/status */
 | |
| #define AVIC_FIVECSR		0x44	/* fast int vector/status */
 | |
| #define AVIC_INTSRCH		0x48	/* int source reg high */
 | |
| #define AVIC_INTSRCL		0x4C	/* int source reg low */
 | |
| #define AVIC_INTFRCH		0x50	/* int force reg high */
 | |
| #define AVIC_INTFRCL		0x54	/* int force reg low */
 | |
| #define AVIC_NIPNDH		0x58	/* norm int pending high */
 | |
| #define AVIC_NIPNDL		0x5C	/* norm int pending low */
 | |
| #define AVIC_FIPNDH		0x60	/* fast int pending high */
 | |
| #define AVIC_FIPNDL		0x64	/* fast int pending low */
 | |
| 
 | |
| #define AVIC_NUM_IRQS 64
 | |
| 
 | |
| static void __iomem *avic_base;
 | |
| static struct irq_domain *domain;
 | |
| 
 | |
| #ifdef CONFIG_MXC_IRQ_PRIOR
 | |
| static int avic_irq_set_priority(unsigned char irq, unsigned char prio)
 | |
| {
 | |
| 	struct irq_data *d = irq_get_irq_data(irq);
 | |
| 	unsigned int temp;
 | |
| 	unsigned int mask = 0x0F << irq % 8 * 4;
 | |
| 
 | |
| 	irq = d->hwirq;
 | |
| 
 | |
| 	if (irq >= AVIC_NUM_IRQS)
 | |
| 		return -EINVAL;
 | |
| 
 | |
| 	temp = __raw_readl(avic_base + AVIC_NIPRIORITY(irq / 8));
 | |
| 	temp &= ~mask;
 | |
| 	temp |= prio & mask;
 | |
| 
 | |
| 	__raw_writel(temp, avic_base + AVIC_NIPRIORITY(irq / 8));
 | |
| 
 | |
| 	return 0;
 | |
| }
 | |
| #endif
 | |
| 
 | |
| #ifdef CONFIG_FIQ
 | |
| static int avic_set_irq_fiq(unsigned int irq, unsigned int type)
 | |
| {
 | |
| 	struct irq_data *d = irq_get_irq_data(irq);
 | |
| 	unsigned int irqt;
 | |
| 
 | |
| 	irq = d->hwirq;
 | |
| 
 | |
| 	if (irq >= AVIC_NUM_IRQS)
 | |
| 		return -EINVAL;
 | |
| 
 | |
| 	if (irq < AVIC_NUM_IRQS / 2) {
 | |
| 		irqt = __raw_readl(avic_base + AVIC_INTTYPEL) & ~(1 << irq);
 | |
| 		__raw_writel(irqt | (!!type << irq), avic_base + AVIC_INTTYPEL);
 | |
| 	} else {
 | |
| 		irq -= AVIC_NUM_IRQS / 2;
 | |
| 		irqt = __raw_readl(avic_base + AVIC_INTTYPEH) & ~(1 << irq);
 | |
| 		__raw_writel(irqt | (!!type << irq), avic_base + AVIC_INTTYPEH);
 | |
| 	}
 | |
| 
 | |
| 	return 0;
 | |
| }
 | |
| #endif /* CONFIG_FIQ */
 | |
| 
 | |
| 
 | |
| static struct mxc_extra_irq avic_extra_irq = {
 | |
| #ifdef CONFIG_MXC_IRQ_PRIOR
 | |
| 	.set_priority = avic_irq_set_priority,
 | |
| #endif
 | |
| #ifdef CONFIG_FIQ
 | |
| 	.set_irq_fiq = avic_set_irq_fiq,
 | |
| #endif
 | |
| };
 | |
| 
 | |
| #ifdef CONFIG_PM
 | |
| static u32 avic_saved_mask_reg[2];
 | |
| 
 | |
| static void avic_irq_suspend(struct irq_data *d)
 | |
| {
 | |
| 	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
 | |
| 	struct irq_chip_type *ct = gc->chip_types;
 | |
| 	int idx = d->hwirq >> 5;
 | |
| 
 | |
| 	avic_saved_mask_reg[idx] = __raw_readl(avic_base + ct->regs.mask);
 | |
| 	__raw_writel(gc->wake_active, avic_base + ct->regs.mask);
 | |
| }
 | |
| 
 | |
| static void avic_irq_resume(struct irq_data *d)
 | |
| {
 | |
| 	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
 | |
| 	struct irq_chip_type *ct = gc->chip_types;
 | |
| 	int idx = d->hwirq >> 5;
 | |
| 
 | |
| 	__raw_writel(avic_saved_mask_reg[idx], avic_base + ct->regs.mask);
 | |
| }
 | |
| 
 | |
| #else
 | |
| #define avic_irq_suspend NULL
 | |
| #define avic_irq_resume NULL
 | |
| #endif
 | |
| 
 | |
| static __init void avic_init_gc(int idx, unsigned int irq_start)
 | |
| {
 | |
| 	struct irq_chip_generic *gc;
 | |
| 	struct irq_chip_type *ct;
 | |
| 
 | |
| 	gc = irq_alloc_generic_chip("mxc-avic", 1, irq_start, avic_base,
 | |
| 				    handle_level_irq);
 | |
| 	gc->private = &avic_extra_irq;
 | |
| 	gc->wake_enabled = IRQ_MSK(32);
 | |
| 
 | |
| 	ct = gc->chip_types;
 | |
| 	ct->chip.irq_mask = irq_gc_mask_clr_bit;
 | |
| 	ct->chip.irq_unmask = irq_gc_mask_set_bit;
 | |
| 	ct->chip.irq_ack = irq_gc_mask_clr_bit;
 | |
| 	ct->chip.irq_set_wake = irq_gc_set_wake;
 | |
| 	ct->chip.irq_suspend = avic_irq_suspend;
 | |
| 	ct->chip.irq_resume = avic_irq_resume;
 | |
| 	ct->regs.mask = !idx ? AVIC_INTENABLEL : AVIC_INTENABLEH;
 | |
| 	ct->regs.ack = ct->regs.mask;
 | |
| 
 | |
| 	irq_setup_generic_chip(gc, IRQ_MSK(32), 0, IRQ_NOREQUEST, 0);
 | |
| }
 | |
| 
 | |
| asmlinkage void __exception_irq_entry avic_handle_irq(struct pt_regs *regs)
 | |
| {
 | |
| 	u32 nivector;
 | |
| 
 | |
| 	do {
 | |
| 		nivector = __raw_readl(avic_base + AVIC_NIVECSR) >> 16;
 | |
| 		if (nivector == 0xffff)
 | |
| 			break;
 | |
| 
 | |
| 		handle_IRQ(irq_find_mapping(domain, nivector), regs);
 | |
| 	} while (1);
 | |
| }
 | |
| 
 | |
| /*
 | |
|  * This function initializes the AVIC hardware and disables all the
 | |
|  * interrupts. It registers the interrupt enable and disable functions
 | |
|  * to the kernel for each interrupt source.
 | |
|  */
 | |
| void __init mxc_init_irq(void __iomem *irqbase)
 | |
| {
 | |
| 	struct device_node *np;
 | |
| 	int irq_base;
 | |
| 	int i;
 | |
| 
 | |
| 	avic_base = irqbase;
 | |
| 
 | |
| 	/* put the AVIC into the reset value with
 | |
| 	 * all interrupts disabled
 | |
| 	 */
 | |
| 	__raw_writel(0, avic_base + AVIC_INTCNTL);
 | |
| 	__raw_writel(0x1f, avic_base + AVIC_NIMASK);
 | |
| 
 | |
| 	/* disable all interrupts */
 | |
| 	__raw_writel(0, avic_base + AVIC_INTENABLEH);
 | |
| 	__raw_writel(0, avic_base + AVIC_INTENABLEL);
 | |
| 
 | |
| 	/* all IRQ no FIQ */
 | |
| 	__raw_writel(0, avic_base + AVIC_INTTYPEH);
 | |
| 	__raw_writel(0, avic_base + AVIC_INTTYPEL);
 | |
| 
 | |
| 	irq_base = irq_alloc_descs(-1, 0, AVIC_NUM_IRQS, numa_node_id());
 | |
| 	WARN_ON(irq_base < 0);
 | |
| 
 | |
| 	np = of_find_compatible_node(NULL, NULL, "fsl,avic");
 | |
| 	domain = irq_domain_add_legacy(np, AVIC_NUM_IRQS, irq_base, 0,
 | |
| 				       &irq_domain_simple_ops, NULL);
 | |
| 	WARN_ON(!domain);
 | |
| 
 | |
| 	for (i = 0; i < AVIC_NUM_IRQS / 32; i++, irq_base += 32)
 | |
| 		avic_init_gc(i, irq_base);
 | |
| 
 | |
| 	/* Set default priority value (0) for all IRQ's */
 | |
| 	for (i = 0; i < 8; i++)
 | |
| 		__raw_writel(0, avic_base + AVIC_NIPRIORITY(i));
 | |
| 
 | |
| #ifdef CONFIG_FIQ
 | |
| 	/* Initialize FIQ */
 | |
| 	init_FIQ(FIQ_START);
 | |
| #endif
 | |
| 
 | |
| 	printk(KERN_INFO "MXC IRQ initialized\n");
 | |
| }
 |