Skip to content

Commit bf4ad3b

Browse files
EthanNelson-Mooregclement
authored andcommitted
ARM: orion5x: update board check in mss2_pci_init() to use the DT
The mss2_pci_init() function contains a check for the ARM machine ID via the machine_is_mss2() macro. The board concerned now supports only FDT booting, which does not use machine IDs, and therefore the code should be updated to check the DT compatible property instead. The machine was converted to FDT booting in commit fbf04d8 ("ARM: orion5x: convert Maxtor Shared Storage II to the Device Tree"). The presence of this machine ID check prevents the removal of machine IDs no longer used by the kernel from arch/arm/tools/mach-types, because the machine_is_*() macros are generated from mach-types. To resolve this issue, use of_machine_is_compatible() instead. Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
1 parent b2a4bd1 commit bf4ad3b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/arm/mach-orion5x/board-mss2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <linux/platform_device.h>
1111
#include <linux/pci.h>
1212
#include <linux/irq.h>
13-
#include <asm/mach-types.h>
13+
#include <linux/of.h>
1414
#include <asm/mach/arch.h>
1515
#include <asm/mach/pci.h>
1616
#include "orion5x.h"
@@ -47,7 +47,7 @@ static struct hw_pci mss2_pci __initdata = {
4747

4848
static int __init mss2_pci_init(void)
4949
{
50-
if (machine_is_mss2())
50+
if (of_machine_is_compatible("maxtor,shared-storage-2"))
5151
pci_common_init(&mss2_pci);
5252

5353
return 0;

0 commit comments

Comments
 (0)