Move arch/arm/include/asm/arch-bcm283x/* -> arch/arm/mach-bcm283x/include/mach/*
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Cc: Stephen Warren swarren@nvidia.com ---
Changes in v2: None
arch/arm/mach-bcm283x/Kconfig | 2 +- .../{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/gpio.h | 0 .../{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/mbox.h | 0 .../{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/sdhci.h | 0 .../{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/timer.h | 0 .../{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/wdog.h | 0 drivers/mmc/bcm2835_sdhci.c | 4 ++-- 7 files changed, 3 insertions(+), 3 deletions(-) rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/gpio.h (100%) rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/mbox.h (100%) rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/sdhci.h (100%) rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/timer.h (100%) rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/wdog.h (100%)
diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig index d5e09e8..b43f2d9 100644 --- a/arch/arm/mach-bcm283x/Kconfig +++ b/arch/arm/mach-bcm283x/Kconfig @@ -31,7 +31,7 @@ config SYS_VENDOR default "raspberrypi"
config SYS_SOC - default "bcm2835" + default "bcm283x"
config SYS_CONFIG_NAME default "rpi" if TARGET_RPI diff --git a/arch/arm/include/asm/arch-bcm2835/gpio.h b/arch/arm/mach-bcm283x/include/mach/gpio.h similarity index 100% rename from arch/arm/include/asm/arch-bcm2835/gpio.h rename to arch/arm/mach-bcm283x/include/mach/gpio.h diff --git a/arch/arm/include/asm/arch-bcm2835/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h similarity index 100% rename from arch/arm/include/asm/arch-bcm2835/mbox.h rename to arch/arm/mach-bcm283x/include/mach/mbox.h diff --git a/arch/arm/include/asm/arch-bcm2835/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h similarity index 100% rename from arch/arm/include/asm/arch-bcm2835/sdhci.h rename to arch/arm/mach-bcm283x/include/mach/sdhci.h diff --git a/arch/arm/include/asm/arch-bcm2835/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h similarity index 100% rename from arch/arm/include/asm/arch-bcm2835/timer.h rename to arch/arm/mach-bcm283x/include/mach/timer.h diff --git a/arch/arm/include/asm/arch-bcm2835/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h similarity index 100% rename from arch/arm/include/asm/arch-bcm2835/wdog.h rename to arch/arm/mach-bcm283x/include/mach/wdog.h diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c index 92f7d89..4ec2968 100644 --- a/drivers/mmc/bcm2835_sdhci.c +++ b/drivers/mmc/bcm2835_sdhci.c @@ -39,8 +39,8 @@ #include <common.h> #include <malloc.h> #include <sdhci.h> -#include <asm/arch/timer.h> -#include <asm/arch-bcm2835/sdhci.h> +#include <mach/timer.h> +#include <mach/sdhci.h>
/* 400KHz is max freq for card ID etc. Use that as min */ #define MIN_FREQ 400000