All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jayachandran C <jchandra@broadcom.com>
To: <linux-mips@linux-mips.org>
Cc: Ganesan Ramalingam <ganesanr@broadcom.com>, <ralf@linux-mips.org>,
	Jayachandran C <jchandra@broadcom.com>
Subject: [PATCH 15/17] MIPS: Netlogic: Add irq mapping and setup for XHCI port 3
Date: Wed, 7 Jan 2015 16:58:36 +0530	[thread overview]
Message-ID: <1420630118-17198-16-git-send-email-jchandra@broadcom.com> (raw)
In-Reply-To: <1420630118-17198-1-git-send-email-jchandra@broadcom.com>

From: Ganesan Ramalingam <ganesanr@broadcom.com>

Add support for third XHCI port in XLPII processors.

Signed-off-by: Ganesan Ramalingam <ganesanr@broadcom.com>
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
---
 arch/mips/include/asm/netlogic/xlp-hal/xlp.h |  1 +
 arch/mips/netlogic/xlp/nlm_hal.c             |  2 ++
 arch/mips/netlogic/xlp/usb-init-xlp2.c       | 10 +++++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/arch/mips/include/asm/netlogic/xlp-hal/xlp.h b/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
index c0b2a80..feb6ed8 100644
--- a/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
+++ b/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
@@ -52,6 +52,7 @@
 #define PIC_2XX_XHCI_2_IRQ		25
 #define PIC_9XX_XHCI_0_IRQ		23
 #define PIC_9XX_XHCI_1_IRQ		24
+#define PIC_9XX_XHCI_2_IRQ		25
 
 #define PIC_MMC_IRQ			29
 #define PIC_I2C_0_IRQ			30
diff --git a/arch/mips/netlogic/xlp/nlm_hal.c b/arch/mips/netlogic/xlp/nlm_hal.c
index c6c31e3..8d743d0 100644
--- a/arch/mips/netlogic/xlp/nlm_hal.c
+++ b/arch/mips/netlogic/xlp/nlm_hal.c
@@ -75,6 +75,8 @@ static int xlp9xx_irq_to_irt(int irq)
 		return 114;
 	case PIC_9XX_XHCI_1_IRQ:
 		return 115;
+	case PIC_9XX_XHCI_2_IRQ:
+		return 116;
 	case PIC_UART_0_IRQ:
 		return 133;
 	case PIC_UART_1_IRQ:
diff --git a/arch/mips/netlogic/xlp/usb-init-xlp2.c b/arch/mips/netlogic/xlp/usb-init-xlp2.c
index 17ade1c..2524939 100644
--- a/arch/mips/netlogic/xlp/usb-init-xlp2.c
+++ b/arch/mips/netlogic/xlp/usb-init-xlp2.c
@@ -128,6 +128,9 @@ static void xlp9xx_usb_ack(struct irq_data *data)
 	case PIC_9XX_XHCI_1_IRQ:
 		port_addr = nlm_xlpii_get_usb_regbase(node, 2);
 		break;
+	case PIC_9XX_XHCI_2_IRQ:
+		port_addr = nlm_xlpii_get_usb_regbase(node, 3);
+		break;
 	default:
 		pr_err("No matching USB irq %d node  %d!\n", irq, node);
 		return;
@@ -222,14 +225,16 @@ static int __init nlm_platform_xlpii_usb_init(void)
 	}
 
 	/* XLP 9XX, multi-node */
-	pr_info("Initializing 9XX USB Interface\n");
+	pr_info("Initializing 9XX/5XX USB Interface\n");
 	for (node = 0; node < NLM_NR_NODES; node++) {
 		if (!nlm_node_present(node))
 			continue;
 		nlm_xlpii_usb_hw_reset(node, 1);
 		nlm_xlpii_usb_hw_reset(node, 2);
+		nlm_xlpii_usb_hw_reset(node, 3);
 		nlm_set_pic_extra_ack(node, PIC_9XX_XHCI_0_IRQ, xlp9xx_usb_ack);
 		nlm_set_pic_extra_ack(node, PIC_9XX_XHCI_1_IRQ, xlp9xx_usb_ack);
+		nlm_set_pic_extra_ack(node, PIC_9XX_XHCI_2_IRQ, xlp9xx_usb_ack);
 	}
 	return 0;
 }
@@ -253,6 +258,9 @@ static void nlm_xlp9xx_usb_fixup_final(struct pci_dev *dev)
 	case 0x22:
 		dev->irq = nlm_irq_to_xirq(node, PIC_9XX_XHCI_1_IRQ);
 		break;
+	case 0x23:
+		dev->irq = nlm_irq_to_xirq(node, PIC_9XX_XHCI_2_IRQ);
+		break;
 	}
 }
 
-- 
1.9.1

WARNING: multiple messages have this Message-ID (diff)
From: Jayachandran C <jchandra@broadcom.com>
To: linux-mips@linux-mips.org
Cc: Ganesan Ramalingam <ganesanr@broadcom.com>,
	ralf@linux-mips.org, Jayachandran C <jchandra@broadcom.com>
Subject: [PATCH 15/17] MIPS: Netlogic: Add irq mapping and setup for XHCI port 3
Date: Wed, 7 Jan 2015 16:58:36 +0530	[thread overview]
Message-ID: <1420630118-17198-16-git-send-email-jchandra@broadcom.com> (raw)
Message-ID: <20150107112836.YKvCVL4x2DkAqTIAZSCHBYI7roObvljQl9DfUimmB4w@z> (raw)
In-Reply-To: <1420630118-17198-1-git-send-email-jchandra@broadcom.com>

From: Ganesan Ramalingam <ganesanr@broadcom.com>

Add support for third XHCI port in XLPII processors.

Signed-off-by: Ganesan Ramalingam <ganesanr@broadcom.com>
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
---
 arch/mips/include/asm/netlogic/xlp-hal/xlp.h |  1 +
 arch/mips/netlogic/xlp/nlm_hal.c             |  2 ++
 arch/mips/netlogic/xlp/usb-init-xlp2.c       | 10 +++++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/arch/mips/include/asm/netlogic/xlp-hal/xlp.h b/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
index c0b2a80..feb6ed8 100644
--- a/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
+++ b/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
@@ -52,6 +52,7 @@
 #define PIC_2XX_XHCI_2_IRQ		25
 #define PIC_9XX_XHCI_0_IRQ		23
 #define PIC_9XX_XHCI_1_IRQ		24
+#define PIC_9XX_XHCI_2_IRQ		25
 
 #define PIC_MMC_IRQ			29
 #define PIC_I2C_0_IRQ			30
diff --git a/arch/mips/netlogic/xlp/nlm_hal.c b/arch/mips/netlogic/xlp/nlm_hal.c
index c6c31e3..8d743d0 100644
--- a/arch/mips/netlogic/xlp/nlm_hal.c
+++ b/arch/mips/netlogic/xlp/nlm_hal.c
@@ -75,6 +75,8 @@ static int xlp9xx_irq_to_irt(int irq)
 		return 114;
 	case PIC_9XX_XHCI_1_IRQ:
 		return 115;
+	case PIC_9XX_XHCI_2_IRQ:
+		return 116;
 	case PIC_UART_0_IRQ:
 		return 133;
 	case PIC_UART_1_IRQ:
diff --git a/arch/mips/netlogic/xlp/usb-init-xlp2.c b/arch/mips/netlogic/xlp/usb-init-xlp2.c
index 17ade1c..2524939 100644
--- a/arch/mips/netlogic/xlp/usb-init-xlp2.c
+++ b/arch/mips/netlogic/xlp/usb-init-xlp2.c
@@ -128,6 +128,9 @@ static void xlp9xx_usb_ack(struct irq_data *data)
 	case PIC_9XX_XHCI_1_IRQ:
 		port_addr = nlm_xlpii_get_usb_regbase(node, 2);
 		break;
+	case PIC_9XX_XHCI_2_IRQ:
+		port_addr = nlm_xlpii_get_usb_regbase(node, 3);
+		break;
 	default:
 		pr_err("No matching USB irq %d node  %d!\n", irq, node);
 		return;
@@ -222,14 +225,16 @@ static int __init nlm_platform_xlpii_usb_init(void)
 	}
 
 	/* XLP 9XX, multi-node */
-	pr_info("Initializing 9XX USB Interface\n");
+	pr_info("Initializing 9XX/5XX USB Interface\n");
 	for (node = 0; node < NLM_NR_NODES; node++) {
 		if (!nlm_node_present(node))
 			continue;
 		nlm_xlpii_usb_hw_reset(node, 1);
 		nlm_xlpii_usb_hw_reset(node, 2);
+		nlm_xlpii_usb_hw_reset(node, 3);
 		nlm_set_pic_extra_ack(node, PIC_9XX_XHCI_0_IRQ, xlp9xx_usb_ack);
 		nlm_set_pic_extra_ack(node, PIC_9XX_XHCI_1_IRQ, xlp9xx_usb_ack);
+		nlm_set_pic_extra_ack(node, PIC_9XX_XHCI_2_IRQ, xlp9xx_usb_ack);
 	}
 	return 0;
 }
@@ -253,6 +258,9 @@ static void nlm_xlp9xx_usb_fixup_final(struct pci_dev *dev)
 	case 0x22:
 		dev->irq = nlm_irq_to_xirq(node, PIC_9XX_XHCI_1_IRQ);
 		break;
+	case 0x23:
+		dev->irq = nlm_irq_to_xirq(node, PIC_9XX_XHCI_2_IRQ);
+		break;
 	}
 }
 
-- 
1.9.1

  parent reply	other threads:[~2015-01-07 11:25 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-07 11:28 [PATCH 00/17] Netlogic XLP updates Jayachandran C
2015-01-07 11:28 ` Jayachandran C
2015-01-07 11:28 ` [PATCH 01/17] MIPS: Netlogic: Fix wait for slave CPUs Jayachandran C
2015-01-07 11:28   ` Jayachandran C
2015-01-07 11:28 ` [PATCH 02/17] MIPS: Netlogic: Fix nlm_xlp2_get_pic_frequency to use ref_div Jayachandran C
2015-01-07 11:28   ` Jayachandran C
2015-01-07 11:28 ` [PATCH 03/17] MIPS: Netlogic: Fix cop0 prid check in AHCI init Jayachandran C
2015-01-07 11:28   ` Jayachandran C
2015-01-07 11:28 ` [PATCH 04/17] MIPS: Netlogic: Disable writing IRT for disabled blocks Jayachandran C
2015-01-07 11:28   ` Jayachandran C
2015-01-07 17:07   ` Sergei Shtylyov
2015-01-09  9:48     ` Jayachandran C.
2015-01-09  9:48       ` Jayachandran C.
2015-01-09 11:35       ` Sergei Shtylyov
2015-01-07 11:28 ` [PATCH 05/17] MIPS: Netlogic: Fix for SATA PHY init Jayachandran C
2015-01-07 11:28   ` Jayachandran C
2015-01-07 11:28 ` [PATCH 06/17] MIPS: Netlogic: Fix frequency calculation register Jayachandran C
2015-01-07 11:28   ` Jayachandran C
2015-01-07 11:28 ` [PATCH 07/17] MIPS: MSI: Update MSI handling for XLP Jayachandran C
2015-01-07 11:28   ` Jayachandran C
2015-01-07 11:28 ` [PATCH 08/17] MIPS: Netlogic: Use MIPS topology.h Jayachandran C
2015-01-07 11:28   ` Jayachandran C
2015-01-07 11:28 ` [PATCH 09/17] MIPS: Netlogic: Move cores per node out of multi-node.h Jayachandran C
2015-01-07 11:28   ` Jayachandran C
2015-01-07 11:28 ` [PATCH 10/17] MIPS: Netlogic: nlm_core_id for xlp9xx Jayachandran C
2015-01-07 11:28   ` Jayachandran C
2015-01-07 11:28 ` [PATCH 11/17] MIPS: Netlogic: Added HugeTLB as default Jayachandran C
2015-01-07 11:28   ` Jayachandran C
2015-01-07 11:28 ` [PATCH 12/17] MIPS: Netlogic: Update function to read DRAM BARs Jayachandran C
2015-01-07 11:28   ` Jayachandran C
2015-01-07 11:28 ` [PATCH 13/17] MIPS: Netlogic: Handle XLP hardware errata Jayachandran C
2015-01-07 11:28   ` Jayachandran C
2015-01-07 17:21   ` Sergei Shtylyov
2015-01-07 19:33     ` David Daney
2015-01-09  9:51     ` Jayachandran C.
2015-01-09  9:51       ` Jayachandran C.
2015-01-09 10:43       ` Jayachandran C
2015-01-09 10:43         ` Jayachandran C
2015-01-07 11:28 ` [PATCH 14/17] MIPS: Netlogic: Do not enable SUE for core Jayachandran C
2015-01-07 11:28   ` Jayachandran C
2015-01-07 11:28 ` Jayachandran C [this message]
2015-01-07 11:28   ` [PATCH 15/17] MIPS: Netlogic: Add irq mapping and setup for XHCI port 3 Jayachandran C
2015-01-07 11:28 ` [PATCH 16/17] MIPS: Netlogic: i2c IRQ mappings for XLP9XX Jayachandran C
2015-01-07 11:28   ` Jayachandran C
2015-01-07 11:28 ` [PATCH 17/17] MIPS: Netlogic: Add built-in dts for XLP5xx boards Jayachandran C
2015-01-07 11:28   ` Jayachandran C

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1420630118-17198-16-git-send-email-jchandra@broadcom.com \
    --to=jchandra@broadcom.com \
    --cc=ganesanr@broadcom.com \
    --cc=linux-mips@linux-mips.org \
    --cc=ralf@linux-mips.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.