Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbc60e7c authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

ARM: shmobile: Add EMEV2 and KZM9D to ARCH_SHMOBILE_MULTI 



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: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent efacfce5

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ 
	sh73a0-kzm9g-reference.dtb \

	r8a73a4-ape6evm.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 \

arch/arm/mach-shmobile/Kconfig

+15 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-shmobile/board-kzm9d-reference.c

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


static void __init kzm9d_add_standard_devices(void)

{

	if (!IS_ENABLED(CONFIG_COMMON_CLK))

		emev2_clock_init();



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

arch/arm/mach-shmobile/setup-emev2.c

+2 −1
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ static struct resource pmu_resources[] = { 


void __init emev2_add_standard_devices(void)

{

	if (!IS_ENABLED(CONFIG_COMMON_CLK))

		emev2_clock_init();



	emev2_register_uart(0);