diff options
Diffstat (limited to 'patches.renesas/0196-ARM-shmobile-marzen-reference-Remove-C-board-code.patch')
| -rw-r--r-- | patches.renesas/0196-ARM-shmobile-marzen-reference-Remove-C-board-code.patch | 119 |
1 files changed, 119 insertions, 0 deletions
diff --git a/patches.renesas/0196-ARM-shmobile-marzen-reference-Remove-C-board-code.patch b/patches.renesas/0196-ARM-shmobile-marzen-reference-Remove-C-board-code.patch new file mode 100644 index 00000000000000..af467b5677990e --- /dev/null +++ b/patches.renesas/0196-ARM-shmobile-marzen-reference-Remove-C-board-code.patch @@ -0,0 +1,119 @@ +From 41a11fa59dfc6dccafcac5788ed0464b36e6cbd2 Mon Sep 17 00:00:00 2001 +From: Magnus Damm <damm+renesas@opensource.se> +Date: Mon, 13 Jul 2015 15:15:12 +0900 +Subject: [PATCH 196/326] ARM: shmobile: marzen-reference: Remove C board code + +The generic r8a7779 machine vector is now feature-wise equivalent +to the Marzen-reference case, so simply remove the Marzen C board +code to fall over on the generic r8a7779 machine vector. + +Signed-off-by: Magnus Damm <damm+renesas@opensource.se> +Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> +Signed-off-by: Simon Horman <horms+renesas@verge.net.au> +(cherry picked from commit 26f9e03fb1c8b8b5dd2f1ad34da775cc129df98a) +Signed-off-by: Simon Horman <horms+renesas@verge.net.au> +--- + arch/arm/mach-shmobile/Kconfig | 7 ---- + arch/arm/mach-shmobile/Makefile | 4 +- + arch/arm/mach-shmobile/board-marzen-reference.c | 56 ------------------------- + 3 files changed, 1 insertion(+), 66 deletions(-) + delete mode 100644 arch/arm/mach-shmobile/board-marzen-reference.c + +diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig +index d57bbf1beb70..6f3713f3cb36 100644 +--- a/arch/arm/mach-shmobile/Kconfig ++++ b/arch/arm/mach-shmobile/Kconfig +@@ -96,13 +96,6 @@ config ARCH_SH73A0 + select ARCH_RMOBILE + select RENESAS_INTC_IRQPIN + +-comment "Renesas ARM SoCs Board Type" +- +-config MACH_MARZEN +- bool "MARZEN board" +- depends on ARCH_R8A7779 +- select REGULATOR_FIXED_VOLTAGE if REGULATOR +- + comment "Renesas ARM SoCs System Configuration" + endif + +diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile +index 6cb095107f90..b180eafb0b87 100644 +--- a/arch/arm/mach-shmobile/Makefile ++++ b/arch/arm/mach-shmobile/Makefile +@@ -51,9 +51,7 @@ obj-$(CONFIG_PM_RMOBILE) += pm-rmobile.o + obj-$(CONFIG_ARCH_RCAR_GEN2) += pm-rcar-gen2.o + + # Board objects +-ifdef CONFIG_ARCH_SHMOBILE_MULTI +-obj-$(CONFIG_MACH_MARZEN) += board-marzen-reference.o +-else ++ifndef CONFIG_ARCH_SHMOBILE_MULTI + obj-$(CONFIG_MACH_BOCKW) += board-bockw.o + obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o + obj-$(CONFIG_MACH_MARZEN) += board-marzen.o +diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c +deleted file mode 100644 +index b15eb923263f..000000000000 +--- a/arch/arm/mach-shmobile/board-marzen-reference.c ++++ /dev/null +@@ -1,56 +0,0 @@ +-/* +- * marzen board support - Reference DT implementation +- * +- * Copyright (C) 2011 Renesas Solutions Corp. +- * Copyright (C) 2011 Magnus Damm +- * Copyright (C) 2013 Simon Horman +- * +- * 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/clk/shmobile.h> +-#include <linux/clocksource.h> +-#include <linux/of_platform.h> +- +-#include <asm/irq.h> +-#include <asm/mach/arch.h> +- +-#include "common.h" +-#include "irqs.h" +-#include "r8a7779.h" +- +-static void __init marzen_init_timer(void) +-{ +- r8a7779_clocks_init(r8a7779_read_mode_pins()); +- clocksource_of_init(); +-} +- +-static void __init marzen_init(void) +-{ +- of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); +- r8a7779_init_irq_extpin_dt(1); /* IRQ1 as individual interrupt */ +-} +- +-static const char *marzen_boards_compat_dt[] __initdata = { +- "renesas,marzen", +- "renesas,marzen-reference", +- NULL, +-}; +- +-DT_MACHINE_START(MARZEN, "marzen") +- .smp = smp_ops(r8a7779_smp_ops), +- .map_io = r8a7779_map_io, +- .init_early = shmobile_init_delay, +- .init_time = marzen_init_timer, +- .init_irq = r8a7779_init_irq_dt, +- .init_machine = marzen_init, +- .init_late = shmobile_init_late, +- .dt_compat = marzen_boards_compat_dt, +-MACHINE_END +-- +2.6.2 + |