From: Magnus Damm <magnus.damm@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 03/04] ARM: shmobile: Add EMEV2 and KZM9D to ARCH_SHMOBILE_MULTI
Date: Wed, 17 Jul 2013 20:31:18 +0000 [thread overview]
Message-ID: <20130717203118.27542.37940.sendpatchset@w520> (raw)
In-Reply-To: <20130717203049.27542.78385.sendpatchset@w520>
From: Magnus Damm <damm@opensource.se>
Enable build of EMEV2 and KZM9D DT Reference in
case of ARCH_MULTIPLATFORM and ARCH_SHMOBILE_MULTI.
IS_ENABLED() is leaves the clock-emev2.c file out
in case of COMMON_CLK=y.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
Changes since V1:
- use IS_ENABLED() instead of weak symbol, thanks Arnd!
arch/arm/boot/dts/Makefile | 1 +
arch/arm/mach-shmobile/Kconfig | 15 +++++++++++++++
arch/arm/mach-shmobile/board-kzm9d-reference.c | 3 ++-
arch/arm/mach-shmobile/setup-emev2.c | 3 ++-
4 files changed, 20 insertions(+), 2 deletions(-)
--- 0001/arch/arm/boot/dts/Makefile
+++ work/arch/arm/boot/dts/Makefile 2013-07-18 05:06:46.000000000 +0900
@@ -195,6 +195,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm
r8a73a4-ape6evm.dtb \
r8a73a4-ape6evm-reference.dtb \
sh7372-mackerel.dtb
+dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d-reference.dtb
dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \
socfpga_vt.dtb
dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
--- 0003/arch/arm/mach-shmobile/Kconfig
+++ work/arch/arm/mach-shmobile/Kconfig 2013-07-18 05:06:46.000000000 +0900
@@ -17,6 +17,21 @@ if ARCH_SHMOBILE_MULTI
comment "SH-Mobile System Type"
+config ARCH_EMEV2
+ bool "Emma Mobile EV2"
+
+comment "SH-Mobile Board Type"
+
+config MACH_KZM9D_REFERENCE
+ bool "KZM9D board - Reference Device Tree Implementation"
+ depends on ARCH_EMEV2
+ select REGULATOR_FIXED_VOLTAGE if REGULATOR
+ ---help---
+ Use reference implementation of KZM9D board support
+ which makes a greater use of device tree at the expense
+ of not supporting a number of devices.
+
+ This is intended to aid developers
endif
if ARCH_SHMOBILE
--- 0001/arch/arm/mach-shmobile/board-kzm9d-reference.c
+++ work/arch/arm/mach-shmobile/board-kzm9d-reference.c 2013-07-18 05:12:08.000000000 +0900
@@ -26,7 +26,8 @@
static void __init kzm9d_add_standard_devices(void)
{
- emev2_clock_init();
+ if (!IS_ENABLED(CONFIG_COMMON_CLK))
+ emev2_clock_init();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
--- 0001/arch/arm/mach-shmobile/setup-emev2.c
+++ work/arch/arm/mach-shmobile/setup-emev2.c 2013-07-18 05:12:17.000000000 +0900
@@ -175,7 +175,8 @@ static struct resource pmu_resources[]
void __init emev2_add_standard_devices(void)
{
- emev2_clock_init();
+ if (!IS_ENABLED(CONFIG_COMMON_CLK))
+ emev2_clock_init();
emev2_register_uart(0);
emev2_register_uart(1);
WARNING: multiple messages have this Message-ID (diff)
From: magnus.damm@gmail.com (Magnus Damm)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 03/04] ARM: shmobile: Add EMEV2 and KZM9D to ARCH_SHMOBILE_MULTI
Date: Thu, 18 Jul 2013 05:31:18 +0900 [thread overview]
Message-ID: <20130717203118.27542.37940.sendpatchset@w520> (raw)
In-Reply-To: <20130717203049.27542.78385.sendpatchset@w520>
From: Magnus Damm <damm@opensource.se>
Enable build of EMEV2 and KZM9D DT Reference in
case of ARCH_MULTIPLATFORM and ARCH_SHMOBILE_MULTI.
IS_ENABLED() is leaves the clock-emev2.c file out
in case of COMMON_CLK=y.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
Changes since V1:
- use IS_ENABLED() instead of weak symbol, thanks Arnd!
arch/arm/boot/dts/Makefile | 1 +
arch/arm/mach-shmobile/Kconfig | 15 +++++++++++++++
arch/arm/mach-shmobile/board-kzm9d-reference.c | 3 ++-
arch/arm/mach-shmobile/setup-emev2.c | 3 ++-
4 files changed, 20 insertions(+), 2 deletions(-)
--- 0001/arch/arm/boot/dts/Makefile
+++ work/arch/arm/boot/dts/Makefile 2013-07-18 05:06:46.000000000 +0900
@@ -195,6 +195,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm
r8a73a4-ape6evm.dtb \
r8a73a4-ape6evm-reference.dtb \
sh7372-mackerel.dtb
+dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d-reference.dtb
dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \
socfpga_vt.dtb
dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
--- 0003/arch/arm/mach-shmobile/Kconfig
+++ work/arch/arm/mach-shmobile/Kconfig 2013-07-18 05:06:46.000000000 +0900
@@ -17,6 +17,21 @@ if ARCH_SHMOBILE_MULTI
comment "SH-Mobile System Type"
+config ARCH_EMEV2
+ bool "Emma Mobile EV2"
+
+comment "SH-Mobile Board Type"
+
+config MACH_KZM9D_REFERENCE
+ bool "KZM9D board - Reference Device Tree Implementation"
+ depends on ARCH_EMEV2
+ select REGULATOR_FIXED_VOLTAGE if REGULATOR
+ ---help---
+ Use reference implementation of KZM9D board support
+ which makes a greater use of device tree at the expense
+ of not supporting a number of devices.
+
+ This is intended to aid developers
endif
if ARCH_SHMOBILE
--- 0001/arch/arm/mach-shmobile/board-kzm9d-reference.c
+++ work/arch/arm/mach-shmobile/board-kzm9d-reference.c 2013-07-18 05:12:08.000000000 +0900
@@ -26,7 +26,8 @@
static void __init kzm9d_add_standard_devices(void)
{
- emev2_clock_init();
+ if (!IS_ENABLED(CONFIG_COMMON_CLK))
+ emev2_clock_init();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
--- 0001/arch/arm/mach-shmobile/setup-emev2.c
+++ work/arch/arm/mach-shmobile/setup-emev2.c 2013-07-18 05:12:17.000000000 +0900
@@ -175,7 +175,8 @@ static struct resource pmu_resources[] =
void __init emev2_add_standard_devices(void)
{
- emev2_clock_init();
+ if (!IS_ENABLED(CONFIG_COMMON_CLK))
+ emev2_clock_init();
emev2_register_uart(0);
emev2_register_uart(1);
next prev parent reply other threads:[~2013-07-17 20:31 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-17 20:30 [PATCH v2 00/04] ARM: shmobile: ARCH_MULTIPLATFORM for EMEV2 and KZM9D Magnus Damm
2013-07-17 20:30 ` Magnus Damm
2013-07-17 20:30 ` [PATCH v2 01/04] ARM: shmobile: Only build clocks when COMMON_CLK=n Magnus Damm
2013-07-17 20:30 ` Magnus Damm
2013-07-23 1:24 ` Simon Horman
2013-07-23 1:24 ` Simon Horman
2013-07-17 20:31 ` [PATCH 02/04] ARM: shmobile: Introduce ARCH_SHMOBILE_MULTI Magnus Damm
2013-07-17 20:31 ` Magnus Damm
2013-07-23 1:24 ` Simon Horman
2013-07-23 1:24 ` Simon Horman
2013-07-17 20:31 ` Magnus Damm [this message]
2013-07-17 20:31 ` [PATCH v2 03/04] ARM: shmobile: Add EMEV2 and KZM9D to ARCH_SHMOBILE_MULTI Magnus Damm
2013-07-23 1:24 ` Simon Horman
2013-07-23 1:24 ` Simon Horman
2013-07-17 20:31 ` [PATCH 04/04] ARM: shmobile: Allow ARCH_SHMOBILE_MULTI timer configuration Magnus Damm
2013-07-17 20:31 ` Magnus Damm
2013-07-23 1:24 ` Simon Horman
2013-07-23 1:24 ` Simon Horman
2013-07-19 2:28 ` [PATCH v2 00/04] ARM: shmobile: ARCH_MULTIPLATFORM for EMEV2 and KZM9D Simon Horman
2013-07-19 2:28 ` Simon Horman
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=20130717203118.27542.37940.sendpatchset@w520 \
--to=magnus.damm@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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.