Merge pull request #17 from OpenDingux/pull_request1

HDMI driver cleanup and move irqchip driver to drivers/irqchip
MIPS · Feb 2, 2015 · 162075d · 162075d
2 parents 26899e6 + 90d600f
commit 162075d
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 19 deletions.
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
@@ -246,7 +246,7 @@ config MACH_JZ4740
 	select ARCH_REQUIRE_GPIOLIB
 	select SYS_HAS_EARLY_PRINTK
 	select COMMON_CLK
-	select GENERIC_IRQ_CHIP
+	select JZ4740_IRQC
 	select BUILTIN_DTB
 	select USE_OF
 	select LIBFDT
@@ -265,7 +265,7 @@ config MACH_JZ4780
 	select PINCTRL
 	select PINCTRL_JZ4780
 	select SYS_SUPPORTS_HIGHMEM
-	select GENERIC_IRQ_CHIP
+	select JZ4740_IRQC
 	select BUILTIN_DTB
 	select USE_OF
 	select LIBFDT

diff --git a/arch/mips/jz4740/Makefile b/arch/mips/jz4740/Makefile
@@ -4,7 +4,7 @@
 
 # Object file lists.
 
-obj-y += prom.o irq.o time.o reset.o setup.o \
+obj-y += prom.o time.o reset.o setup.o \
 	platform.o timer.o serial.o
 
 obj-$(CONFIG_MACH_JZ4740) += gpio.o

diff --git a/drivers/gpu/drm/jz4780/dwc_hdmi.c b/drivers/gpu/drm/jz4780/dwc_hdmi.c
@@ -1579,6 +1579,7 @@ void dwc_hdmi_register(struct dwc_hdmi *hdmi, struct drm_device *dev)
 {
 	struct drm_encoder *encoder = &hdmi->encoder;
 	struct drm_connector *connector = &hdmi->connector;
+	int ret;
 
 	connector->funcs = &dwc_hdmi_connector_funcs;
 	encoder->funcs = &dwc_hdmi_encoder_funcs;
@@ -1603,13 +1604,12 @@ void dwc_hdmi_register(struct dwc_hdmi *hdmi, struct drm_device *dev)
 
 	connector->encoder = encoder;
 
-	int ret = drm_connector_register(connector);
-                 if (ret) {
-                         dev_err(dev,
-                                 "[CONNECTOR:%d:%s] drm_connector_register failed: %d\n",
-                                 connector->base.id,
-                                 connector->name, ret);
-                 }
+	ret = drm_connector_register(connector);
+	if (ret) {
+		dev_err(dev->dev,
+			"[CONNECTOR:%d:%s] drm_connector_register failed: %d\n",
+			connector->base.id, connector->name, ret);
+	}
 
 	drm_mode_connector_attach_encoder(connector, encoder);
 

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
@@ -63,6 +63,10 @@ config IMGPDC_IRQ
 	select GENERIC_IRQ_CHIP
 	select IRQ_DOMAIN
 
+config JZ4740_IRQC
+	bool
+	select GENERIC_IRQ_CHIP
+
 config CLPS711X_IRQCHIP
 	bool
 	depends on ARCH_CLPS711X

diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
@@ -38,3 +38,4 @@ obj-$(CONFIG_IRQ_CROSSBAR)		+= irq-crossbar.o
 obj-$(CONFIG_BRCMSTB_L2_IRQ)		+= irq-brcmstb-l2.o \
 					   irq-bcm7120-l2.o
 obj-$(CONFIG_KEYSTONE_IRQ)		+= irq-keystone.o
+obj-$(CONFIG_JZ4740_IRQC)		+= irq-jz4740.o
diff --git a/arch/mips/jz4740/irq.c → drivers/irqchip/irq-jz4740.c b/arch/mips/jz4740/irq.c → drivers/irqchip/irq-jz4740.c
@@ -18,6 +18,7 @@
 #include <linux/types.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
+#include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/timex.h>
 #include <linux/slab.h>
@@ -28,9 +29,7 @@
 
 #include <asm/io.h>
 
-#include <asm/mach-jz4740/base.h>
-
-#include "../../drivers/irqchip/irqchip.h"
+#include "irqchip.h"
 
 static void __iomem *jz_intc_base;
 static unsigned jz_num_chips;
@@ -41,6 +40,7 @@ static unsigned jz_num_chips;
 #define JZ_REG_INTC_CLEAR_MASK	0x0c
 #define JZ_REG_INTC_PENDING	0x10
 #define CHIP_SIZE		0x20
+#define IRQ_BASE		8
 
 static irqreturn_t jz4740_cascade(int irq, void *data)
 {
@@ -52,7 +52,7 @@ static irqreturn_t jz4740_cascade(int irq, void *data)
 		if (!irq_reg)
 			continue;
 
-		generic_handle_irq(__fls(irq_reg) + (i * 32) + JZ4740_IRQ_BASE);
+		generic_handle_irq(__fls(irq_reg) + (i * 32) + IRQ_BASE);
 	}
 
 	return IRQ_HANDLED;
@@ -88,23 +88,29 @@ static int __init jz47xx_intc_of_init(struct device_node *node, unsigned num_chi
 	struct irq_chip_generic *gc;
 	struct irq_chip_type *ct;
 	struct irq_domain *domain;
-	int parent_irq;
+	struct resource res;
+	int ret, parent_irq;
 	unsigned i;
 
 	parent_irq = irq_of_parse_and_map(node, 0);
 	if (!parent_irq)
 		return -EINVAL;
 
+	ret = of_address_to_resource(node, 0, &res);
+	if (ret < 0)
+		return ret;
+
 	jz_num_chips = num_chips;
-	jz_intc_base = ioremap(JZ4740_INTC_BASE_ADDR,
+	jz_intc_base = ioremap(res.start,
 			       ((num_chips - 1) * CHIP_SIZE) + 0x14);
 
 	for (i = 0; i < num_chips; i++) {
 		/* Mask all irqs */
 		writel(0xffffffff, jz_intc_base + JZ_REG_INTC_SET_MASK);
 
-		gc = irq_alloc_generic_chip("INTC", 1, JZ4740_IRQ_BASE + (i * 32),
-					    jz_intc_base + (i * CHIP_SIZE), handle_level_irq);
+		gc = irq_alloc_generic_chip("INTC", 1, IRQ_BASE + (i * 32),
+					    jz_intc_base + (i * CHIP_SIZE),
+					    handle_level_irq);
 
 		gc->wake_enabled = IRQ_MSK(32);
 
@@ -121,7 +127,7 @@ static int __init jz47xx_intc_of_init(struct device_node *node, unsigned num_chi
 		irq_setup_generic_chip(gc, IRQ_MSK(32), 0, 0, IRQ_NOPROBE | IRQ_LEVEL);
 	}
 
-	domain = irq_domain_add_legacy(node, num_chips * 32, JZ4740_IRQ_BASE, 0,
+	domain = irq_domain_add_legacy(node, num_chips * 32, IRQ_BASE, 0,
 				       &irq_domain_simple_ops, NULL);
 	if (!domain)
 		pr_warn("unable to register IRQ domain\n");