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

Commit 892b19fe authored by Ulrich Hecht's avatar Ulrich Hecht Committed by Simon Horman
Browse files

ARM: shmobile: bockw: remove "reference" board file and config 



Replaced by multi-platform.

Signed-off-by: default avatarUlrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 2c0a8766

arch/arm/mach-shmobile/Kconfig

+0 −13
Original line number Diff line number Diff line
@@ -126,19 +126,6 @@ config MACH_BOCKW 
	select SND_SOC_AK4642 if SND_SIMPLE_CARD && I2C

	select USE_OF



config MACH_BOCKW_REFERENCE

	bool "BOCK-W  - Reference Device Tree Implementation"

	depends on ARCH_R8A7778

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select USE_OF

	---help---

	   Use reference implementation of BockW board support

	   which makes use of device tree at the expense

	   of not supporting a number of devices.



	   This is intended to aid developers



comment "Renesas ARM SoCs System Configuration"



config CPU_HAS_INTEVT

arch/arm/mach-shmobile/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ obj-$(CONFIG_ARCH_RCAR_GEN2) += pm-rcar-gen2.o 
# Board objects

ifndef CONFIG_ARCH_SHMOBILE_MULTI

obj-$(CONFIG_MACH_BOCKW)	+= board-bockw.o

obj-$(CONFIG_MACH_BOCKW_REFERENCE)	+= board-bockw-reference.o

endif



# Framework support

arch/arm/mach-shmobile/Makefile.boot

+0 −1
Original line number Diff line number Diff line 
# per-board load address for uImage

loadaddr-y	:=

loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000

loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000



__ZRELADDR	:= $(sort $(loadaddr-y))

   zreladdr-y   += $(__ZRELADDR)

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

deleted100644 → 0
+0 −86
Original line number Diff line number Diff line 
/*

 * Bock-W board support

 *

 * Copyright (C) 2013  Renesas Solutions Corp.

 * Copyright (C) 2013  Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; version 2 of the License.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/of_platform.h>



#include <asm/mach/arch.h>



#include "common.h"

#include "r8a7778.h"



/*

 *	see board-bock.c for checking detail of dip-switch

 */



#define FPGA	0x18200000

#define IRQ0MR	0x30

#define COMCTLR	0x101c



#define PFC	0xfffc0000

#define PUPR4	0x110

static void __init bockw_init(void)

{

	void __iomem *fpga;

	void __iomem *pfc;



#ifndef CONFIG_COMMON_CLK

	r8a7778_clock_init();

#endif

	r8a7778_init_irq_extpin_dt(1);

	r8a7778_add_dt_devices();



	fpga = ioremap_nocache(FPGA, SZ_1M);

	if (fpga) {

		/*

		 * CAUTION

		 *

		 * IRQ0/1 is cascaded interrupt from FPGA.

		 * it should be cared in the future

		 * Now, it is assuming IRQ0 was used only from SMSC.

		 */

		u16 val = ioread16(fpga + IRQ0MR);

		val &= ~(1 << 4); /* enable SMSC911x */

		iowrite16(val, fpga + IRQ0MR);



		iounmap(fpga);

	}



	pfc = ioremap_nocache(PFC, 0x200);

	if (pfc) {

		/*

		 * FIXME

		 *

		 * SDHI CD/WP pin needs pull-up

		 */

		iowrite32(ioread32(pfc + PUPR4) | (3 << 26), pfc + PUPR4);

		iounmap(pfc);

	}



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



static const char *const bockw_boards_compat_dt[] __initconst = {

	"renesas,bockw-reference",

	NULL,

};



DT_MACHINE_START(BOCKW_DT, "bockw")

	.init_early	= shmobile_init_delay,

	.init_irq	= r8a7778_init_irq_dt,

	.init_machine	= bockw_init,

	.init_late	= shmobile_init_late,

	.dt_compat	= bockw_boards_compat_dt,

MACHINE_END