From 9ca8dbcc65cfc63d6f5ef3312a33184e1d726e00 Mon Sep 17 00:00:00 2001 From: Yunhong Jiang Date: Tue, 4 Aug 2015 12:17:53 -0700 Subject: Add the rt linux 4.1.3-rt3 as base Import the rt linux 4.1.3-rt3 as OPNFV kvm base. It's from git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git linux-4.1.y-rt and the base is: commit 0917f823c59692d751951bf5ea699a2d1e2f26a2 Author: Sebastian Andrzej Siewior Date: Sat Jul 25 12:13:34 2015 +0200 Prepare v4.1.3-rt3 Signed-off-by: Sebastian Andrzej Siewior We lose all the git history this way and it's not good. We should apply another opnfv project repo in future. Change-Id: I87543d81c9df70d99c5001fbdf646b202c19f423 Signed-off-by: Yunhong Jiang --- kernel/arch/sh/cchips/Kconfig | 45 +++++++++++++ kernel/arch/sh/cchips/hd6446x/Makefile | 3 + kernel/arch/sh/cchips/hd6446x/hd64461.c | 111 ++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+) create mode 100644 kernel/arch/sh/cchips/Kconfig create mode 100644 kernel/arch/sh/cchips/hd6446x/Makefile create mode 100644 kernel/arch/sh/cchips/hd6446x/hd64461.c (limited to 'kernel/arch/sh/cchips') diff --git a/kernel/arch/sh/cchips/Kconfig b/kernel/arch/sh/cchips/Kconfig new file mode 100644 index 000000000..a5ab2eccd --- /dev/null +++ b/kernel/arch/sh/cchips/Kconfig @@ -0,0 +1,45 @@ +menu "Companion Chips" + +config HD6446X_SERIES + bool + +choice + prompt "HD6446x options" + depends on HD6446X_SERIES + default HD64461 + +config HD64461 + bool "Hitachi HD64461 companion chip support" + ---help--- + The Hitachi HD64461 provides an interface for + the SH7709 CPU, supporting a LCD controller, + CRT color controller, IrDA up to 4 Mbps, and a + PCMCIA controller supporting 2 slots. + + More information is available at + . + + Say Y if you want support for the HD64461. + Otherwise, say N. + +endchoice + +# These will also be split into the Kconfig's below +config HD64461_IRQ + int "HD64461 IRQ" + depends on HD64461 + default "36" + help + The default setting of the HD64461 IRQ is 36. + + Do not change this unless you know what you are doing. + +config HD64461_ENABLER + bool "HD64461 PCMCIA enabler" + depends on HD64461 + help + Say Y here if you want to enable PCMCIA support + via the HD64461 companion chip. + Otherwise, say N. + +endmenu diff --git a/kernel/arch/sh/cchips/hd6446x/Makefile b/kernel/arch/sh/cchips/hd6446x/Makefile new file mode 100644 index 000000000..59c348337 --- /dev/null +++ b/kernel/arch/sh/cchips/hd6446x/Makefile @@ -0,0 +1,3 @@ +obj-$(CONFIG_HD64461) += hd64461.o + +ccflags-y := -Werror diff --git a/kernel/arch/sh/cchips/hd6446x/hd64461.c b/kernel/arch/sh/cchips/hd6446x/hd64461.c new file mode 100644 index 000000000..e9735616b --- /dev/null +++ b/kernel/arch/sh/cchips/hd6446x/hd64461.c @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2000 YAEGASHI Takeshi + * Hitachi HD64461 companion chip support + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* This belongs in cpu specific */ +#define INTC_ICR1 0xA4140010UL + +static void hd64461_mask_irq(struct irq_data *data) +{ + unsigned int irq = data->irq; + unsigned short nimr; + unsigned short mask = 1 << (irq - HD64461_IRQBASE); + + nimr = __raw_readw(HD64461_NIMR); + nimr |= mask; + __raw_writew(nimr, HD64461_NIMR); +} + +static void hd64461_unmask_irq(struct irq_data *data) +{ + unsigned int irq = data->irq; + unsigned short nimr; + unsigned short mask = 1 << (irq - HD64461_IRQBASE); + + nimr = __raw_readw(HD64461_NIMR); + nimr &= ~mask; + __raw_writew(nimr, HD64461_NIMR); +} + +static void hd64461_mask_and_ack_irq(struct irq_data *data) +{ + hd64461_mask_irq(data); + +#ifdef CONFIG_HD64461_ENABLER + if (data->irq == HD64461_IRQBASE + 13) + __raw_writeb(0x00, HD64461_PCC1CSCR); +#endif +} + +static struct irq_chip hd64461_irq_chip = { + .name = "HD64461-IRQ", + .irq_mask = hd64461_mask_irq, + .irq_mask_ack = hd64461_mask_and_ack_irq, + .irq_unmask = hd64461_unmask_irq, +}; + +static void hd64461_irq_demux(unsigned int irq, struct irq_desc *desc) +{ + unsigned short intv = __raw_readw(HD64461_NIRR); + unsigned int ext_irq = HD64461_IRQBASE; + + intv &= (1 << HD64461_IRQ_NUM) - 1; + + for (; intv; intv >>= 1, ext_irq++) { + if (!(intv & 1)) + continue; + + generic_handle_irq(ext_irq); + } +} + +int __init setup_hd64461(void) +{ + int irq_base, i; + + printk(KERN_INFO + "HD64461 configured at 0x%x on irq %d(mapped into %d to %d)\n", + HD64461_IOBASE, CONFIG_HD64461_IRQ, HD64461_IRQBASE, + HD64461_IRQBASE + 15); + +/* Should be at processor specific part.. */ +#if defined(CONFIG_CPU_SUBTYPE_SH7709) + __raw_writew(0x2240, INTC_ICR1); +#endif + __raw_writew(0xffff, HD64461_NIMR); + + irq_base = irq_alloc_descs(HD64461_IRQBASE, HD64461_IRQBASE, 16, -1); + if (IS_ERR_VALUE(irq_base)) { + pr_err("%s: failed hooking irqs for HD64461\n", __func__); + return irq_base; + } + + for (i = 0; i < 16; i++) + irq_set_chip_and_handler(irq_base + i, &hd64461_irq_chip, + handle_level_irq); + + irq_set_chained_handler(CONFIG_HD64461_IRQ, hd64461_irq_demux); + irq_set_irq_type(CONFIG_HD64461_IRQ, IRQ_TYPE_LEVEL_LOW); + +#ifdef CONFIG_HD64461_ENABLER + printk(KERN_INFO "HD64461: enabling PCMCIA devices\n"); + __raw_writeb(0x4c, HD64461_PCC1CSCIER); + __raw_writeb(0x00, HD64461_PCC1CSCR); +#endif + + return 0; +} + +module_init(setup_hd64461); -- cgit 1.2.3-korg