Use the linux/platform_data/pic32.h include instead of asm/mach-pic32/pic32.h so that the asm variant can be dropped. This is in preparation for allowing some drivers to be compiled on other architectures with COMPILE_TEST enabled. Signed-off-by: Brian Masney <bmasney@redhat.com> --- To: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- arch/mips/pic32/common/reset.c | 2 +- arch/mips/pic32/pic32mzda/config.c | 3 +-- arch/mips/pic32/pic32mzda/early_clk.c | 2 +- arch/mips/pic32/pic32mzda/early_console.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/mips/pic32/common/reset.c b/arch/mips/pic32/common/reset.c index a5fd7a8e2800ff06cfe8c0ed91c8ff6f5996750f..d4ad5dbd61c0d06fee2c9fef2af5c3a7c4312209 100644 --- a/arch/mips/pic32/common/reset.c +++ b/arch/mips/pic32/common/reset.c @@ -4,9 +4,9 @@ * Copyright (C) 2015 Microchip Technology Inc. All rights reserved. */ #include <linux/init.h> +#include <linux/platform_data/pic32.h> #include <linux/pm.h> #include <asm/reboot.h> -#include <asm/mach-pic32/pic32.h> #define PIC32_RSWRST 0x10 diff --git a/arch/mips/pic32/pic32mzda/config.c b/arch/mips/pic32/pic32mzda/config.c index 73be5689e0dfb8b18c0a44ee860ca2786201471e..fc21cbc11f7d6b75b15e5c6747a1a5f34c1d5d8e 100644 --- a/arch/mips/pic32/pic32mzda/config.c +++ b/arch/mips/pic32/pic32mzda/config.c @@ -5,10 +5,9 @@ */ #include <linux/init.h> #include <linux/io.h> +#include <linux/platform_data/pic32.h> #include <linux/spinlock.h> -#include <asm/mach-pic32/pic32.h> - #include "pic32mzda.h" #define PIC32_CFGCON 0x0000 diff --git a/arch/mips/pic32/pic32mzda/early_clk.c b/arch/mips/pic32/pic32mzda/early_clk.c index 6001e507d8e398dee77eed071f0e53f708b57a61..ed8fa6e68b7b814bc184ee9bebddca08c20623c0 100644 --- a/arch/mips/pic32/pic32mzda/early_clk.c +++ b/arch/mips/pic32/pic32mzda/early_clk.c @@ -3,7 +3,7 @@ * Joshua Henderson <joshua.henderson@microchip.com> * Copyright (C) 2015 Microchip Technology Inc. All rights reserved. */ -#include <asm/mach-pic32/pic32.h> +#include <linux/platform_data/pic32.h> #include "pic32mzda.h" diff --git a/arch/mips/pic32/pic32mzda/early_console.c b/arch/mips/pic32/pic32mzda/early_console.c index 3cd1b408fa1cb039f917f2d92e82fd00d8a44574..1349c783cb640d1c0940db6deda77da882ff97fe 100644 --- a/arch/mips/pic32/pic32mzda/early_console.c +++ b/arch/mips/pic32/pic32mzda/early_console.c @@ -3,9 +3,9 @@ * Joshua Henderson <joshua.henderson@microchip.com> * Copyright (C) 2015 Microchip Technology Inc. All rights reserved. */ -#include <asm/mach-pic32/pic32.h> #include <asm/fw/fw.h> #include <asm/setup.h> +#include <linux/platform_data/pic32.h> #include "pic32mzda.h" #include "early_pin.h" -- 2.52.0