diff options
author | Milton Miller <miltonm@bga.com> | 2008-07-10 17:14:18 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-11 13:21:54 -0400 |
commit | f63af11ddb508ce7b2a270515244d145248cad7f (patch) | |
tree | fde10170efba6860777cf9adcb87d27d78967f31 /drivers | |
parent | 6f40470e745693ee4ad85edb441b0aad5cae3f00 (diff) |
[MTD] [NAND] remove __PPC__ hardcoded address from DiskOnChip drivers
Such a hardcoded address can cause a checkstop or machine check if
the driver is in the kernel but the address is not acknowledged.
Both drivers allow an address to be specified as either a module
parameter or config option. Any future powerpc board should either
use one of these methods or find the address in the device tree.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mtd/devices/docprobe.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/diskonchip.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mtd/devices/docprobe.c b/drivers/mtd/devices/docprobe.c index 6e5d811ae83a..6e62922942b1 100644 --- a/drivers/mtd/devices/docprobe.c +++ b/drivers/mtd/devices/docprobe.c | |||
@@ -76,8 +76,6 @@ static unsigned long __initdata doc_locations[] = { | |||
76 | 0xe0000, 0xe2000, 0xe4000, 0xe6000, | 76 | 0xe0000, 0xe2000, 0xe4000, 0xe6000, |
77 | 0xe8000, 0xea000, 0xec000, 0xee000, | 77 | 0xe8000, 0xea000, 0xec000, 0xee000, |
78 | #endif /* CONFIG_MTD_DOCPROBE_HIGH */ | 78 | #endif /* CONFIG_MTD_DOCPROBE_HIGH */ |
79 | #elif defined(__PPC__) | ||
80 | 0xe4000000, | ||
81 | #else | 79 | #else |
82 | #warning Unknown architecture for DiskOnChip. No default probe locations defined | 80 | #warning Unknown architecture for DiskOnChip. No default probe locations defined |
83 | #endif | 81 | #endif |
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c index cd4393ce2562..765d4f0f7c86 100644 --- a/drivers/mtd/nand/diskonchip.c +++ b/drivers/mtd/nand/diskonchip.c | |||
@@ -52,8 +52,6 @@ static unsigned long __initdata doc_locations[] = { | |||
52 | 0xe0000, 0xe2000, 0xe4000, 0xe6000, | 52 | 0xe0000, 0xe2000, 0xe4000, 0xe6000, |
53 | 0xe8000, 0xea000, 0xec000, 0xee000, | 53 | 0xe8000, 0xea000, 0xec000, 0xee000, |
54 | #endif /* CONFIG_MTD_DOCPROBE_HIGH */ | 54 | #endif /* CONFIG_MTD_DOCPROBE_HIGH */ |
55 | #elif defined(__PPC__) | ||
56 | 0xe4000000, | ||
57 | #else | 55 | #else |
58 | #warning Unknown architecture for DiskOnChip. No default probe locations defined | 56 | #warning Unknown architecture for DiskOnChip. No default probe locations defined |
59 | #endif | 57 | #endif |