Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1370239 > unrolled thread

[RFC PATCH 0/9] ARM: start to move arch/arm/mach-* to arch/arm/platforms/*

Back to article view | Back to linux.kernel

Contents

  [RFC PATCH 0/9] ARM: start to move arch/arm/mach-* to arch/arm/platforms/* Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-04-03 16:50 +0200
    [RFC PATCH 9/9] ARM: bcm: move mach-bcm/ to platforms/bcm/ Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-04-03 16:50 +0200
    [RFC PATCH 2/9] ARM: uniphier: move mach-uniphier/ to platforms/uniphier/ Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-04-03 16:50 +0200
    [RFC PATCH 3/9] ARM: zynq: move mach-zynq/ to platforms/zynq/ Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-04-03 16:50 +0200
    [RFC PATCH 1/9] ARM: prepare arch/arm/platforms for immigration Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-04-03 16:50 +0200
    Re: [RFC PATCH 0/9] ARM: start to move arch/arm/mach-* to  arch/arm/platforms/* Russell King - ARM Linux <linux@arm.linux.org.uk> - 2016-04-03 20:30 +0200
      Re: [RFC PATCH 0/9] ARM: start to move arch/arm/mach-* to arch/arm/platforms/* Florian Fainelli <f.fainelli@gmail.com> - 2016-04-04 04:00 +0200
      Re: [RFC PATCH 0/9] ARM: start to move arch/arm/mach-* to arch/arm/platforms/* Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-04-04 04:00 +0200
      Re: [RFC PATCH 0/9] ARM: start to move arch/arm/mach-* to arch/arm/platforms/* Olof Johansson <olof@lixom.net> - 2016-04-04 21:10 +0200

#1370239 — [RFC PATCH 0/9] ARM: start to move arch/arm/mach-* to arch/arm/platforms/*

We have growing number of mach-* directories in arch/arm, and I guess
it might be a good time to discuss moving them into a sub-directory.

I moved 8 mach directories of modern SoCs (uniphier, zynq, sunxi,
socfpga, rockchip, mediatek, highbank, bcm) as examples.

Of course, I do not mean we can take this series soon (that's why it
is an RFC), but I just want to know experts' insight about the idea
and possible problems (at least a bunch of conflicts if applied).



Masahiro Yamada (9):
  ARM: prepare arch/arm/platforms for immigration
  ARM: uniphier: move mach-uniphier/ to platforms/uniphier/
  ARM: zynq: move mach-zynq/ to platforms/zynq/
  ARM: sunxi: move mach-sunxi/ to platforms/sunxi/
  ARM: socfpga: move mach-socfpga/ to platforms/socfpga/
  ARM: rockchip: move mach-rockchip/ to platforms/rockchip/
  ARM: mediatek: move mach-mediatek/ to platforms/mediatek/
  ARM: highbank: move mach-highbank/ to platforms/highbank/
  ARM: bcm: move mach-bcm/ to platforms/bcm/

 arch/arm/Kconfig                                       | 18 ++----------------
 arch/arm/Makefile                                      |  9 +--------
 arch/arm/platforms/Kconfig                             | 10 ++++++++++
 arch/arm/platforms/Makefile                            | 10 ++++++++++
 arch/arm/{mach-bcm => platforms/bcm}/Kconfig           |  0
 arch/arm/{mach-bcm => platforms/bcm}/Makefile          |  0
 arch/arm/{mach-bcm => platforms/bcm}/bcm63xx.c         |  0
 arch/arm/{mach-bcm => platforms/bcm}/bcm63xx_pmb.c     |  0
 arch/arm/{mach-bcm => platforms/bcm}/bcm63xx_smp.c     |  0
 arch/arm/{mach-bcm => platforms/bcm}/bcm63xx_smp.h     |  0
 arch/arm/{mach-bcm => platforms/bcm}/bcm_5301x.c       |  0
 arch/arm/{mach-bcm => platforms/bcm}/bcm_cygnus.c      |  0
 arch/arm/{mach-bcm => platforms/bcm}/bcm_kona_smc.c    |  0
 arch/arm/{mach-bcm => platforms/bcm}/bcm_kona_smc.h    |  0
 arch/arm/{mach-bcm => platforms/bcm}/bcm_nsp.c         |  0
 arch/arm/{mach-bcm => platforms/bcm}/board_bcm21664.c  |  0
 arch/arm/{mach-bcm => platforms/bcm}/board_bcm281xx.c  |  0
 arch/arm/{mach-bcm => platforms/bcm}/board_bcm2835.c   |  0
 arch/arm/{mach-bcm => platforms/bcm}/brcmstb.c         |  0
 arch/arm/{mach-bcm => platforms/bcm}/kona_l2_cache.c   |  0
 arch/arm/{mach-bcm => platforms/bcm}/kona_l2_cache.h   |  0
 arch/arm/{mach-bcm => platforms/bcm}/platsmp-brcmstb.c |  0
 arch/arm/{mach-bcm => platforms/bcm}/platsmp.c         |  0
 arch/arm/{mach-highbank => platforms/highbank}/Kconfig |  0
 .../arm/{mach-highbank => platforms/highbank}/Makefile |  0
 arch/arm/{mach-highbank => platforms/highbank}/core.h  |  0
 .../{mach-highbank => platforms/highbank}/highbank.c   |  0
 arch/arm/{mach-highbank => platforms/highbank}/pm.c    |  0
 arch/arm/{mach-highbank => platforms/highbank}/smc.S   |  0
 .../{mach-highbank => platforms/highbank}/sysregs.h    |  0
 .../arm/{mach-highbank => platforms/highbank}/system.c |  0
 arch/arm/{mach-mediatek => platforms/mediatek}/Kconfig |  0
 .../arm/{mach-mediatek => platforms/mediatek}/Makefile |  0
 .../{mach-mediatek => platforms/mediatek}/mediatek.c   |  0
 .../{mach-mediatek => platforms/mediatek}/platsmp.c    |  0
 arch/arm/{mach-rockchip => platforms/rockchip}/Kconfig |  0
 .../arm/{mach-rockchip => platforms/rockchip}/Makefile |  0
 arch/arm/{mach-rockchip => platforms/rockchip}/core.h  |  0
 .../{mach-rockchip => platforms/rockchip}/headsmp.S    |  0
 .../{mach-rockchip => platforms/rockchip}/platsmp.c    |  0
 arch/arm/{mach-rockchip => platforms/rockchip}/pm.c    |  0
 arch/arm/{mach-rockchip => platforms/rockchip}/pm.h    |  0
 .../{mach-rockchip => platforms/rockchip}/rockchip.c   |  0
 arch/arm/{mach-rockchip => platforms/rockchip}/sleep.S |  0
 arch/arm/{mach-socfpga => platforms/socfpga}/Kconfig   |  0
 arch/arm/{mach-socfpga => platforms/socfpga}/Makefile  |  0
 arch/arm/{mach-socfpga => platforms/socfpga}/core.h    |  0
 arch/arm/{mach-socfpga => platforms/socfpga}/headsmp.S |  0
 .../arm/{mach-socfpga => platforms/socfpga}/l2_cache.c |  0
 arch/arm/{mach-socfpga => platforms/socfpga}/ocram.c   |  0
 arch/arm/{mach-socfpga => platforms/socfpga}/platsmp.c |  0
 arch/arm/{mach-socfpga => platforms/socfpga}/pm.c      |  0
 .../{mach-socfpga => platforms/socfpga}/self-refresh.S |  0
 arch/arm/{mach-socfpga => platforms/socfpga}/socfpga.c |  0
 arch/arm/{mach-sunxi => platforms/sunxi}/Kconfig       |  0
 arch/arm/{mach-sunxi => platforms/sunxi}/Makefile      |  0
 arch/arm/{mach-sunxi => platforms/sunxi}/platsmp.c     |  0
 arch/arm/{mach-sunxi => platforms/sunxi}/sunxi.c       |  0
 arch/arm/{mach-uniphier => platforms/uniphier}/Kconfig |  0
 .../arm/{mach-uniphier => platforms/uniphier}/Makefile |  0
 .../{mach-uniphier => platforms/uniphier}/headsmp.S    |  0
 .../{mach-uniphier => platforms/uniphier}/platsmp.c    |  0
 .../{mach-uniphier => platforms/uniphier}/uniphier.c   |  0
 arch/arm/{mach-zynq => platforms/zynq}/Kconfig         |  0
 arch/arm/{mach-zynq => platforms/zynq}/Makefile        |  0
 arch/arm/{mach-zynq => platforms/zynq}/common.c        |  0
 arch/arm/{mach-zynq => platforms/zynq}/common.h        |  0
 arch/arm/{mach-zynq => platforms/zynq}/headsmp.S       |  0
 arch/arm/{mach-zynq => platforms/zynq}/platsmp.c       |  0
 arch/arm/{mach-zynq => platforms/zynq}/pm.c            |  0
 arch/arm/{mach-zynq => platforms/zynq}/slcr.c          |  0
 71 files changed, 23 insertions(+), 24 deletions(-)
 create mode 100644 arch/arm/platforms/Kconfig
 create mode 100644 arch/arm/platforms/Makefile
 rename arch/arm/{mach-bcm => platforms/bcm}/Kconfig (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/Makefile (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/bcm63xx.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/bcm63xx_pmb.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/bcm63xx_smp.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/bcm63xx_smp.h (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/bcm_5301x.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/bcm_cygnus.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/bcm_kona_smc.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/bcm_kona_smc.h (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/bcm_nsp.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/board_bcm21664.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/board_bcm281xx.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/board_bcm2835.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/brcmstb.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/kona_l2_cache.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/kona_l2_cache.h (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/platsmp-brcmstb.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/platsmp.c (100%)
 rename arch/arm/{mach-highbank => platforms/highbank}/Kconfig (100%)
 rename arch/arm/{mach-highbank => platforms/highbank}/Makefile (100%)
 rename arch/arm/{mach-highbank => platforms/highbank}/core.h (100%)
 rename arch/arm/{mach-highbank => platforms/highbank}/highbank.c (100%)
 rename arch/arm/{mach-highbank => platforms/highbank}/pm.c (100%)
 rename arch/arm/{mach-highbank => platforms/highbank}/smc.S (100%)
 rename arch/arm/{mach-highbank => platforms/highbank}/sysregs.h (100%)
 rename arch/arm/{mach-highbank => platforms/highbank}/system.c (100%)
 rename arch/arm/{mach-mediatek => platforms/mediatek}/Kconfig (100%)
 rename arch/arm/{mach-mediatek => platforms/mediatek}/Makefile (100%)
 rename arch/arm/{mach-mediatek => platforms/mediatek}/mediatek.c (100%)
 rename arch/arm/{mach-mediatek => platforms/mediatek}/platsmp.c (100%)
 rename arch/arm/{mach-rockchip => platforms/rockchip}/Kconfig (100%)
 rename arch/arm/{mach-rockchip => platforms/rockchip}/Makefile (100%)
 rename arch/arm/{mach-rockchip => platforms/rockchip}/core.h (100%)
 rename arch/arm/{mach-rockchip => platforms/rockchip}/headsmp.S (100%)
 rename arch/arm/{mach-rockchip => platforms/rockchip}/platsmp.c (100%)
 rename arch/arm/{mach-rockchip => platforms/rockchip}/pm.c (100%)
 rename arch/arm/{mach-rockchip => platforms/rockchip}/pm.h (100%)
 rename arch/arm/{mach-rockchip => platforms/rockchip}/rockchip.c (100%)
 rename arch/arm/{mach-rockchip => platforms/rockchip}/sleep.S (100%)
 rename arch/arm/{mach-socfpga => platforms/socfpga}/Kconfig (100%)
 rename arch/arm/{mach-socfpga => platforms/socfpga}/Makefile (100%)
 rename arch/arm/{mach-socfpga => platforms/socfpga}/core.h (100%)
 rename arch/arm/{mach-socfpga => platforms/socfpga}/headsmp.S (100%)
 rename arch/arm/{mach-socfpga => platforms/socfpga}/l2_cache.c (100%)
 rename arch/arm/{mach-socfpga => platforms/socfpga}/ocram.c (100%)
 rename arch/arm/{mach-socfpga => platforms/socfpga}/platsmp.c (100%)
 rename arch/arm/{mach-socfpga => platforms/socfpga}/pm.c (100%)
 rename arch/arm/{mach-socfpga => platforms/socfpga}/self-refresh.S (100%)
 rename arch/arm/{mach-socfpga => platforms/socfpga}/socfpga.c (100%)
 rename arch/arm/{mach-sunxi => platforms/sunxi}/Kconfig (100%)
 rename arch/arm/{mach-sunxi => platforms/sunxi}/Makefile (100%)
 rename arch/arm/{mach-sunxi => platforms/sunxi}/platsmp.c (100%)
 rename arch/arm/{mach-sunxi => platforms/sunxi}/sunxi.c (100%)
 rename arch/arm/{mach-uniphier => platforms/uniphier}/Kconfig (100%)
 rename arch/arm/{mach-uniphier => platforms/uniphier}/Makefile (100%)
 rename arch/arm/{mach-uniphier => platforms/uniphier}/headsmp.S (100%)
 rename arch/arm/{mach-uniphier => platforms/uniphier}/platsmp.c (100%)
 rename arch/arm/{mach-uniphier => platforms/uniphier}/uniphier.c (100%)
 rename arch/arm/{mach-zynq => platforms/zynq}/Kconfig (100%)
 rename arch/arm/{mach-zynq => platforms/zynq}/Makefile (100%)
 rename arch/arm/{mach-zynq => platforms/zynq}/common.c (100%)
 rename arch/arm/{mach-zynq => platforms/zynq}/common.h (100%)
 rename arch/arm/{mach-zynq => platforms/zynq}/headsmp.S (100%)
 rename arch/arm/{mach-zynq => platforms/zynq}/platsmp.c (100%)
 rename arch/arm/{mach-zynq => platforms/zynq}/pm.c (100%)
 rename arch/arm/{mach-zynq => platforms/zynq}/slcr.c (100%)

-- 
1.9.1

[toc] | [next] | [standalone]

#1370240 — [RFC PATCH 9/9] ARM: bcm: move mach-bcm/ to platforms/bcm/

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/arm/Kconfig                                       | 2 --
 arch/arm/Makefile                                      | 1 -
 arch/arm/platforms/Kconfig                             | 1 +
 arch/arm/platforms/Makefile                            | 1 +
 arch/arm/{mach-bcm => platforms/bcm}/Kconfig           | 0
 arch/arm/{mach-bcm => platforms/bcm}/Makefile          | 0
 arch/arm/{mach-bcm => platforms/bcm}/bcm63xx.c         | 0
 arch/arm/{mach-bcm => platforms/bcm}/bcm63xx_pmb.c     | 0
 arch/arm/{mach-bcm => platforms/bcm}/bcm63xx_smp.c     | 0
 arch/arm/{mach-bcm => platforms/bcm}/bcm63xx_smp.h     | 0
 arch/arm/{mach-bcm => platforms/bcm}/bcm_5301x.c       | 0
 arch/arm/{mach-bcm => platforms/bcm}/bcm_cygnus.c      | 0
 arch/arm/{mach-bcm => platforms/bcm}/bcm_kona_smc.c    | 0
 arch/arm/{mach-bcm => platforms/bcm}/bcm_kona_smc.h    | 0
 arch/arm/{mach-bcm => platforms/bcm}/bcm_nsp.c         | 0
 arch/arm/{mach-bcm => platforms/bcm}/board_bcm21664.c  | 0
 arch/arm/{mach-bcm => platforms/bcm}/board_bcm281xx.c  | 0
 arch/arm/{mach-bcm => platforms/bcm}/board_bcm2835.c   | 0
 arch/arm/{mach-bcm => platforms/bcm}/brcmstb.c         | 0
 arch/arm/{mach-bcm => platforms/bcm}/kona_l2_cache.c   | 0
 arch/arm/{mach-bcm => platforms/bcm}/kona_l2_cache.h   | 0
 arch/arm/{mach-bcm => platforms/bcm}/platsmp-brcmstb.c | 0
 arch/arm/{mach-bcm => platforms/bcm}/platsmp.c         | 0
 23 files changed, 2 insertions(+), 3 deletions(-)
 rename arch/arm/{mach-bcm => platforms/bcm}/Kconfig (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/Makefile (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/bcm63xx.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/bcm63xx_pmb.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/bcm63xx_smp.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/bcm63xx_smp.h (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/bcm_5301x.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/bcm_cygnus.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/bcm_kona_smc.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/bcm_kona_smc.h (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/bcm_nsp.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/board_bcm21664.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/board_bcm281xx.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/board_bcm2835.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/brcmstb.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/kona_l2_cache.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/kona_l2_cache.h (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/platsmp-brcmstb.c (100%)
 rename arch/arm/{mach-bcm => platforms/bcm}/platsmp.c (100%)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 443b125..adb0733 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -735,8 +735,6 @@ source "arch/arm/mach-at91/Kconfig"
 
 source "arch/arm/mach-axxia/Kconfig"
 
-source "arch/arm/mach-bcm/Kconfig"
-
 source "arch/arm/mach-berlin/Kconfig"
 
 source "arch/arm/mach-clps711x/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 33d031f..b51aefe 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -157,7 +157,6 @@ machine-$(CONFIG_ARCH_ALPINE)		+= alpine
 machine-$(CONFIG_ARCH_ARTPEC)		+= artpec
 machine-$(CONFIG_ARCH_AT91)		+= at91
 machine-$(CONFIG_ARCH_AXXIA)		+= axxia
-machine-$(CONFIG_ARCH_BCM)		+= bcm
 machine-$(CONFIG_ARCH_BERLIN)		+= berlin
 machine-$(CONFIG_ARCH_CLPS711X)		+= clps711x
 machine-$(CONFIG_ARCH_CNS3XXX)		+= cns3xxx
diff --git a/arch/arm/platforms/Kconfig b/arch/arm/platforms/Kconfig
index 8b3b93a..d2741c0 100644
--- a/arch/arm/platforms/Kconfig
+++ b/arch/arm/platforms/Kconfig
@@ -1,5 +1,6 @@
 # This is sorted alphabetically by directory pathname.
 
+source "arch/arm/platforms/bcm/Kconfig"
 source "arch/arm/platforms/highbank/Kconfig"
 source "arch/arm/platforms/mediatek/Kconfig"
 source "arch/arm/platforms/rockchip/Kconfig"
diff --git a/arch/arm/platforms/Makefile b/arch/arm/platforms/Makefile
index 2bb3622..4fd91e1 100644
--- a/arch/arm/platforms/Makefile
+++ b/arch/arm/platforms/Makefile
@@ -1,5 +1,6 @@
 # This list sorted alphanumerically by CONFIG_* macro name.
 
+obj-$(CONFIG_ARCH_BCM)			+= bcm/
 obj-$(CONFIG_ARCH_HIGHBANK)		+= highbank/
 obj-$(CONFIG_ARCH_MEDIATEK)		+= mediatek/
 obj-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip/
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/platforms/bcm/Kconfig
similarity index 100%
rename from arch/arm/mach-bcm/Kconfig
rename to arch/arm/platforms/bcm/Kconfig
diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/platforms/bcm/Makefile
similarity index 100%
rename from arch/arm/mach-bcm/Makefile
rename to arch/arm/platforms/bcm/Makefile
diff --git a/arch/arm/mach-bcm/bcm63xx.c b/arch/arm/platforms/bcm/bcm63xx.c
similarity index 100%
rename from arch/arm/mach-bcm/bcm63xx.c
rename to arch/arm/platforms/bcm/bcm63xx.c
diff --git a/arch/arm/mach-bcm/bcm63xx_pmb.c b/arch/arm/platforms/bcm/bcm63xx_pmb.c
similarity index 100%
rename from arch/arm/mach-bcm/bcm63xx_pmb.c
rename to arch/arm/platforms/bcm/bcm63xx_pmb.c
diff --git a/arch/arm/mach-bcm/bcm63xx_smp.c b/arch/arm/platforms/bcm/bcm63xx_smp.c
similarity index 100%
rename from arch/arm/mach-bcm/bcm63xx_smp.c
rename to arch/arm/platforms/bcm/bcm63xx_smp.c
diff --git a/arch/arm/mach-bcm/bcm63xx_smp.h b/arch/arm/platforms/bcm/bcm63xx_smp.h
similarity index 100%
rename from arch/arm/mach-bcm/bcm63xx_smp.h
rename to arch/arm/platforms/bcm/bcm63xx_smp.h
diff --git a/arch/arm/mach-bcm/bcm_5301x.c b/arch/arm/platforms/bcm/bcm_5301x.c
similarity index 100%
rename from arch/arm/mach-bcm/bcm_5301x.c
rename to arch/arm/platforms/bcm/bcm_5301x.c
diff --git a/arch/arm/mach-bcm/bcm_cygnus.c b/arch/arm/platforms/bcm/bcm_cygnus.c
similarity index 100%
rename from arch/arm/mach-bcm/bcm_cygnus.c
rename to arch/arm/platforms/bcm/bcm_cygnus.c
diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/platforms/bcm/bcm_kona_smc.c
similarity index 100%
rename from arch/arm/mach-bcm/bcm_kona_smc.c
rename to arch/arm/platforms/bcm/bcm_kona_smc.c
diff --git a/arch/arm/mach-bcm/bcm_kona_smc.h b/arch/arm/platforms/bcm/bcm_kona_smc.h
similarity index 100%
rename from arch/arm/mach-bcm/bcm_kona_smc.h
rename to arch/arm/platforms/bcm/bcm_kona_smc.h
diff --git a/arch/arm/mach-bcm/bcm_nsp.c b/arch/arm/platforms/bcm/bcm_nsp.c
similarity index 100%
rename from arch/arm/mach-bcm/bcm_nsp.c
rename to arch/arm/platforms/bcm/bcm_nsp.c
diff --git a/arch/arm/mach-bcm/board_bcm21664.c b/arch/arm/platforms/bcm/board_bcm21664.c
similarity index 100%
rename from arch/arm/mach-bcm/board_bcm21664.c
rename to arch/arm/platforms/bcm/board_bcm21664.c
diff --git a/arch/arm/mach-bcm/board_bcm281xx.c b/arch/arm/platforms/bcm/board_bcm281xx.c
similarity index 100%
rename from arch/arm/mach-bcm/board_bcm281xx.c
rename to arch/arm/platforms/bcm/board_bcm281xx.c
diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/platforms/bcm/board_bcm2835.c
similarity index 100%
rename from arch/arm/mach-bcm/board_bcm2835.c
rename to arch/arm/platforms/bcm/board_bcm2835.c
diff --git a/arch/arm/mach-bcm/brcmstb.c b/arch/arm/platforms/bcm/brcmstb.c
similarity index 100%
rename from arch/arm/mach-bcm/brcmstb.c
rename to arch/arm/platforms/bcm/brcmstb.c
diff --git a/arch/arm/mach-bcm/kona_l2_cache.c b/arch/arm/platforms/bcm/kona_l2_cache.c
similarity index 100%
rename from arch/arm/mach-bcm/kona_l2_cache.c
rename to arch/arm/platforms/bcm/kona_l2_cache.c
diff --git a/arch/arm/mach-bcm/kona_l2_cache.h b/arch/arm/platforms/bcm/kona_l2_cache.h
similarity index 100%
rename from arch/arm/mach-bcm/kona_l2_cache.h
rename to arch/arm/platforms/bcm/kona_l2_cache.h
diff --git a/arch/arm/mach-bcm/platsmp-brcmstb.c b/arch/arm/platforms/bcm/platsmp-brcmstb.c
similarity index 100%
rename from arch/arm/mach-bcm/platsmp-brcmstb.c
rename to arch/arm/platforms/bcm/platsmp-brcmstb.c
diff --git a/arch/arm/mach-bcm/platsmp.c b/arch/arm/platforms/bcm/platsmp.c
similarity index 100%
rename from arch/arm/mach-bcm/platsmp.c
rename to arch/arm/platforms/bcm/platsmp.c
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1370241 — [RFC PATCH 2/9] ARM: uniphier: move mach-uniphier/ to platforms/uniphier/

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/arm/Kconfig                                          | 2 --
 arch/arm/Makefile                                         | 1 -
 arch/arm/platforms/Kconfig                                | 2 ++
 arch/arm/platforms/Makefile                               | 2 +-
 arch/arm/{mach-uniphier => platforms/uniphier}/Kconfig    | 0
 arch/arm/{mach-uniphier => platforms/uniphier}/Makefile   | 0
 arch/arm/{mach-uniphier => platforms/uniphier}/headsmp.S  | 0
 arch/arm/{mach-uniphier => platforms/uniphier}/platsmp.c  | 0
 arch/arm/{mach-uniphier => platforms/uniphier}/uniphier.c | 0
 9 files changed, 3 insertions(+), 4 deletions(-)
 rename arch/arm/{mach-uniphier => platforms/uniphier}/Kconfig (100%)
 rename arch/arm/{mach-uniphier => platforms/uniphier}/Makefile (100%)
 rename arch/arm/{mach-uniphier => platforms/uniphier}/headsmp.S (100%)
 rename arch/arm/{mach-uniphier => platforms/uniphier}/platsmp.c (100%)
 rename arch/arm/{mach-uniphier => platforms/uniphier}/uniphier.c (100%)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 91e62d4..f1cfb16 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -841,8 +841,6 @@ source "arch/arm/mach-tegra/Kconfig"
 
 source "arch/arm/mach-u300/Kconfig"
 
-source "arch/arm/mach-uniphier/Kconfig"
-
 source "arch/arm/mach-ux500/Kconfig"
 
 source "arch/arm/mach-versatile/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 9052487..16b3eff 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -215,7 +215,6 @@ machine-$(CONFIG_ARCH_TANGO)		+= tango
 machine-$(CONFIG_ARCH_TEGRA)		+= tegra
 machine-$(CONFIG_ARCH_U300)		+= u300
 machine-$(CONFIG_ARCH_U8500)		+= ux500
-machine-$(CONFIG_ARCH_UNIPHIER)		+= uniphier
 machine-$(CONFIG_ARCH_VERSATILE)	+= versatile
 machine-$(CONFIG_ARCH_VEXPRESS)		+= vexpress
 machine-$(CONFIG_ARCH_VT8500)		+= vt8500
diff --git a/arch/arm/platforms/Kconfig b/arch/arm/platforms/Kconfig
index db3d104..5bf796f 100644
--- a/arch/arm/platforms/Kconfig
+++ b/arch/arm/platforms/Kconfig
@@ -1 +1,3 @@
 # This is sorted alphabetically by directory pathname.
+
+source "arch/arm/platforms/uniphier/Kconfig"
diff --git a/arch/arm/platforms/Makefile b/arch/arm/platforms/Makefile
index 5b2bd85..99090e8 100644
--- a/arch/arm/platforms/Makefile
+++ b/arch/arm/platforms/Makefile
@@ -1,3 +1,3 @@
 # This list sorted alphanumerically by CONFIG_* macro name.
 
-obj- += dummy.o
+obj-$(CONFIG_ARCH_UNIPHIER)		+= uniphier/
diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/platforms/uniphier/Kconfig
similarity index 100%
rename from arch/arm/mach-uniphier/Kconfig
rename to arch/arm/platforms/uniphier/Kconfig
diff --git a/arch/arm/mach-uniphier/Makefile b/arch/arm/platforms/uniphier/Makefile
similarity index 100%
rename from arch/arm/mach-uniphier/Makefile
rename to arch/arm/platforms/uniphier/Makefile
diff --git a/arch/arm/mach-uniphier/headsmp.S b/arch/arm/platforms/uniphier/headsmp.S
similarity index 100%
rename from arch/arm/mach-uniphier/headsmp.S
rename to arch/arm/platforms/uniphier/headsmp.S
diff --git a/arch/arm/mach-uniphier/platsmp.c b/arch/arm/platforms/uniphier/platsmp.c
similarity index 100%
rename from arch/arm/mach-uniphier/platsmp.c
rename to arch/arm/platforms/uniphier/platsmp.c
diff --git a/arch/arm/mach-uniphier/uniphier.c b/arch/arm/platforms/uniphier/uniphier.c
similarity index 100%
rename from arch/arm/mach-uniphier/uniphier.c
rename to arch/arm/platforms/uniphier/uniphier.c
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1370242 — [RFC PATCH 3/9] ARM: zynq: move mach-zynq/ to platforms/zynq/

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/arm/Kconfig                                 | 2 --
 arch/arm/Makefile                                | 1 -
 arch/arm/platforms/Kconfig                       | 1 +
 arch/arm/platforms/Makefile                      | 1 +
 arch/arm/{mach-zynq => platforms/zynq}/Kconfig   | 0
 arch/arm/{mach-zynq => platforms/zynq}/Makefile  | 0
 arch/arm/{mach-zynq => platforms/zynq}/common.c  | 0
 arch/arm/{mach-zynq => platforms/zynq}/common.h  | 0
 arch/arm/{mach-zynq => platforms/zynq}/headsmp.S | 0
 arch/arm/{mach-zynq => platforms/zynq}/platsmp.c | 0
 arch/arm/{mach-zynq => platforms/zynq}/pm.c      | 0
 arch/arm/{mach-zynq => platforms/zynq}/slcr.c    | 0
 12 files changed, 2 insertions(+), 3 deletions(-)
 rename arch/arm/{mach-zynq => platforms/zynq}/Kconfig (100%)
 rename arch/arm/{mach-zynq => platforms/zynq}/Makefile (100%)
 rename arch/arm/{mach-zynq => platforms/zynq}/common.c (100%)
 rename arch/arm/{mach-zynq => platforms/zynq}/common.h (100%)
 rename arch/arm/{mach-zynq => platforms/zynq}/headsmp.S (100%)
 rename arch/arm/{mach-zynq => platforms/zynq}/platsmp.c (100%)
 rename arch/arm/{mach-zynq => platforms/zynq}/pm.c (100%)
 rename arch/arm/{mach-zynq => platforms/zynq}/slcr.c (100%)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f1cfb16..394c899 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -854,8 +854,6 @@ source "arch/arm/mach-w90x900/Kconfig"
 
 source "arch/arm/mach-zx/Kconfig"
 
-source "arch/arm/mach-zynq/Kconfig"
-
 # ARMv7-M architecture
 config ARCH_EFM32
 	bool "Energy Micro efm32"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 16b3eff..884114e 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -220,7 +220,6 @@ machine-$(CONFIG_ARCH_VEXPRESS)		+= vexpress
 machine-$(CONFIG_ARCH_VT8500)		+= vt8500
 machine-$(CONFIG_ARCH_W90X900)		+= w90x900
 machine-$(CONFIG_ARCH_ZX)		+= zx
-machine-$(CONFIG_ARCH_ZYNQ)		+= zynq
 machine-$(CONFIG_PLAT_SPEAR)		+= spear
 
 # Platform directory name.  This list is sorted alphanumerically
diff --git a/arch/arm/platforms/Kconfig b/arch/arm/platforms/Kconfig
index 5bf796f..be9e2ee 100644
--- a/arch/arm/platforms/Kconfig
+++ b/arch/arm/platforms/Kconfig
@@ -1,3 +1,4 @@
 # This is sorted alphabetically by directory pathname.
 
 source "arch/arm/platforms/uniphier/Kconfig"
+source "arch/arm/platforms/zynq/Kconfig"
diff --git a/arch/arm/platforms/Makefile b/arch/arm/platforms/Makefile
index 99090e8..68b0127 100644
--- a/arch/arm/platforms/Makefile
+++ b/arch/arm/platforms/Makefile
@@ -1,3 +1,4 @@
 # This list sorted alphanumerically by CONFIG_* macro name.
 
 obj-$(CONFIG_ARCH_UNIPHIER)		+= uniphier/
+obj-$(CONFIG_ARCH_ZYNQ)			+= zynq/
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/platforms/zynq/Kconfig
similarity index 100%
rename from arch/arm/mach-zynq/Kconfig
rename to arch/arm/platforms/zynq/Kconfig
diff --git a/arch/arm/mach-zynq/Makefile b/arch/arm/platforms/zynq/Makefile
similarity index 100%
rename from arch/arm/mach-zynq/Makefile
rename to arch/arm/platforms/zynq/Makefile
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/platforms/zynq/common.c
similarity index 100%
rename from arch/arm/mach-zynq/common.c
rename to arch/arm/platforms/zynq/common.c
diff --git a/arch/arm/mach-zynq/common.h b/arch/arm/platforms/zynq/common.h
similarity index 100%
rename from arch/arm/mach-zynq/common.h
rename to arch/arm/platforms/zynq/common.h
diff --git a/arch/arm/mach-zynq/headsmp.S b/arch/arm/platforms/zynq/headsmp.S
similarity index 100%
rename from arch/arm/mach-zynq/headsmp.S
rename to arch/arm/platforms/zynq/headsmp.S
diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/platforms/zynq/platsmp.c
similarity index 100%
rename from arch/arm/mach-zynq/platsmp.c
rename to arch/arm/platforms/zynq/platsmp.c
diff --git a/arch/arm/mach-zynq/pm.c b/arch/arm/platforms/zynq/pm.c
similarity index 100%
rename from arch/arm/mach-zynq/pm.c
rename to arch/arm/platforms/zynq/pm.c
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/platforms/zynq/slcr.c
similarity index 100%
rename from arch/arm/mach-zynq/slcr.c
rename to arch/arm/platforms/zynq/slcr.c
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1370243 — [RFC PATCH 1/9] ARM: prepare arch/arm/platforms for immigration

At the point of v4.6-rc1, we have 71 mach-* directories in arch/arm/
and 42 of them do not have either Makefile.boot or an SoC header
directory (mach-*/include/mach).  In other words, 60 % of mach-*
directories lost reason to sit there.  We expect more SoCs will do
as the progress of Multi-platform conversion.

This commit creates a new home "arch/arm/platforms/" for such SoCs,
where we can use the standard Makefile notation "obj-y" instead of
the ARM special one "machine-y".

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/arm/Kconfig            | 2 ++
 arch/arm/Makefile           | 1 +
 arch/arm/platforms/Kconfig  | 1 +
 arch/arm/platforms/Makefile | 3 +++
 4 files changed, 7 insertions(+)
 create mode 100644 arch/arm/platforms/Kconfig
 create mode 100644 arch/arm/platforms/Makefile

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index cdfa6c2..91e62d4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -716,6 +716,8 @@ config ARCH_VIRT
 	select ARM_PSCI
 	select HAVE_ARM_ARCH_TIMER
 
+source "arch/arm/platforms/Kconfig"
+
 #
 # This is sorted alphabetically by mach-* pathname.  However, plat-*
 # Kconfigs may be included either alphabetically (according to the
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 8c3ce2a..9052487 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -289,6 +289,7 @@ core-y				+= arch/arm/net/
 core-y				+= arch/arm/crypto/
 core-y				+= arch/arm/firmware/
 core-y				+= $(machdirs) $(platdirs)
+core-y				+= arch/arm/platforms/
 
 drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/
 
diff --git a/arch/arm/platforms/Kconfig b/arch/arm/platforms/Kconfig
new file mode 100644
index 0000000..db3d104
--- /dev/null
+++ b/arch/arm/platforms/Kconfig
@@ -0,0 +1 @@
+# This is sorted alphabetically by directory pathname.
diff --git a/arch/arm/platforms/Makefile b/arch/arm/platforms/Makefile
new file mode 100644
index 0000000..5b2bd85
--- /dev/null
+++ b/arch/arm/platforms/Makefile
@@ -0,0 +1,3 @@
+# This list sorted alphanumerically by CONFIG_* macro name.
+
+obj- += dummy.o
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1370272 — Re: [RFC PATCH 0/9] ARM: start to move arch/arm/mach-* to arch/arm/platforms/*

On Sun, Apr 03, 2016 at 11:39:18PM +0900, Masahiro Yamada wrote:
> We have growing number of mach-* directories in arch/arm, and I guess
> it might be a good time to discuss moving them into a sub-directory.

What does it buy us?  Let me summarise the actual change:

- Move up to 71 arch/arm/mach-* directories to arch/arm/platforms/*,
  which just means another level of directory structure.  We still
  end up with up to 71 directories in arch/arm/platforms/

- The ability to use obj-y rather than machine-y, where both already
  work in the same way.

Is there anything I missed?

If that is all, then I really do not like this change - it's seems
to be churn for no benefit, and that's something we really should be
minimising.  Linus Torvalds has historically moaned at the ARM
architecture for stuff like this.

-- 
RMK's Patch system: http://www.arm.linux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.

[toc] | [prev] | [next] | [standalone]

#1370326

On April 3, 2016 11:25:43 AM PDT, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote:
>On Sun, Apr 03, 2016 at 11:39:18PM +0900, Masahiro Yamada wrote:
>> We have growing number of mach-* directories in arch/arm, and I guess
>> it might be a good time to discuss moving them into a sub-directory.
>
>What does it buy us?  Let me summarise the actual change:
>
>- Move up to 71 arch/arm/mach-* directories to arch/arm/platforms/*,
>  which just means another level of directory structure.  We still
>  end up with up to 71 directories in arch/arm/platforms/
>
>- The ability to use obj-y rather than machine-y, where both already
>  work in the same way.
>
>Is there anything I missed?
>
>If that is all, then I really do not like this change - it's seems
>to be churn for no benefit, and that's something we really should be
>minimising.  Linus Torvalds has historically moaned at the ARM
>architecture for stuff like this.

Agreed, it also makes the life of people back porting, or just  submitting changes harder (even though git does an excellent job at tracking renames). Nack from me.

-- 
Florian

[toc] | [prev] | [next] | [standalone]

#1370327

Hi Russell,

2016-04-04 3:25 GMT+09:00 Russell King - ARM Linux <linux@arm.linux.org.uk>:
> On Sun, Apr 03, 2016 at 11:39:18PM +0900, Masahiro Yamada wrote:
>> We have growing number of mach-* directories in arch/arm, and I guess
>> it might be a good time to discuss moving them into a sub-directory.
>
> What does it buy us?  Let me summarise the actual change:
>
> - Move up to 71 arch/arm/mach-* directories to arch/arm/platforms/*,
>   which just means another level of directory structure.  We still
>   end up with up to 71 directories in arch/arm/platforms/

True, but we can separate non-SoC directories (kernel/, mm/, configs/, etc.)
from mach- directories, at least.


> - The ability to use obj-y rather than machine-y, where both already
>   work in the same way.

Yes, but Kbuild standard Makefiles might provide more flexible
directory structures
to tidy up similar SoC families from the same vendor.

For example,

arch/arm/platforms/samsung/
arch/arm/platforms/samsung/exynos/
arch/arm/platforms/samsung/s3c64xx/

instead of

arch/arm/plat-samsung/
arch/arm/mach-exynos/
arch/arm/mach-s3c64xx/

I am missing something, though.



> Is there anything I missed?
>
> If that is all, then I really do not like this change - it's seems
> to be churn for no benefit, and that's something we really should be
> minimising.  Linus Torvalds has historically moaned at the ARM
> architecture for stuff like this.

OK.


-- 
Best Regards
Masahiro Yamada

[toc] | [prev] | [next] | [standalone]

#1370827

On Sun, Apr 3, 2016 at 11:25 AM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Sun, Apr 03, 2016 at 11:39:18PM +0900, Masahiro Yamada wrote:
>> We have growing number of mach-* directories in arch/arm, and I guess
>> it might be a good time to discuss moving them into a sub-directory.
>
> What does it buy us?  Let me summarise the actual change:
>
> - Move up to 71 arch/arm/mach-* directories to arch/arm/platforms/*,
>   which just means another level of directory structure.  We still
>   end up with up to 71 directories in arch/arm/platforms/
>
> - The ability to use obj-y rather than machine-y, where both already
>   work in the same way.
>
> Is there anything I missed?
>
> If that is all, then I really do not like this change - it's seems
> to be churn for no benefit, and that's something we really should be
> minimising.  Linus Torvalds has historically moaned at the ARM
> architecture for stuff like this.

Been behind on email so chiming in late, but I agree -- this change
isn't bringing enough benefit to justify the churn.

Overall we're looking at adding as little new code into arch/arm/mach*
as possible, so making it easier to structure up and build more
elaborate contents in their corner of it seems a bit like a step
backwards.


-Olof

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web