Skip to contentSkip to conversation

powerpc/mpc85xx: use correct dma compatible for several SoCs

PATCH New Laurentiu Tudor 2 participants 2 messages Nov 20, 2014 – Dec 5, 2014 PowerPC

lore
Share & tools
lore

Laurentiu Tudor

author
#0 lore raw

PATCH 1/1 powerpc/mpc85xx: use correct dma compatible for several SoCs

Newer qoriq socs have an updated dma ip block with a different compatible. Let's make sure we use the proper string so that the dmas get their liodn.
In order to have the means to specify the compatible string, the liodn setting macros were updated to receive a new parameter for it.
The following SoCs were changed to use the new compatible:
T1023/4, T1040, T2080/1, T4240, B4860.

Signed-off-by Laurentiu Tudor <[email protected]>

---
depends on https://patchwork.ozlabs.org/patch/403532/

 arch/powerpc/cpu/mpc85xx/b4860_ids.c | 4 ++--
 arch/powerpc/cpu/mpc85xx/p2041_ids.c | 4 ++--
 arch/powerpc/cpu/mpc85xx/p3041_ids.c | 4 ++--
 arch/powerpc/cpu/mpc85xx/p4080_ids.c | 4 ++--
 arch/powerpc/cpu/mpc85xx/p5020_ids.c | 4 ++--
 arch/powerpc/cpu/mpc85xx/p5040_ids.c | 4 ++--
 arch/powerpc/cpu/mpc85xx/t1024_ids.c | 4 ++--
 arch/powerpc/cpu/mpc85xx/t1040_ids.c | 4 ++--
 arch/powerpc/cpu/mpc85xx/t2080_ids.c | 6 +++---
 arch/powerpc/cpu/mpc85xx/t4240_ids.c | 4 ++--
 arch/powerpc/include/asm/fsl_liodn.h | 4 ++--
 11 files changed, 23 insertions(+), 23 deletions(-)
arch/powerpc/cpu/mpc85xx/b4860_ids.c +2 -2
index 1a30f1c..598f7bd 100644
@@ -59,8 +59,8 @@ struct liodn_id_table liodn_tbl[] = {
 
 	SET_PCI_LIODN(CONFIG_SYS_FSL_PCIE_COMPAT, 1, 148),
 
-	SET_DMA_LIODN(1, 147),
-	SET_DMA_LIODN(2, 227),
+	SET_DMA_LIODN(1, "fsl,elo3-dma", 147),
+	SET_DMA_LIODN(2, "fsl,elo3-dma", 227),
 
 #ifndef CONFIG_PPC_B4420
 	SET_GUTS_LIODN("fsl,rapidio-delta", 199, rio1liodnr, 0),
arch/powerpc/cpu/mpc85xx/p2041_ids.c +2 -2
index 488e078..6e3cddd 100644
@@ -50,8 +50,8 @@ struct liodn_id_table liodn_tbl[] = {
 	SET_PCI_LIODN(CONFIG_SYS_FSL_PCIE_COMPAT, 2, 194),
 	SET_PCI_LIODN(CONFIG_SYS_FSL_PCIE_COMPAT, 3, 195),
 
-	SET_DMA_LIODN(1, 197),
-	SET_DMA_LIODN(2, 198),
+	SET_DMA_LIODN(1, "fsl,eloplus-dma", 197),
+	SET_DMA_LIODN(2, "fsl,eloplus-dma", 198),
 
 	SET_GUTS_LIODN("fsl,rapidio-delta", 199, rio1liodnr, 0),
 	SET_GUTS_LIODN(NULL, 200, rio2liodnr, 0),
arch/powerpc/cpu/mpc85xx/p3041_ids.c +2 -2
index 7d98870..2b57703 100644
@@ -51,8 +51,8 @@ struct liodn_id_table liodn_tbl[] = {
 	SET_PCI_LIODN(CONFIG_SYS_FSL_PCIE_COMPAT, 3, 195),
 	SET_PCI_LIODN(CONFIG_SYS_FSL_PCIE_COMPAT, 4, 196),
 
-	SET_DMA_LIODN(1, 197),
-	SET_DMA_LIODN(2, 198),
+	SET_DMA_LIODN(1, "fsl,eloplus-dma", 197),
+	SET_DMA_LIODN(2, "fsl,eloplus-dma", 198),
 
 	SET_GUTS_LIODN("fsl,rapidio-delta", 199, rio1liodnr, 0),
 	SET_GUTS_LIODN(NULL, 200, rio2liodnr, 0),
arch/powerpc/cpu/mpc85xx/p4080_ids.c +2 -2
index b2a23c0..94a5143 100644
@@ -40,8 +40,8 @@ struct liodn_id_table liodn_tbl[] = {
 	SET_PCI_LIODN(CONFIG_SYS_FSL_PCIE_COMPAT, 2, 194),
 	SET_PCI_LIODN(CONFIG_SYS_FSL_PCIE_COMPAT, 3, 195),
 
-	SET_DMA_LIODN(1, 196),
-	SET_DMA_LIODN(2, 197),
+	SET_DMA_LIODN(1, "fsl,eloplus-dma", 196),
+	SET_DMA_LIODN(2, "fsl,eloplus-dma", 197),
 
 	SET_GUTS_LIODN("fsl,srio-rmu", 200, rmuliodnr, 0xd3000),
arch/powerpc/cpu/mpc85xx/p5020_ids.c +2 -2
index b5d787c..0f292cf 100644
@@ -51,8 +51,8 @@ struct liodn_id_table liodn_tbl[] = {
 	SET_PCI_LIODN(CONFIG_SYS_FSL_PCIE_COMPAT, 3, 195),
 	SET_PCI_LIODN(CONFIG_SYS_FSL_PCIE_COMPAT, 4, 196),
 
-	SET_DMA_LIODN(1, 197),
-	SET_DMA_LIODN(2, 198),
+	SET_DMA_LIODN(1, "fsl,eloplus-dma", 197),
+	SET_DMA_LIODN(2, "fsl,eloplus-dma", 198),
 
 	SET_GUTS_LIODN("fsl,rapidio-delta", 199, rio1liodnr, 0),
 	SET_GUTS_LIODN(NULL, 200, rio2liodnr, 0),
arch/powerpc/cpu/mpc85xx/p5040_ids.c +2 -2
index 990f179..d4343ef 100644
@@ -42,8 +42,8 @@ struct liodn_id_table liodn_tbl[] = {
 	SET_PCI_LIODN_BASE(CONFIG_SYS_FSL_PCIE_COMPAT, 2, 196),
 	SET_PCI_LIODN_BASE(CONFIG_SYS_FSL_PCIE_COMPAT, 3, 197),
 
-	SET_DMA_LIODN(1, 193),
-	SET_DMA_LIODN(2, 194),
+	SET_DMA_LIODN(1, "fsl,eloplus-dma", 193),
+	SET_DMA_LIODN(2, "fsl,eloplus-dma", 194),
 };
 int liodn_tbl_sz = ARRAY_SIZE(liodn_tbl);
arch/powerpc/cpu/mpc85xx/t1024_ids.c +2 -2
index 5f24c15..132689b 100644
@@ -41,8 +41,8 @@ struct liodn_id_table liodn_tbl[] = {
 	SET_PCI_LIODN_BASE(CONFIG_SYS_FSL_PCIE_COMPAT, 2, 228),
 	SET_PCI_LIODN_BASE(CONFIG_SYS_FSL_PCIE_COMPAT, 3, 308),
 
-	SET_DMA_LIODN(1, 147),
-	SET_DMA_LIODN(2, 227),
+	SET_DMA_LIODN(1, "fsl,elo3-dma", 147),
+	SET_DMA_LIODN(2, "fsl,elo3-dma", 227),
 	/* SET_NEXUS_LIODN(557), -- not yet implemented */
 	SET_QE_LIODN(559),
 	SET_TDM_LIODN(560),
arch/powerpc/cpu/mpc85xx/t1040_ids.c +2 -2
index a5dfb81..268f829 100644
@@ -42,8 +42,8 @@ struct liodn_id_table liodn_tbl[] = {
 
 	SET_PCI_LIODN("fsl,qoriq-pcie-v2.2", 1, 148),
 
-	SET_DMA_LIODN(1, 147),
-	SET_DMA_LIODN(2, 227),
+	SET_DMA_LIODN(1, "fsl,elo3-dma", 147),
+	SET_DMA_LIODN(2, "fsl,elo3-dma", 227),
 
 	/* SET_NEXUS_LIODN(557), -- not yet implemented */
 	SET_QE_LIODN(559),
arch/powerpc/cpu/mpc85xx/t2080_ids.c +3 -3
index 0bfd447..eda7f59 100644
@@ -63,9 +63,9 @@ struct liodn_id_table liodn_tbl[] = {
 	SET_PCI_LIODN_BASE(CONFIG_SYS_FSL_PCIE_COMPAT, 3, 308),
 	SET_PCI_LIODN_BASE(CONFIG_SYS_FSL_PCIE_COMPAT, 4, 388),
 
-	SET_DMA_LIODN(1, 147),
-	SET_DMA_LIODN(2, 227),
-	SET_DMA_LIODN(3, 226),
+	SET_DMA_LIODN(1, "fsl,elo3-dma", 147),
+	SET_DMA_LIODN(2, "fsl,elo3-dma", 227),
+	SET_DMA_LIODN(3, "fsl,elo3-dma", 226),
 
 	SET_GUTS_LIODN("fsl,rapidio-delta", 199, rio1liodnr, 0),
 	SET_GUTS_LIODN(NULL, 200, rio2liodnr, 0),
arch/powerpc/cpu/mpc85xx/t4240_ids.c +2 -2
index 1a3cb33..470b080 100644
@@ -93,8 +93,8 @@ struct liodn_id_table liodn_tbl[] = {
 	SET_PCI_LIODN_BASE(CONFIG_SYS_FSL_PCIE_COMPAT, 3, 308),
 	SET_PCI_LIODN_BASE(CONFIG_SYS_FSL_PCIE_COMPAT, 4, 388),
 
-	SET_DMA_LIODN(1, 147),
-	SET_DMA_LIODN(2, 227),
+	SET_DMA_LIODN(1, "fsl,elo3-dma", 147),
+	SET_DMA_LIODN(2, "fsl,elo3-dma", 227),
 
 	SET_GUTS_LIODN("fsl,rapidio-delta", 199, rio1liodnr, 0),
 	SET_GUTS_LIODN(NULL, 200, rio2liodnr, 0),
arch/powerpc/include/asm/fsl_liodn.h +2 -2
index adfbb66..811f034 100644
@@ -91,8 +91,8 @@ extern void fdt_fixup_liodn(void *blob);
 		CONFIG_SYS_MPC85xx_PCIE##pciNum##_OFFSET)
 
 /* reg nodes for DMA start @ 0x300 */
-#define SET_DMA_LIODN(dmaNum, liodn) \
-	SET_GUTS_LIODN("fsl,eloplus-dma", liodn, dma##dmaNum##liodnr,\
+#define SET_DMA_LIODN(dmaNum, compat, liodn) \
+	SET_GUTS_LIODN(compat, liodn, dma##dmaNum##liodnr,\
 		CONFIG_SYS_MPC85xx_DMA##dmaNum##_OFFSET + 0x300)
 
 #define SET_SDHC_LIODN(sdhcNum, liodn) \
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/1 powerpc/mpc85xx: use correct dma compatible for several SoCs

Quoted 9 lines · Laurentiu Tudor

Newer qoriq socs have an updated dma ip block with a different compatible. Let's make sure we use the proper string so that the dmas get their liodn.
In order to have the means to specify the compatible string, the liodn setting macros were updated to receive a new parameter for it.
The following SoCs were changed to use the new compatible:
T1023/4, T1040, T2080/1, T4240, B4860.

Quoted 3 lines
Signed-off-by Laurentiu Tudor <[email protected]>

---
depends on https://patchwork.ozlabs.org/patch/403532/

Applied to u-boot-mpc85xx, awaiting upstream.

York