From ea3857230c2d7428e8c22a9d063b4a5b86b34a0c Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Fri, 20 Feb 2015 17:04:15 +0900
Subject: [PATCH] ARM: kirkwood: move SoC headers to mach-kirkwood/include/mach
Move arch/arm/include/asm/arch-kirkwood/*
-> arch/arm/mach-kirkwood/include/mach/*
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Stefan Roese <sr@denx.de>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Luka Perkov <luka.perkov@sartura.hr>
---
MAINTAINERS | 1 -
.../asm/arch-kirkwood => mach-kirkwood/include/mach}/config.h | 0
.../asm/arch-kirkwood => mach-kirkwood/include/mach}/cpu.h | 0
.../asm/arch-kirkwood => mach-kirkwood/include/mach}/gpio.h | 0
.../arch-kirkwood => mach-kirkwood/include/mach}/kw88f6192.h | 0
.../arch-kirkwood => mach-kirkwood/include/mach}/kw88f6281.h | 0
.../asm/arch-kirkwood => mach-kirkwood/include/mach}/mpp.h | 0
.../asm/arch-kirkwood => mach-kirkwood/include/mach}/soc.h | 0
include/configs/km/km_arm.h | 2 +-
9 files changed, 1 insertion(+), 2 deletions(-)
rename arch/arm/{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/config.h (100%)
rename arch/arm/{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/cpu.h (100%)
rename arch/arm/{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/gpio.h (100%)
rename arch/arm/{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/kw88f6192.h (100%)
rename arch/arm/{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/kw88f6281.h (100%)
rename arch/arm/{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/mpp.h (100%)
rename arch/arm/{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/soc.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 7a3e963100..eef70d0f68 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -99,7 +99,6 @@ M: Luka Perkov <luka.perkov@sartura.hr>
S: Maintained
T: git git://git.denx.de/u-boot-marvell.git
F: arch/arm/mach-kirkwood/
-F: arch/arm/include/asm/arch-kirkwood/
ARM MARVELL PXA
M: Marek Vasut <marex@denx.de>
diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/mach-kirkwood/include/mach/config.h
similarity index 100%
rename from arch/arm/include/asm/arch-kirkwood/config.h
rename to arch/arm/mach-kirkwood/include/mach/config.h
diff --git a/arch/arm/include/asm/arch-kirkwood/cpu.h b/arch/arm/mach-kirkwood/include/mach/cpu.h
similarity index 100%
rename from arch/arm/include/asm/arch-kirkwood/cpu.h
rename to arch/arm/mach-kirkwood/include/mach/cpu.h
diff --git a/arch/arm/include/asm/arch-kirkwood/gpio.h b/arch/arm/mach-kirkwood/include/mach/gpio.h
similarity index 100%
rename from arch/arm/include/asm/arch-kirkwood/gpio.h
rename to arch/arm/mach-kirkwood/include/mach/gpio.h
diff --git a/arch/arm/include/asm/arch-kirkwood/kw88f6192.h b/arch/arm/mach-kirkwood/include/mach/kw88f6192.h
similarity index 100%
rename from arch/arm/include/asm/arch-kirkwood/kw88f6192.h
rename to arch/arm/mach-kirkwood/include/mach/kw88f6192.h
diff --git a/arch/arm/include/asm/arch-kirkwood/kw88f6281.h b/arch/arm/mach-kirkwood/include/mach/kw88f6281.h
similarity index 100%
rename from arch/arm/include/asm/arch-kirkwood/kw88f6281.h
rename to arch/arm/mach-kirkwood/include/mach/kw88f6281.h
diff --git a/arch/arm/include/asm/arch-kirkwood/mpp.h b/arch/arm/mach-kirkwood/include/mach/mpp.h
similarity index 100%
rename from arch/arm/include/asm/arch-kirkwood/mpp.h
rename to arch/arm/mach-kirkwood/include/mach/mpp.h
diff --git a/arch/arm/include/asm/arch-kirkwood/soc.h b/arch/arm/mach-kirkwood/include/mach/soc.h
similarity index 100%
rename from arch/arm/include/asm/arch-kirkwood/soc.h
rename to arch/arm/mach-kirkwood/include/mach/soc.h
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index f780f8b5bb..2ed0855fdd 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -195,7 +195,7 @@
}
#ifndef __ASSEMBLY__
-#include <asm/arch-kirkwood/gpio.h>
+#include <asm/arch/gpio.h>
extern void __set_direction(unsigned pin, int high);
void set_sda(int state);
void set_scl(int state);
--
2.39.5