mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
h8300 pull request for 4.2
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCAAGBQJVi5eKAAoJEEdC8EELKDmcZWoQANh4UC+JGcP3XJ+AWyJpX1Rg VQMmSAiF/QZr3ty9sbU/6v3pNK5B1s2etY7lWzzCsp7GMhYln83OjwJn8pkcAvRk 4GoEio4Yp0RMTOYk1nvKEhUGnxLwpma+xX5ulZkSTaYhZl++eX8HUGmfHhpxMcK9 Unz1Y7vRIRaNUIawZECijxVj9yvteczwdwjWBp7AH2HChZ3LWJGo2xikd1Jwizx8 zPv+mdaHkV9gbORS53hvqVaXXjiZVmLKQEz6LlWHubuWysf98YcBzNAhSKpjQzqW cwjXyw3MNc5fPjliwUstN/9ImWFdRJgwmdQ0DJ1v6kWPbHMQ4lCxeasy02YJ7l0R TWUOTyTSGT7Hd8CRrryo7akQ3nt8g7fZAR6nVujexbjkSt9ZbBSplAikiSKRbjU2 7jkolYSM1ADqEeBBwcDnG2O45Pv8PxKGa4/8MV2hkcvrkkJp2lW+KybY0qp19MWb Dw09QYzFb5u6sKqD6AsjJQ6GKxLxNn3yBKk16V1yF0kAvQRdIj0XPgtMnGUgdkAw QA1nRQM25CLyOtH9SVWogRLof8UTZUlPtUCxKRww2//pAVkKGHg/afnnkqN933Yc Kv7/Mz2es6Km+D4qkQetnXF/IOxWfVUvnQa23Oe7gmkg4KNNrGO6bo7iQXDjDrHa LuNfJZRG5DzDjbdcp2t3 =fE8E -----END PGP SIGNATURE----- Merge tag 'for-4.2' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux Pull Renesas H8/300 architecture re-introduction from Yoshinori Sato. We dropped arch/h8300 two years ago as stale and old, this is a new and more modern rewritten arch support for the same architecture. * tag 'for-4.2' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux: (27 commits) h8300: fix typo. h8300: Always build dtb h8300: Remove ARCH_WANT_IPC_PARSE_VERSION sh-sci: Get register size from platform device clk: h8300: fix error handling in h8s2678_pll_clk_setup() h8300: Symbol name fix h8300: devicetree source h8300: configs h8300: IRQ chip driver h8300: clocksource h8300: clock driver h8300: Build scripts h8300: library functions h8300: Memory management h8300: miscellaneous functions h8300: process helpers h8300: compressed image support h8300: Low level entry h8300: kernel startup h8300: Interrupt and exceptions ...
This commit is contained in:
Linus Torvalds
commit
55a7d4b85c
123 changed files with 7597 additions and 28 deletions
|
|
@ -159,3 +159,11 @@ config KEYSTONE_IRQ
|
|||
config MIPS_GIC
|
||||
bool
|
||||
select MIPS_CM
|
||||
|
||||
config RENESAS_H8300H_INTC
|
||||
bool
|
||||
select IRQ_DOMAIN
|
||||
|
||||
config RENESAS_H8S_INTC
|
||||
bool
|
||||
select IRQ_DOMAIN
|
||||
|
|
@ -47,3 +47,5 @@ obj-$(CONFIG_KEYSTONE_IRQ) += irq-keystone.o
|
|||
obj-$(CONFIG_MIPS_GIC) += irq-mips-gic.o
|
||||
obj-$(CONFIG_ARCH_MEDIATEK) += irq-mtk-sysirq.o
|
||||
obj-$(CONFIG_ARCH_DIGICOLOR) += irq-digicolor.o
|
||||
obj-$(CONFIG_RENESAS_H8300H_INTC) += irq-renesas-h8300h.o
|
||||
obj-$(CONFIG_RENESAS_H8S_INTC) += irq-renesas-h8s.o
|
||||
|
|
|
|||
95
drivers/irqchip/irq-renesas-h8300h.c
Normal file
95
drivers/irqchip/irq-renesas-h8300h.c
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
/*
|
||||
* H8/300H interrupt controller driver
|
||||
*
|
||||
* Copyright 2015 Yoshinori Sato <ysato@users.sourceforge.jp>
|
||||
*/
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/irq.h>
|
||||
#include <linux/irqchip.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/of_irq.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
#include "irqchip.h"
|
||||
|
||||
static const char ipr_bit[] = {
|
||||
7, 6, 5, 5,
|
||||
4, 4, 4, 4, 3, 3, 3, 3,
|
||||
2, 2, 2, 2, 1, 1, 1, 1,
|
||||
0, 0, 0, 0, 15, 15, 15, 15,
|
||||
14, 14, 14, 14, 13, 13, 13, 13,
|
||||
-1, -1, -1, -1, 11, 11, 11, 11,
|
||||
10, 10, 10, 10, 9, 9, 9, 9,
|
||||
};
|
||||
|
||||
static void *intc_baseaddr;
|
||||
|
||||
#define IPR ((unsigned long)intc_baseaddr + 6)
|
||||
|
||||
static void h8300h_disable_irq(struct irq_data *data)
|
||||
{
|
||||
int bit;
|
||||
int irq = data->irq - 12;
|
||||
|
||||
bit = ipr_bit[irq];
|
||||
if (bit >= 0) {
|
||||
if (bit < 8)
|
||||
ctrl_bclr(bit & 7, IPR);
|
||||
else
|
||||
ctrl_bclr(bit & 7, (IPR+1));
|
||||
}
|
||||
}
|
||||
|
||||
static void h8300h_enable_irq(struct irq_data *data)
|
||||
{
|
||||
int bit;
|
||||
int irq = data->irq - 12;
|
||||
|
||||
bit = ipr_bit[irq];
|
||||
if (bit >= 0) {
|
||||
if (bit < 8)
|
||||
ctrl_bset(bit & 7, IPR);
|
||||
else
|
||||
ctrl_bset(bit & 7, (IPR+1));
|
||||
}
|
||||
}
|
||||
|
||||
struct irq_chip h8300h_irq_chip = {
|
||||
.name = "H8/300H-INTC",
|
||||
.irq_enable = h8300h_enable_irq,
|
||||
.irq_disable = h8300h_disable_irq,
|
||||
};
|
||||
|
||||
static int irq_map(struct irq_domain *h, unsigned int virq,
|
||||
irq_hw_number_t hw_irq_num)
|
||||
{
|
||||
irq_set_chip_and_handler(virq, &h8300h_irq_chip, handle_simple_irq);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct irq_domain_ops irq_ops = {
|
||||
.map = irq_map,
|
||||
.xlate = irq_domain_xlate_onecell,
|
||||
};
|
||||
|
||||
static int __init h8300h_intc_of_init(struct device_node *intc,
|
||||
struct device_node *parent)
|
||||
{
|
||||
struct irq_domain *domain;
|
||||
|
||||
intc_baseaddr = of_iomap(intc, 0);
|
||||
BUG_ON(!intc_baseaddr);
|
||||
|
||||
/* All interrupt priority low */
|
||||
ctrl_outb(0x00, IPR + 0);
|
||||
ctrl_outb(0x00, IPR + 1);
|
||||
|
||||
domain = irq_domain_add_linear(intc, NR_IRQS, &irq_ops, NULL);
|
||||
BUG_ON(!domain);
|
||||
irq_set_default_host(domain);
|
||||
return 0;
|
||||
}
|
||||
|
||||
IRQCHIP_DECLARE(h8300h_intc, "renesas,h8300h-intc", h8300h_intc_of_init);
|
||||
101
drivers/irqchip/irq-renesas-h8s.c
Normal file
101
drivers/irqchip/irq-renesas-h8s.c
Normal file
|
|
@ -0,0 +1,101 @@
|
|||
/*
|
||||
* H8S interrupt contoller driver
|
||||
*
|
||||
* Copyright 2015 Yoshinori Sato <ysato@users.sourceforge.jp>
|
||||
*/
|
||||
|
||||
#include <linux/irq.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/of_irq.h>
|
||||
#include <asm/io.h>
|
||||
#include "irqchip.h"
|
||||
|
||||
static void *intc_baseaddr;
|
||||
#define IPRA ((unsigned long)intc_baseaddr)
|
||||
|
||||
static const unsigned char ipr_table[] = {
|
||||
0x03, 0x02, 0x01, 0x00, 0x13, 0x12, 0x11, 0x10, /* 16 - 23 */
|
||||
0x23, 0x22, 0x21, 0x20, 0x33, 0x32, 0x31, 0x30, /* 24 - 31 */
|
||||
0x43, 0x42, 0x41, 0x40, 0x53, 0x53, 0x52, 0x52, /* 32 - 39 */
|
||||
0x51, 0x51, 0x51, 0x51, 0x51, 0x51, 0x51, 0x51, /* 40 - 47 */
|
||||
0x50, 0x50, 0x50, 0x50, 0x63, 0x63, 0x63, 0x63, /* 48 - 55 */
|
||||
0x62, 0x62, 0x62, 0x62, 0x62, 0x62, 0x62, 0x62, /* 56 - 63 */
|
||||
0x61, 0x61, 0x61, 0x61, 0x60, 0x60, 0x60, 0x60, /* 64 - 71 */
|
||||
0x73, 0x73, 0x73, 0x73, 0x72, 0x72, 0x72, 0x72, /* 72 - 79 */
|
||||
0x71, 0x71, 0x71, 0x71, 0x70, 0x83, 0x82, 0x81, /* 80 - 87 */
|
||||
0x80, 0x80, 0x80, 0x80, 0x93, 0x93, 0x93, 0x93, /* 88 - 95 */
|
||||
0x92, 0x92, 0x92, 0x92, 0x91, 0x91, 0x91, 0x91, /* 96 - 103 */
|
||||
0x90, 0x90, 0x90, 0x90, 0xa3, 0xa3, 0xa3, 0xa3, /* 104 - 111 */
|
||||
0xa2, 0xa2, 0xa2, 0xa2, 0xa1, 0xa1, 0xa1, 0xa1, /* 112 - 119 */
|
||||
0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, /* 120 - 127 */
|
||||
};
|
||||
|
||||
static void h8s_disable_irq(struct irq_data *data)
|
||||
{
|
||||
int pos;
|
||||
unsigned int addr;
|
||||
unsigned short pri;
|
||||
int irq = data->irq;
|
||||
|
||||
addr = IPRA + ((ipr_table[irq - 16] & 0xf0) >> 3);
|
||||
pos = (ipr_table[irq - 16] & 0x0f) * 4;
|
||||
pri = ~(0x000f << pos);
|
||||
pri &= ctrl_inw(addr);
|
||||
ctrl_outw(pri, addr);
|
||||
}
|
||||
|
||||
static void h8s_enable_irq(struct irq_data *data)
|
||||
{
|
||||
int pos;
|
||||
unsigned int addr;
|
||||
unsigned short pri;
|
||||
int irq = data->irq;
|
||||
|
||||
addr = IPRA + ((ipr_table[irq - 16] & 0xf0) >> 3);
|
||||
pos = (ipr_table[irq - 16] & 0x0f) * 4;
|
||||
pri = ~(0x000f << pos);
|
||||
pri &= ctrl_inw(addr);
|
||||
pri |= 1 << pos;
|
||||
ctrl_outw(pri, addr);
|
||||
}
|
||||
|
||||
struct irq_chip h8s_irq_chip = {
|
||||
.name = "H8S-INTC",
|
||||
.irq_enable = h8s_enable_irq,
|
||||
.irq_disable = h8s_disable_irq,
|
||||
};
|
||||
|
||||
static __init int irq_map(struct irq_domain *h, unsigned int virq,
|
||||
irq_hw_number_t hw_irq_num)
|
||||
{
|
||||
irq_set_chip_and_handler(virq, &h8s_irq_chip, handle_simple_irq);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct irq_domain_ops irq_ops = {
|
||||
.map = irq_map,
|
||||
.xlate = irq_domain_xlate_onecell,
|
||||
};
|
||||
|
||||
static int __init h8s_intc_of_init(struct device_node *intc,
|
||||
struct device_node *parent)
|
||||
{
|
||||
struct irq_domain *domain;
|
||||
int n;
|
||||
|
||||
intc_baseaddr = of_iomap(intc, 0);
|
||||
BUG_ON(!intc_baseaddr);
|
||||
|
||||
/* All interrupt priority is 0 (disable) */
|
||||
/* IPRA to IPRK */
|
||||
for (n = 0; n <= 'k' - 'a'; n++)
|
||||
ctrl_outw(0x0000, IPRA + (n * 2));
|
||||
|
||||
domain = irq_domain_add_linear(intc, NR_IRQS, &irq_ops, NULL);
|
||||
BUG_ON(!domain);
|
||||
irq_set_default_host(domain);
|
||||
return 0;
|
||||
}
|
||||
|
||||
IRQCHIP_DECLARE(h8s_intc, "renesas,h8s-intc", h8s_intc_of_init);
|
||||
Loading…
Reference in a new issue