* [PATCH 00/03] ARM: shmobile: Clean up the EMEV2 and KZM9D code base
@ 2014-02-13 8:25 Magnus Damm
2014-02-13 8:26 ` [PATCH 01/03] ARM: shmobile: Remove legacy EMEV2 SoC support Magnus Damm
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Magnus Damm @ 2014-02-13 8:25 UTC (permalink / raw)
To: linux-arm-kernel
ARM: shmobile: Clean up the EMEV2 and KZM9D code base
[PATCH 01/03] ARM: shmobile: Remove legacy EMEV2 SoC support
[PATCH 02/03] ARM: shmobile: Remove KZM9D board code
[PATCH 03/03] ARM: shmobile: Get rid of legacy KZM9D defconfig
These patches clean up the EMEV2 SoC and the KZM9D board support code.
With these patches applied:
- EMEV2 is enabled for the MULTIPLATFORM case only, making use of CCF
- KZM9D is implemented as DT code only, no C code exists
- The legacy EMEV2 code is gone, so is the legacy clock framework code
- The legacy defconfig is gone, making way for a shared multiplatform defconfig
This means that KZM9D support comes without a Kconfig entry. Also,
the load address for u-boot needs to be supplied by hand (0x40008000).
Signed-off-by: Magnus Damm <damm@opensource.se>
---
Written against renesas.git tag renesas-devel-v3.14-rc1-20140207
arch/arm/boot/dts/Makefile | 3
arch/arm/configs/kzm9d_defconfig | 91 ---------
arch/arm/mach-shmobile/Kconfig | 15 -
arch/arm/mach-shmobile/Makefile | 2
arch/arm/mach-shmobile/board-kzm9d-reference.c | 47 ----
arch/arm/mach-shmobile/clock-emev2.c | 231 ------------------------
arch/arm/mach-shmobile/include/mach/emev2.h | 9
arch/arm/mach-shmobile/setup-emev2.c | 7
arch/arm/mach-shmobile/smp-emev2.c | 1
9 files changed, 3 insertions(+), 403 deletions(-)
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 01/03] ARM: shmobile: Remove legacy EMEV2 SoC support 2014-02-13 8:25 [PATCH 00/03] ARM: shmobile: Clean up the EMEV2 and KZM9D code base Magnus Damm @ 2014-02-13 8:26 ` Magnus Damm 2014-02-17 3:23 ` Simon Horman 2014-02-13 8:26 ` [PATCH 02/03] ARM: shmobile: Remove KZM9D board code Magnus Damm 2014-02-13 8:26 ` [PATCH 03/03] ARM: shmobile: Get rid of legacy KZM9D defconfig Magnus Damm 2 siblings, 1 reply; 12+ messages in thread From: Magnus Damm @ 2014-02-13 8:26 UTC (permalink / raw) To: linux-arm-kernel From: Magnus Damm <damm@opensource.se> Get rid of legacy EMEV2 SoC code including the legacy clock framework implementation. The multiplatform implementation together with DT board support shall be used instead. Signed-off-by: Magnus Damm <damm@opensource.se> --- arch/arm/boot/dts/Makefile | 3 arch/arm/mach-shmobile/Kconfig | 9 - arch/arm/mach-shmobile/Makefile | 1 arch/arm/mach-shmobile/clock-emev2.c | 231 --------------------------- arch/arm/mach-shmobile/include/mach/emev2.h | 1 arch/arm/mach-shmobile/setup-emev2.c | 4 6 files changed, 1 insertion(+), 248 deletions(-) --- 0001/arch/arm/boot/dts/Makefile +++ work/arch/arm/boot/dts/Makefile 2014-02-05 18:26:25.000000000 +0900 @@ -242,8 +242,7 @@ dtb-$(CONFIG_ARCH_U8500) += ste-snowball dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \ s3c6410-smdk6410.dtb -dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \ - r7s72100-genmai.dtb \ +dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \ r7s72100-genmai-reference.dtb \ r8a7740-armadillo800eva.dtb \ r8a7778-bockw.dtb \ --- 0009/arch/arm/mach-shmobile/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2014-02-05 18:21:28.000000000 +0900 @@ -139,15 +139,6 @@ config ARCH_R8A7791 select RENESAS_IRQC select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE -config ARCH_EMEV2 - bool "Emma Mobile EV2" - select ARCH_WANT_OPTIONAL_GPIOLIB - select ARM_GIC - select CPU_V7 - select MIGHT_HAVE_PCI - select USE_OF - select AUTO_ZRELADDR - config ARCH_R7S72100 bool "RZ/A1H (R7S72100)" select ARCH_WANT_OPTIONAL_GPIOLIB --- 0001/arch/arm/mach-shmobile/Makefile +++ work/arch/arm/mach-shmobile/Makefile 2014-02-05 18:21:28.000000000 +0900 @@ -31,7 +31,6 @@ obj-$(CONFIG_ARCH_R8A7778) += clock-r8a7 obj-$(CONFIG_ARCH_R8A7779) += clock-r8a7779.o obj-$(CONFIG_ARCH_R8A7790) += clock-r8a7790.o obj-$(CONFIG_ARCH_R8A7791) += clock-r8a7791.o -obj-$(CONFIG_ARCH_EMEV2) += clock-emev2.o obj-$(CONFIG_ARCH_R7S72100) += clock-r7s72100.o endif --- 0001/arch/arm/mach-shmobile/clock-emev2.c +++ /dev/null 2013-06-03 21:41:10.638032047 +0900 @@ -1,231 +0,0 @@ -/* - * Emma Mobile EV2 clock framework support - * - * Copyright (C) 2012 Magnus Damm - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ -#include <linux/init.h> -#include <linux/kernel.h> -#include <linux/io.h> -#include <linux/sh_clk.h> -#include <linux/clkdev.h> -#include <mach/common.h> - -#define EMEV2_SMU_BASE 0xe0110000 - -/* EMEV2 SMU registers */ -#define USIAU0_RSTCTRL 0x094 -#define USIBU1_RSTCTRL 0x0ac -#define USIBU2_RSTCTRL 0x0b0 -#define USIBU3_RSTCTRL 0x0b4 -#define STI_RSTCTRL 0x124 -#define USIAU0GCLKCTRL 0x4a0 -#define USIBU1GCLKCTRL 0x4b8 -#define USIBU2GCLKCTRL 0x4bc -#define USIBU3GCLKCTRL 0x04c0 -#define STIGCLKCTRL 0x528 -#define USIAU0SCLKDIV 0x61c -#define USIB2SCLKDIV 0x65c -#define USIB3SCLKDIV 0x660 -#define STI_CLKSEL 0x688 - -/* not pretty, but hey */ -static void __iomem *smu_base; - -static void emev2_smu_write(unsigned long value, int offs) -{ - BUG_ON(!smu_base || (offs >= PAGE_SIZE)); - iowrite32(value, smu_base + offs); -} - -static struct clk_mapping smu_mapping = { - .phys = EMEV2_SMU_BASE, - .len = PAGE_SIZE, -}; - -/* Fixed 32 KHz root clock from C32K pin */ -static struct clk c32k_clk = { - .rate = 32768, - .mapping = &smu_mapping, -}; - -/* PLL3 multiplies C32K with 7000 */ -static unsigned long pll3_recalc(struct clk *clk) -{ - return clk->parent->rate * 7000; -} - -static struct sh_clk_ops pll3_clk_ops = { - .recalc = pll3_recalc, -}; - -static struct clk pll3_clk = { - .ops = &pll3_clk_ops, - .parent = &c32k_clk, -}; - -static struct clk *main_clks[] = { - &c32k_clk, - &pll3_clk, -}; - -enum { SCLKDIV_USIAU0, SCLKDIV_USIBU2, SCLKDIV_USIBU1, SCLKDIV_USIBU3, - SCLKDIV_NR }; - -#define SCLKDIV(_reg, _shift) \ -{ \ - .parent = &pll3_clk, \ - .enable_reg = IOMEM(EMEV2_SMU_BASE + (_reg)), \ - .enable_bit = _shift, \ -} - -static struct clk sclkdiv_clks[SCLKDIV_NR] = { - [SCLKDIV_USIAU0] = SCLKDIV(USIAU0SCLKDIV, 0), - [SCLKDIV_USIBU2] = SCLKDIV(USIB2SCLKDIV, 16), - [SCLKDIV_USIBU1] = SCLKDIV(USIB2SCLKDIV, 0), - [SCLKDIV_USIBU3] = SCLKDIV(USIB3SCLKDIV, 0), -}; - -enum { GCLK_USIAU0_SCLK, GCLK_USIBU1_SCLK, GCLK_USIBU2_SCLK, GCLK_USIBU3_SCLK, - GCLK_STI_SCLK, - GCLK_NR }; - -#define GCLK_SCLK(_parent, _reg) \ -{ \ - .parent = _parent, \ - .enable_reg = IOMEM(EMEV2_SMU_BASE + (_reg)), \ - .enable_bit = 1, /* SCLK_GCC */ \ -} - -static struct clk gclk_clks[GCLK_NR] = { - [GCLK_USIAU0_SCLK] = GCLK_SCLK(&sclkdiv_clks[SCLKDIV_USIAU0], - USIAU0GCLKCTRL), - [GCLK_USIBU1_SCLK] = GCLK_SCLK(&sclkdiv_clks[SCLKDIV_USIBU1], - USIBU1GCLKCTRL), - [GCLK_USIBU2_SCLK] = GCLK_SCLK(&sclkdiv_clks[SCLKDIV_USIBU2], - USIBU2GCLKCTRL), - [GCLK_USIBU3_SCLK] = GCLK_SCLK(&sclkdiv_clks[SCLKDIV_USIBU3], - USIBU3GCLKCTRL), - [GCLK_STI_SCLK] = GCLK_SCLK(&c32k_clk, STIGCLKCTRL), -}; - -static int emev2_gclk_enable(struct clk *clk) -{ - iowrite32(ioread32(clk->mapped_reg) | (1 << clk->enable_bit), - clk->mapped_reg); - return 0; -} - -static void emev2_gclk_disable(struct clk *clk) -{ - iowrite32(ioread32(clk->mapped_reg) & ~(1 << clk->enable_bit), - clk->mapped_reg); -} - -static struct sh_clk_ops emev2_gclk_clk_ops = { - .enable = emev2_gclk_enable, - .disable = emev2_gclk_disable, - .recalc = followparent_recalc, -}; - -static int __init emev2_gclk_register(struct clk *clks, int nr) -{ - struct clk *clkp; - int ret = 0; - int k; - - for (k = 0; !ret && (k < nr); k++) { - clkp = clks + k; - clkp->ops = &emev2_gclk_clk_ops; - ret |= clk_register(clkp); - } - - return ret; -} - -static unsigned long emev2_sclkdiv_recalc(struct clk *clk) -{ - unsigned int sclk_div; - - sclk_div = (ioread32(clk->mapped_reg) >> clk->enable_bit) & 0xff; - - return clk->parent->rate / (sclk_div + 1); -} - -static struct sh_clk_ops emev2_sclkdiv_clk_ops = { - .recalc = emev2_sclkdiv_recalc, -}; - -static int __init emev2_sclkdiv_register(struct clk *clks, int nr) -{ - struct clk *clkp; - int ret = 0; - int k; - - for (k = 0; !ret && (k < nr); k++) { - clkp = clks + k; - clkp->ops = &emev2_sclkdiv_clk_ops; - ret |= clk_register(clkp); - } - - return ret; -} - -static struct clk_lookup lookups[] = { - CLKDEV_DEV_ID("serial8250-em.0", &gclk_clks[GCLK_USIAU0_SCLK]), - CLKDEV_DEV_ID("e1020000.uart", &gclk_clks[GCLK_USIAU0_SCLK]), - CLKDEV_DEV_ID("serial8250-em.1", &gclk_clks[GCLK_USIBU1_SCLK]), - CLKDEV_DEV_ID("e1030000.uart", &gclk_clks[GCLK_USIBU1_SCLK]), - CLKDEV_DEV_ID("serial8250-em.2", &gclk_clks[GCLK_USIBU2_SCLK]), - CLKDEV_DEV_ID("e1040000.uart", &gclk_clks[GCLK_USIBU2_SCLK]), - CLKDEV_DEV_ID("serial8250-em.3", &gclk_clks[GCLK_USIBU3_SCLK]), - CLKDEV_DEV_ID("e1050000.uart", &gclk_clks[GCLK_USIBU3_SCLK]), - CLKDEV_DEV_ID("em_sti.0", &gclk_clks[GCLK_STI_SCLK]), - CLKDEV_DEV_ID("e0180000.sti", &gclk_clks[GCLK_STI_SCLK]), -}; - -void __init emev2_clock_init(void) -{ - int k, ret = 0; - - smu_base = ioremap(EMEV2_SMU_BASE, PAGE_SIZE); - BUG_ON(!smu_base); - - /* setup STI timer to run on 32.768 kHz and deassert reset */ - emev2_smu_write(0, STI_CLKSEL); - emev2_smu_write(1, STI_RSTCTRL); - - /* deassert reset for UART0->UART3 */ - emev2_smu_write(2, USIAU0_RSTCTRL); - emev2_smu_write(2, USIBU1_RSTCTRL); - emev2_smu_write(2, USIBU2_RSTCTRL); - emev2_smu_write(2, USIBU3_RSTCTRL); - - for (k = 0; !ret && (k < ARRAY_SIZE(main_clks)); k++) - ret = clk_register(main_clks[k]); - - if (!ret) - ret = emev2_sclkdiv_register(sclkdiv_clks, SCLKDIV_NR); - - if (!ret) - ret = emev2_gclk_register(gclk_clks, GCLK_NR); - - clkdev_add_table(lookups, ARRAY_SIZE(lookups)); - - if (!ret) - shmobile_clk_init(); - else - panic("failed to setup emev2 clocks\n"); -} --- 0001/arch/arm/mach-shmobile/include/mach/emev2.h +++ work/arch/arm/mach-shmobile/include/mach/emev2.h 2014-02-05 18:21:28.000000000 +0900 @@ -3,7 +3,6 @@ extern void emev2_map_io(void); extern void emev2_init_delay(void); -extern void emev2_clock_init(void); extern struct smp_operations emev2_smp_ops; #endif /* __ASM_EMEV2_H__ */ --- 0001/arch/arm/mach-shmobile/setup-emev2.c +++ work/arch/arm/mach-shmobile/setup-emev2.c 2014-02-05 18:21:28.000000000 +0900 @@ -50,11 +50,7 @@ void __init emev2_init_delay(void) static void __init emev2_add_standard_devices_dt(void) { -#ifdef CONFIG_COMMON_CLK of_clk_init(NULL); -#else - emev2_clock_init(); -#endif of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 01/03] ARM: shmobile: Remove legacy EMEV2 SoC support 2014-02-13 8:26 ` [PATCH 01/03] ARM: shmobile: Remove legacy EMEV2 SoC support Magnus Damm @ 2014-02-17 3:23 ` Simon Horman 2014-02-18 4:16 ` Simon Horman 0 siblings, 1 reply; 12+ messages in thread From: Simon Horman @ 2014-02-17 3:23 UTC (permalink / raw) To: linux-arm-kernel On Thu, Feb 13, 2014 at 05:26:08PM +0900, Magnus Damm wrote: > From: Magnus Damm <damm@opensource.se> > > Get rid of legacy EMEV2 SoC code including the legacy clock > framework implementation. The multiplatform implementation > together with DT board support shall be used instead. > > Signed-off-by: Magnus Damm <damm@opensource.se> Thanks, I have queued this up. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 01/03] ARM: shmobile: Remove legacy EMEV2 SoC support 2014-02-17 3:23 ` Simon Horman @ 2014-02-18 4:16 ` Simon Horman 2014-02-18 4:25 ` Magnus Damm 0 siblings, 1 reply; 12+ messages in thread From: Simon Horman @ 2014-02-18 4:16 UTC (permalink / raw) To: linux-arm-kernel On Mon, Feb 17, 2014 at 12:23:09PM +0900, Simon Horman wrote: > On Thu, Feb 13, 2014 at 05:26:08PM +0900, Magnus Damm wrote: > > From: Magnus Damm <damm@opensource.se> > > > > Get rid of legacy EMEV2 SoC code including the legacy clock > > framework implementation. The multiplatform implementation > > together with DT board support shall be used instead. > > > > Signed-off-by: Magnus Damm <damm@opensource.se> > > Thanks, I have queued this up. I have dropped this patch for now and plan to deffer it. This is because although this is patch 1 of the series it removes emev2_clock_init() which causes the build of board-kzm9d-reference.c to fail without "ARM: shmobile: Remove Lager DT reference legacy clock bits". My current thinking is that the best way to sequence this is to queue up the board and defconfig changes for v3.15 but wait for v3.16 to queue up the SoC changes. This avoids tedious dependencies of SoC patches on board patches in the same release cycle. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 01/03] ARM: shmobile: Remove legacy EMEV2 SoC support 2014-02-18 4:16 ` Simon Horman @ 2014-02-18 4:25 ` Magnus Damm 2014-03-07 2:38 ` Simon Horman 0 siblings, 1 reply; 12+ messages in thread From: Magnus Damm @ 2014-02-18 4:25 UTC (permalink / raw) To: linux-arm-kernel Hi Simon, On Tue, Feb 18, 2014 at 1:16 PM, Simon Horman <horms@verge.net.au> wrote: > On Mon, Feb 17, 2014 at 12:23:09PM +0900, Simon Horman wrote: >> On Thu, Feb 13, 2014 at 05:26:08PM +0900, Magnus Damm wrote: >> > From: Magnus Damm <damm@opensource.se> >> > >> > Get rid of legacy EMEV2 SoC code including the legacy clock >> > framework implementation. The multiplatform implementation >> > together with DT board support shall be used instead. >> > >> > Signed-off-by: Magnus Damm <damm@opensource.se> >> >> Thanks, I have queued this up. > > I have dropped this patch for now and plan to deffer it. > This is because although this is patch 1 of the series > it removes emev2_clock_init() which causes the build > of board-kzm9d-reference.c to fail without > "ARM: shmobile: Remove Lager DT reference legacy clock bits". > > My current thinking is that the best way to sequence this is to > queue up the board and defconfig changes for v3.15 but wait > for v3.16 to queue up the SoC changes. This avoids tedious > dependencies of SoC patches on board patches in the same release cycle. Thanks, that's of course fine with me! / magnus ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 01/03] ARM: shmobile: Remove legacy EMEV2 SoC support 2014-02-18 4:25 ` Magnus Damm @ 2014-03-07 2:38 ` Simon Horman 0 siblings, 0 replies; 12+ messages in thread From: Simon Horman @ 2014-03-07 2:38 UTC (permalink / raw) To: linux-arm-kernel On Tue, Feb 18, 2014 at 01:25:49PM +0900, Magnus Damm wrote: > Hi Simon, > > On Tue, Feb 18, 2014 at 1:16 PM, Simon Horman <horms@verge.net.au> wrote: > > On Mon, Feb 17, 2014 at 12:23:09PM +0900, Simon Horman wrote: > >> On Thu, Feb 13, 2014 at 05:26:08PM +0900, Magnus Damm wrote: > >> > From: Magnus Damm <damm@opensource.se> > >> > > >> > Get rid of legacy EMEV2 SoC code including the legacy clock > >> > framework implementation. The multiplatform implementation > >> > together with DT board support shall be used instead. > >> > > >> > Signed-off-by: Magnus Damm <damm@opensource.se> > >> > >> Thanks, I have queued this up. > > > > I have dropped this patch for now and plan to deffer it. > > This is because although this is patch 1 of the series > > it removes emev2_clock_init() which causes the build > > of board-kzm9d-reference.c to fail without > > "ARM: shmobile: Remove Lager DT reference legacy clock bits". > > > > My current thinking is that the best way to sequence this is to > > queue up the board and defconfig changes for v3.15 but wait > > for v3.16 to queue up the SoC changes. This avoids tedious > > dependencies of SoC patches on board patches in the same release cycle. > > Thanks, that's of course fine with me! I have now queued this up for v3.16. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 02/03] ARM: shmobile: Remove KZM9D board code 2014-02-13 8:25 [PATCH 00/03] ARM: shmobile: Clean up the EMEV2 and KZM9D code base Magnus Damm 2014-02-13 8:26 ` [PATCH 01/03] ARM: shmobile: Remove legacy EMEV2 SoC support Magnus Damm @ 2014-02-13 8:26 ` Magnus Damm 2014-02-17 0:02 ` Simon Horman 2014-02-13 8:26 ` [PATCH 03/03] ARM: shmobile: Get rid of legacy KZM9D defconfig Magnus Damm 2 siblings, 1 reply; 12+ messages in thread From: Magnus Damm @ 2014-02-13 8:26 UTC (permalink / raw) To: linux-arm-kernel From: Magnus Damm <damm@opensource.se> Get rid of KZM9D board code written in C. This version of the C board code was used in the case of multiplatform, but these days DT can be used instead, so because of that simply get rid of the C code to simplify and save space. Signed-off-by: Magnus Damm <damm@opensource.se> --- arch/arm/mach-shmobile/Kconfig | 6 --- arch/arm/mach-shmobile/Makefile | 1 arch/arm/mach-shmobile/board-kzm9d-reference.c | 47 ------------------------ arch/arm/mach-shmobile/include/mach/emev2.h | 8 ---- arch/arm/mach-shmobile/setup-emev2.c | 3 + arch/arm/mach-shmobile/smp-emev2.c | 1 6 files changed, 2 insertions(+), 64 deletions(-) --- 0010/arch/arm/mach-shmobile/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2014-02-05 18:27:53.000000000 +0900 @@ -48,12 +48,6 @@ config MACH_KOELSCH depends on ARCH_R8A7791 select MICREL_PHY if SH_ETH -config MACH_KZM9D - bool "KZM9D board" - depends on ARCH_EMEV2 - select REGULATOR_FIXED_VOLTAGE if REGULATOR - select SMSC_PHY if SMSC911X - config MACH_LAGER bool "Lager board" depends on ARCH_R8A7790 --- 0010/arch/arm/mach-shmobile/Makefile +++ work/arch/arm/mach-shmobile/Makefile 2014-02-05 18:27:53.000000000 +0900 @@ -57,7 +57,6 @@ obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779 ifdef CONFIG_ARCH_SHMOBILE_MULTI obj-$(CONFIG_MACH_GENMAI) += board-genmai-reference.o obj-$(CONFIG_MACH_KOELSCH) += board-koelsch-reference.o -obj-$(CONFIG_MACH_KZM9D) += board-kzm9d-reference.o obj-$(CONFIG_MACH_LAGER) += board-lager-reference.o else obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o --- 0001/arch/arm/mach-shmobile/board-kzm9d-reference.c +++ /dev/null 2013-06-03 21:41:10.638032047 +0900 @@ -1,47 +0,0 @@ -/* - * kzm9d board support - Reference DT implementation - * - * Copyright (C) 2013 Renesas Solutions Corp. - * Copyright (C) 2013 Magnus Damm - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <linux/init.h> -#include <linux/of_platform.h> -#include <linux/clk-provider.h> -#include <mach/emev2.h> -#include <mach/common.h> -#include <asm/mach/arch.h> - -static void __init kzm9d_add_standard_devices(void) -{ - of_clk_init(NULL); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); -} - -static const char *kzm9d_boards_compat_dt[] __initdata = { - "renesas,kzm9d", - "renesas,kzm9d-reference", - NULL, -}; - -DT_MACHINE_START(KZM9D_DT, "kzm9d") - .smp = smp_ops(emev2_smp_ops), - .map_io = emev2_map_io, - .init_early = emev2_init_delay, - .init_machine = kzm9d_add_standard_devices, - .init_late = shmobile_init_late, - .dt_compat = kzm9d_boards_compat_dt, -MACHINE_END --- 0010/arch/arm/mach-shmobile/include/mach/emev2.h +++ /dev/null 2013-06-03 21:41:10.638032047 +0900 @@ -1,8 +0,0 @@ -#ifndef __ASM_EMEV2_H__ -#define __ASM_EMEV2_H__ - -extern void emev2_map_io(void); -extern void emev2_init_delay(void); -extern struct smp_operations emev2_smp_ops; - -#endif /* __ASM_EMEV2_H__ */ --- 0010/arch/arm/mach-shmobile/setup-emev2.c +++ work/arch/arm/mach-shmobile/setup-emev2.c 2014-02-05 18:27:53.000000000 +0900 @@ -21,7 +21,6 @@ #include <linux/init.h> #include <linux/of_platform.h> #include <mach/common.h> -#include <mach/emev2.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -59,6 +58,8 @@ static const char *emev2_boards_compat_d NULL, }; +extern struct smp_operations emev2_smp_ops; + DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)") .smp = smp_ops(emev2_smp_ops), .map_io = emev2_map_io, --- 0001/arch/arm/mach-shmobile/smp-emev2.c +++ work/arch/arm/mach-shmobile/smp-emev2.c 2014-02-05 18:27:53.000000000 +0900 @@ -24,7 +24,6 @@ #include <linux/io.h> #include <linux/delay.h> #include <mach/common.h> -#include <mach/emev2.h> #include <asm/smp_plat.h> #include <asm/smp_scu.h> ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 02/03] ARM: shmobile: Remove KZM9D board code 2014-02-13 8:26 ` [PATCH 02/03] ARM: shmobile: Remove KZM9D board code Magnus Damm @ 2014-02-17 0:02 ` Simon Horman 2014-02-17 1:36 ` Magnus Damm 0 siblings, 1 reply; 12+ messages in thread From: Simon Horman @ 2014-02-17 0:02 UTC (permalink / raw) To: linux-arm-kernel Hi Magnus, I'm not clear on the motivation for removing emev2_smp_ops from emev2.h only to have to add it as an extern to setup-emev2.c. But if thats how you like to roll then I have no objections. However, what I would like to ask is that the emev2.h shuffling, that is the changes to emev2.h, setup-emev2.c and smp-emev2.c could be moved into a follow-up patch that I will queue up at a later date. The reason is that these really seem to be SoC changes but the main portion of this patch is a board change. And as you know the arm-soc people like soc and board changes split into different branches. > DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)") On Thu, Feb 13, 2014 at 05:26:18PM +0900, Magnus Damm wrote: > From: Magnus Damm <damm@opensource.se> > > Get rid of KZM9D board code written in C. This version of the > C board code was used in the case of multiplatform, but these > days DT can be used instead, so because of that simply get rid > of the C code to simplify and save space. > > Signed-off-by: Magnus Damm <damm@opensource.se> > --- > > arch/arm/mach-shmobile/Kconfig | 6 --- > arch/arm/mach-shmobile/Makefile | 1 > arch/arm/mach-shmobile/board-kzm9d-reference.c | 47 ------------------------ > arch/arm/mach-shmobile/include/mach/emev2.h | 8 ---- > arch/arm/mach-shmobile/setup-emev2.c | 3 + > arch/arm/mach-shmobile/smp-emev2.c | 1 > 6 files changed, 2 insertions(+), 64 deletions(-) > > --- 0010/arch/arm/mach-shmobile/Kconfig > +++ work/arch/arm/mach-shmobile/Kconfig 2014-02-05 18:27:53.000000000 +0900 > @@ -48,12 +48,6 @@ config MACH_KOELSCH > depends on ARCH_R8A7791 > select MICREL_PHY if SH_ETH > > -config MACH_KZM9D > - bool "KZM9D board" > - depends on ARCH_EMEV2 > - select REGULATOR_FIXED_VOLTAGE if REGULATOR > - select SMSC_PHY if SMSC911X > - > config MACH_LAGER > bool "Lager board" > depends on ARCH_R8A7790 > --- 0010/arch/arm/mach-shmobile/Makefile > +++ work/arch/arm/mach-shmobile/Makefile 2014-02-05 18:27:53.000000000 +0900 > @@ -57,7 +57,6 @@ obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779 > ifdef CONFIG_ARCH_SHMOBILE_MULTI > obj-$(CONFIG_MACH_GENMAI) += board-genmai-reference.o > obj-$(CONFIG_MACH_KOELSCH) += board-koelsch-reference.o > -obj-$(CONFIG_MACH_KZM9D) += board-kzm9d-reference.o > obj-$(CONFIG_MACH_LAGER) += board-lager-reference.o > else > obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o > --- 0001/arch/arm/mach-shmobile/board-kzm9d-reference.c > +++ /dev/null 2013-06-03 21:41:10.638032047 +0900 > @@ -1,47 +0,0 @@ > -/* > - * kzm9d board support - Reference DT implementation > - * > - * Copyright (C) 2013 Renesas Solutions Corp. > - * Copyright (C) 2013 Magnus Damm > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * along with this program; if not, write to the Free Software > - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > - */ > - > -#include <linux/init.h> > -#include <linux/of_platform.h> > -#include <linux/clk-provider.h> > -#include <mach/emev2.h> > -#include <mach/common.h> > -#include <asm/mach/arch.h> > - > -static void __init kzm9d_add_standard_devices(void) > -{ > - of_clk_init(NULL); > - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); > -} > - > -static const char *kzm9d_boards_compat_dt[] __initdata = { > - "renesas,kzm9d", > - "renesas,kzm9d-reference", > - NULL, > -}; > - > -DT_MACHINE_START(KZM9D_DT, "kzm9d") > - .smp = smp_ops(emev2_smp_ops), > - .map_io = emev2_map_io, > - .init_early = emev2_init_delay, > - .init_machine = kzm9d_add_standard_devices, > - .init_late = shmobile_init_late, > - .dt_compat = kzm9d_boards_compat_dt, > -MACHINE_END > --- 0010/arch/arm/mach-shmobile/include/mach/emev2.h > +++ /dev/null 2013-06-03 21:41:10.638032047 +0900 > @@ -1,8 +0,0 @@ > -#ifndef __ASM_EMEV2_H__ > -#define __ASM_EMEV2_H__ > - > -extern void emev2_map_io(void); > -extern void emev2_init_delay(void); > -extern struct smp_operations emev2_smp_ops; > - > -#endif /* __ASM_EMEV2_H__ */ > --- 0010/arch/arm/mach-shmobile/setup-emev2.c > +++ work/arch/arm/mach-shmobile/setup-emev2.c 2014-02-05 18:27:53.000000000 +0900 > @@ -21,7 +21,6 @@ > #include <linux/init.h> > #include <linux/of_platform.h> > #include <mach/common.h> > -#include <mach/emev2.h> > #include <asm/mach-types.h> > #include <asm/mach/arch.h> > #include <asm/mach/map.h> > @@ -59,6 +58,8 @@ static const char *emev2_boards_compat_d > NULL, > }; > > +extern struct smp_operations emev2_smp_ops; > + > .smp = smp_ops(emev2_smp_ops), > .map_io = emev2_map_io, > --- 0001/arch/arm/mach-shmobile/smp-emev2.c > +++ work/arch/arm/mach-shmobile/smp-emev2.c 2014-02-05 18:27:53.000000000 +0900 > @@ -24,7 +24,6 @@ > #include <linux/io.h> > #include <linux/delay.h> > #include <mach/common.h> > -#include <mach/emev2.h> > #include <asm/smp_plat.h> > #include <asm/smp_scu.h> > > ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 02/03] ARM: shmobile: Remove KZM9D board code 2014-02-17 0:02 ` Simon Horman @ 2014-02-17 1:36 ` Magnus Damm 2014-02-17 1:44 ` Simon Horman 0 siblings, 1 reply; 12+ messages in thread From: Magnus Damm @ 2014-02-17 1:36 UTC (permalink / raw) To: linux-arm-kernel Hi Simon, On Mon, Feb 17, 2014 at 9:02 AM, Simon Horman <horms@verge.net.au> wrote: > Hi Magnus, > > I'm not clear on the motivation for removing emev2_smp_ops from > emev2.h only to have to add it as an extern to setup-emev2.c. > But if thats how you like to roll then I have no objections. Hehe, I suppose I felt a sudden urge to remove that particular header file. > However, what I would like to ask is that the emev2.h shuffling, > that is the changes to emev2.h, setup-emev2.c and smp-emev2.c > could be moved into a follow-up patch that I will queue up at a later date. That's fine. > The reason is that these really seem to be SoC changes but > the main portion of this patch is a board change. And as you > know the arm-soc people like soc and board changes split into > different branches. Sure. Would you like me to redo 2/3 to break out the header file bits? Thanks, / magnus ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 02/03] ARM: shmobile: Remove KZM9D board code 2014-02-17 1:36 ` Magnus Damm @ 2014-02-17 1:44 ` Simon Horman 0 siblings, 0 replies; 12+ messages in thread From: Simon Horman @ 2014-02-17 1:44 UTC (permalink / raw) To: linux-arm-kernel On Mon, Feb 17, 2014 at 10:36:25AM +0900, Magnus Damm wrote: > Hi Simon, > > On Mon, Feb 17, 2014 at 9:02 AM, Simon Horman <horms@verge.net.au> wrote: > > Hi Magnus, > > > > I'm not clear on the motivation for removing emev2_smp_ops from > > emev2.h only to have to add it as an extern to setup-emev2.c. > > But if thats how you like to roll then I have no objections. > > Hehe, I suppose I felt a sudden urge to remove that particular header file. > > > However, what I would like to ask is that the emev2.h shuffling, > > that is the changes to emev2.h, setup-emev2.c and smp-emev2.c > > could be moved into a follow-up patch that I will queue up at a later date. > > That's fine. > > > The reason is that these really seem to be SoC changes but > > the main portion of this patch is a board change. And as you > > know the arm-soc people like soc and board changes split into > > different branches. > > Sure. Would you like me to redo 2/3 to break out the header file bits? Ideally, yes. Alternatively, I can just drop them from 2/3 and you can send a follow-up patch at a later date. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 03/03] ARM: shmobile: Get rid of legacy KZM9D defconfig 2014-02-13 8:25 [PATCH 00/03] ARM: shmobile: Clean up the EMEV2 and KZM9D code base Magnus Damm 2014-02-13 8:26 ` [PATCH 01/03] ARM: shmobile: Remove legacy EMEV2 SoC support Magnus Damm 2014-02-13 8:26 ` [PATCH 02/03] ARM: shmobile: Remove KZM9D board code Magnus Damm @ 2014-02-13 8:26 ` Magnus Damm 2014-02-17 3:23 ` Simon Horman 2 siblings, 1 reply; 12+ messages in thread From: Magnus Damm @ 2014-02-13 8:26 UTC (permalink / raw) To: linux-arm-kernel From: Magnus Damm <damm@opensource.se> Get rid of the kzm9d_defconfig. The KZM9D is now supported as DT only in case of EMEV2 is selected in the kernel configuration. Signed-off-by: Magnus Damm <damm@opensource.se> --- arch/arm/configs/kzm9d_defconfig | 91 -------------------------------------- 1 file changed, 91 deletions(-) --- 0001/arch/arm/configs/kzm9d_defconfig +++ /dev/null 2013-06-03 21:41:10.638032047 +0900 @@ -1,91 +0,0 @@ -# CONFIG_ARM_PATCH_PHYS_VIRT is not set -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_NO_HZ=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_SYSCTL_SYSCALL=y -CONFIG_EMBEDDED=y -CONFIG_PERF_EVENTS=y -CONFIG_SLAB=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SHMOBILE_LEGACY=y -CONFIG_ARCH_EMEV2=y -CONFIG_MACH_KZM9D=y -CONFIG_MEMORY_START=0x40000000 -CONFIG_MEMORY_SIZE=0x10000000 -# CONFIG_SH_TIMER_TMU is not set -# CONFIG_SWP_EMULATE is not set -# CONFIG_CACHE_L2X0 is not set -CONFIG_SMP=y -CONFIG_NR_CPUS=2 -CONFIG_HOTPLUG_CPU=y -# CONFIG_LOCAL_TIMERS is not set -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -# CONFIG_CROSS_MEMORY_ATTACH is not set -CONFIG_FORCE_MAX_ZONEORDER=13 -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_ARM_APPENDED_DTB=y -CONFIG_AUTO_ZRELADDR=y -CONFIG_VFP=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_PM_RUNTIME=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -# CONFIG_WIRELESS is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_BLK_DEV is not set -CONFIG_NETDEVICES=y -# CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_NET_VENDOR_CHELSIO is not set -# CONFIG_NET_VENDOR_CIRRUS is not set -# CONFIG_NET_VENDOR_FARADAY is not set -# CONFIG_NET_VENDOR_INTEL is not set -# CONFIG_NET_VENDOR_MARVELL is not set -# CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_NATSEMI is not set -# CONFIG_NET_VENDOR_SEEQ is not set -CONFIG_SMSC911X=y -# CONFIG_NET_VENDOR_STMICRO is not set -# CONFIG_NET_VENDOR_WIZNET is not set -# CONFIG_WLAN is not set -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -# CONFIG_LEGACY_PTYS is not set -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_EM=y -# CONFIG_HW_RANDOM is not set -CONFIG_GPIOLIB=y -CONFIG_GPIO_EM=y -# CONFIG_HWMON is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -# CONFIG_IOMMU_SUPPORT is not set -# CONFIG_DNOTIFY is not set -CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set -CONFIG_NFS_FS=y -CONFIG_ROOT_NFS=y -# CONFIG_FTRACE is not set ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 03/03] ARM: shmobile: Get rid of legacy KZM9D defconfig 2014-02-13 8:26 ` [PATCH 03/03] ARM: shmobile: Get rid of legacy KZM9D defconfig Magnus Damm @ 2014-02-17 3:23 ` Simon Horman 0 siblings, 0 replies; 12+ messages in thread From: Simon Horman @ 2014-02-17 3:23 UTC (permalink / raw) To: linux-arm-kernel On Thu, Feb 13, 2014 at 05:26:28PM +0900, Magnus Damm wrote: > From: Magnus Damm <damm@opensource.se> > > Get rid of the kzm9d_defconfig. The KZM9D is now supported > as DT only in case of EMEV2 is selected in the kernel > configuration. > > Signed-off-by: Magnus Damm <damm@opensource.se> Thanks, I have queued this up. ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2014-03-07 2:38 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-02-13 8:25 [PATCH 00/03] ARM: shmobile: Clean up the EMEV2 and KZM9D code base Magnus Damm 2014-02-13 8:26 ` [PATCH 01/03] ARM: shmobile: Remove legacy EMEV2 SoC support Magnus Damm 2014-02-17 3:23 ` Simon Horman 2014-02-18 4:16 ` Simon Horman 2014-02-18 4:25 ` Magnus Damm 2014-03-07 2:38 ` Simon Horman 2014-02-13 8:26 ` [PATCH 02/03] ARM: shmobile: Remove KZM9D board code Magnus Damm 2014-02-17 0:02 ` Simon Horman 2014-02-17 1:36 ` Magnus Damm 2014-02-17 1:44 ` Simon Horman 2014-02-13 8:26 ` [PATCH 03/03] ARM: shmobile: Get rid of legacy KZM9D defconfig Magnus Damm 2014-02-17 3:23 ` Simon Horman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).