All of lore.kernel.org
 help / color / mirror / Atom feed
From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 7/7] ARM: bcm283x: move SoC headers to mach-bcm283x/include/mach
Date: Tue, 17 Mar 2015 12:35:13 +0900	[thread overview]
Message-ID: <1426563315-31414-8-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1426563315-31414-1-git-send-email-yamada.masahiro@socionext.com>

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
-- 
1.9.1

  parent reply	other threads:[~2015-03-17  3:35 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-17  3:35 [U-Boot] [PATCH v2 0/7] Some improvements related to build system Masahiro Yamada
2015-03-17  3:35 ` [U-Boot] [PATCH v2 1/7] generic-board: move __HAVE_ARCH_GENERIC_BOARD to Kconfig Masahiro Yamada
2015-03-17  3:35 ` [U-Boot] [PATCH v2 2/7] generic-board: select SYS_GENERIC_BOARD for some architectures Masahiro Yamada
2015-03-17  3:35 ` [U-Boot] [PATCH v2 3/7] m68k: remove arch/m68k/lib/board.c Masahiro Yamada
2015-03-17  6:55   ` Angelo Dureghello
2015-03-25  3:20     ` Masahiro Yamada
2015-03-25 12:12       ` Angelo Dureghello
2015-04-08 19:20       ` Angelo Dureghello
2015-04-09 10:07         ` Masahiro Yamada
2015-03-17  3:35 ` [U-Boot] [PATCH v2 4/7] malloc_f: remove redundant defalut values of CONFIG_SYS_MALLOC_F_LEN Masahiro Yamada
2015-03-17  3:35 ` [U-Boot] [PATCH v2 5/7] malloc_f: enable SYS_MALLOC_F by default if DM is on Masahiro Yamada
2015-03-17  3:35 ` [U-Boot] [PATCH v2 6/7] ARM: bcm283x: merge BCM2835/BCM2836 directories into mach-bcm283x Masahiro Yamada
2015-03-17  3:35 ` Masahiro Yamada [this message]
2015-03-19 10:36   ` [U-Boot] [PATCH v2 7/7] ARM: bcm283x: move SoC headers to mach-bcm283x/include/mach Masahiro Yamada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1426563315-31414-8-git-send-email-yamada.masahiro@socionext.com \
    --to=yamada.masahiro@socionext.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.