Skip to contentSkip to conversation

ARM: highbank: Only touch common coherency control register fields

PATCH New Rob Herring 2 participants 2 messages Jul 21, 2013 – Jul 23, 2013

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/calxeda highbank architecture
lore
Share & tools
lore

Rob Herring

author
#0 lore raw

PATCH 1/1 ARM: highbank: Only touch common coherency control register fields

From: Rob Herring <[email protected]>

Midway adds new register fields to the coherency control registers, so writing absolute values will break on Midway. Change the register accesses to only modify the necessary and common fields in order to support both Midway and Highbank.

Signed-off-by Rob Herring <[email protected]>
---
 arch/arm/mach-highbank/highbank.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
arch/arm/mach-highbank/highbank.c +4 -3
index dc5d6be..8881579 100644
@@ -115,6 +115,7 @@ static int highbank_platform_notifier(struct notifier_block *nb,
 {
 	struct resource *res;
 	int reg = -1;
+	u32 val;
 	struct device *dev = __dev;
 
 	if (event != BUS_NOTIFY_ADD_DEVICE)

@@ -141,10 +142,10 @@ static int highbank_platform_notifier(struct notifier_block *nb,
 		return NOTIFY_DONE;
 
 	if (of_property_read_bool(dev->of_node, "dma-coherent")) {
-		writel(0xff31, sregs_base + reg);
+		val = readl(sregs_base + reg);
+		writel(val | 0xff01, sregs_base + reg);
 		set_dma_ops(dev, &arm_coherent_dma_ops);
-	} else
-		writel(0, sregs_base + reg);
+	}
 
 	return NOTIFY_OK;
 }
Signature · 1 line
1.8.1.2
Applied
#1 lore raw

PATCH 1/1 ARM: highbank: Only touch common coherency control register fields

Quoted 8 lines · Rob Herring

From: Rob Herring <[email protected]>

Midway adds new register fields to the coherency control registers, so writing absolute values will break on Midway. Change the register accesses to only modify the necessary and common fields in order to support both Midway and Highbank.

Signed-off-by Rob Herring <[email protected]>

Applied to fixes, thanks.

-Olof