[PATCH 0/7] ARM: ux500: More DT only clean-ups for the platform

[PATCH 0/7] ARM: ux500: More DT only clean-ups for the platform

[Lee Jones]

Hi Linus,

I was bored on the plane home, so knocked this together. This is
probably the penultimate set of clean-ups. The final one will be
the removal of MSP devices once my Audio patch-set lands.

 arch/arm/mach-ux500/Makefile             |   7 +++---
 arch/arm/mach-ux500/board-mop500-audio.c |   2 --
 arch/arm/mach-ux500/board-mop500-sdi.c   | 168 ----------------------------------------------------------------------------------------------------------------------------------
 arch/arm/mach-ux500/board-mop500.c       |  78 ------------------------------------------------------------
 arch/arm/mach-ux500/board-mop500.h       |   5 ----
 arch/arm/mach-ux500/cpu-db8500.c         |  18 +++++++++++---
 arch/arm/mach-ux500/cpu.c                |  23 +++++-------------
 arch/arm/mach-ux500/devices-db8500.c     |  28 ----------------------
 arch/arm/mach-ux500/devices-db8500.h     |  19 ---------------
 arch/arm/mach-ux500/devices.c            |  26 --------------------
 arch/arm/mach-ux500/devices.h            |  15 ------------
 arch/arm/mach-ux500/setup.h              |   6 -----
 arch/arm/mach-ux500/timer.c              |  28 +++++++---------------
 13 files changed, 32 insertions(+), 391 deletions(-)

[PATCH 1/7] ARM: ux500: Remove legacy ATAG SSP support

[Lee Jones]

This hasn't been used since we converted the platform to DT only.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/board-mop500.c | 30 ------------------------------
 arch/arm/mach-ux500/board-mop500.h |  1 -
 2 files changed, 31 deletions(-)

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 514d40b..d552163 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -46,33 +46,3 @@ struct ab8500_platform_data ab8500_platdata = {
 	.irq_base	= MOP500_AB8500_IRQ_BASE,
 	.regulator	= &ab8500_regulator_plat_data,
 };
-
-#ifdef CONFIG_STE_DMA40
-static struct stedma40_chan_cfg ssp0_dma_cfg_rx = {
-	.mode = STEDMA40_MODE_LOGICAL,
-	.dir = DMA_DEV_TO_MEM,
-	.dev_type = DB8500_DMA_DEV8_SSP0,
-};
-
-static struct stedma40_chan_cfg ssp0_dma_cfg_tx = {
-	.mode = STEDMA40_MODE_LOGICAL,
-	.dir = DMA_MEM_TO_DEV,
-	.dev_type = DB8500_DMA_DEV8_SSP0,
-};
-#endif
-
-struct pl022_ssp_controller ssp0_plat = {
-	.bus_id = 0,
-#ifdef CONFIG_STE_DMA40
-	.enable_dma = 1,
-	.dma_filter = stedma40_filter,
-	.dma_rx_param = &ssp0_dma_cfg_rx,
-	.dma_tx_param = &ssp0_dma_cfg_tx,
-#else
-	.enable_dma = 0,
-#endif
-	/* on this platform, gpio 31,142,144,214 &
-	 * 224 are connected as chip selects
-	 */
-	.num_chipselect = 5,
-};
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index 511d6fe..d48e866 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -87,7 +87,6 @@ extern struct msp_i2s_platform_data msp0_platform_data;
 extern struct msp_i2s_platform_data msp1_platform_data;
 extern struct msp_i2s_platform_data msp2_platform_data;
 extern struct msp_i2s_platform_data msp3_platform_data;
-extern struct pl022_ssp_controller ssp0_plat;
 
 void __init mop500_pinmaps_init(void);
 void __init snowball_pinmaps_init(void);
-- 
1.8.1.2

Re: [PATCH 1/7] ARM: ux500: Remove legacy ATAG SSP support

[Linus Walleij]

On Wed, Nov 6, 2013 at 11:05 AM, Lee Jones <lee.jones@linaro.org> wrote:

> This hasn't been used since we converted the platform to DT only.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Patch applied to my ux500-devicetree branch (for v3.14...)

Yours,
Linus Walleij

Re: [PATCH 1/7] ARM: ux500: Remove legacy ATAG SSP support

[Russell King - ARM Linux]

On Wed, Nov 06, 2013 at 10:05:42AM +0000, Lee Jones wrote:
> This hasn't been used since we converted the platform to DT only.

Ditto.

Re: [PATCH 1/7] ARM: ux500: Remove legacy ATAG SSP support

[Lee Jones]

On Thu, 07 Nov 2013, Russell King - ARM Linux wrote:

> On Wed, Nov 06, 2013 at 10:05:42AM +0000, Lee Jones wrote:
> > This hasn't been used since we converted the platform to DT only.
> 
> Ditto.

I'm confused.

Is this an Acked-by? Or do you want me to do something different? 

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[PATCH 2/7] ARM: ux500: Consolidate [A|D]8500 platform data

[Lee Jones]

Move the platform data from all these files into one, delete empty
files and remove all references to them.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/Makefile             |  4 +--
 arch/arm/mach-ux500/board-mop500-audio.c |  2 --
 arch/arm/mach-ux500/board-mop500-sdi.c   |  2 --
 arch/arm/mach-ux500/board-mop500.c       | 48 --------------------------------
 arch/arm/mach-ux500/cpu-db8500.c         | 18 ++++++++++--
 arch/arm/mach-ux500/cpu.c                |  1 -
 arch/arm/mach-ux500/devices-db8500.c     | 28 -------------------
 arch/arm/mach-ux500/devices-db8500.h     | 19 -------------
 arch/arm/mach-ux500/devices.h            | 15 ----------
 9 files changed, 17 insertions(+), 120 deletions(-)
 delete mode 100644 arch/arm/mach-ux500/board-mop500.c
 delete mode 100644 arch/arm/mach-ux500/devices-db8500.c
 delete mode 100644 arch/arm/mach-ux500/devices-db8500.h
 delete mode 100644 arch/arm/mach-ux500/devices.h

diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index 616b96e..66f351f 100644
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -4,8 +4,8 @@
 
 obj-y				:= cpu.o devices.o id.o timer.o pm.o
 obj-$(CONFIG_CACHE_L2X0)	+= cache-l2x0.o
-obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o devices-db8500.o
-obj-$(CONFIG_MACH_MOP500)	+= board-mop500.o board-mop500-sdi.o \
+obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o
+obj-$(CONFIG_MACH_MOP500)	+= board-mop500-sdi.o \
 				board-mop500-regulators.o \
 				board-mop500-pins.o \
 				board-mop500-audio.o
diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c
index 154e15f..d528059 100644
--- a/arch/arm/mach-ux500/board-mop500-audio.c
+++ b/arch/arm/mach-ux500/board-mop500-audio.c
@@ -10,13 +10,11 @@
 #include <linux/platform_data/pinctrl-nomadik.h>
 #include <linux/platform_data/dma-ste-dma40.h>
 
-#include "devices.h"
 #include "irqs.h"
 #include <linux/platform_data/asoc-ux500-msp.h>
 
 #include "ste-dma40-db8500.h"
 #include "board-mop500.h"
-#include "devices-db8500.h"
 
 static struct stedma40_chan_cfg msp0_dma_rx = {
 	.high_priority = true,
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index 26600a1..fcbf3a1 100644
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/arch/arm/mach-ux500/board-mop500-sdi.c
@@ -14,10 +14,8 @@
 #include <linux/platform_data/dma-ste-dma40.h>
 
 #include <asm/mach-types.h>
-#include "devices.h"
 
 #include "db8500-regs.h"
-#include "devices-db8500.h"
 #include "board-mop500.h"
 #include "ste-dma40-db8500.h"
 
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
deleted file mode 100644
index d552163..0000000
--- a/arch/arm/mach-ux500/board-mop500.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2008-2012 ST-Ericsson
- *
- * Author: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
- *
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-#include <linux/platform_data/db8500_thermal.h>
-#include <linux/amba/bus.h>
-#include <linux/amba/pl022.h>
-#include <linux/mfd/abx500/ab8500.h>
-#include <linux/regulator/ab8500.h>
-#include <linux/regulator/fixed.h>
-#include <linux/regulator/driver.h>
-#include <linux/mfd/tps6105x.h>
-#include <linux/platform_data/leds-lp55xx.h>
-#include <linux/input.h>
-#include <linux/delay.h>
-#include <linux/leds.h>
-#include <linux/pinctrl/consumer.h>
-#include <linux/platform_data/pinctrl-nomadik.h>
-#include <linux/platform_data/dma-ste-dma40.h>
-
-#include <asm/mach-types.h>
-
-#include "setup.h"
-#include "devices.h"
-#include "irqs.h"
-
-#include "ste-dma40-db8500.h"
-#include "db8500-regs.h"
-#include "devices-db8500.h"
-#include "board-mop500.h"
-#include "board-mop500-regulators.h"
-
-struct ab8500_platform_data ab8500_platdata = {
-	.irq_base	= MOP500_AB8500_IRQ_BASE,
-	.regulator	= &ab8500_regulator_plat_data,
-};
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 2e85c1e..0b5b27b 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -28,14 +28,26 @@
 #include <asm/mach/map.h>
 
 #include "setup.h"
-#include "devices.h"
 #include "irqs.h"
 
-#include "devices-db8500.h"
-#include "db8500-regs.h"
+#include "board-mop500-regulators.h"
 #include "board-mop500.h"
+#include "db8500-regs.h"
 #include "id.h"
 
+struct ab8500_platform_data ab8500_platdata = {
+	.irq_base	= MOP500_AB8500_IRQ_BASE,
+	.regulator	= &ab8500_regulator_plat_data,
+};
+
+struct prcmu_pdata db8500_prcmu_pdata = {
+	.ab_platdata	= &ab8500_platdata,
+	.ab_irq		= IRQ_DB8500_AB8500,
+	.irq_base	= IRQ_PRCMU_BASE,
+	.version_offset	= DB8500_PRCMU_FW_VERSION_OFFSET,
+	.legacy_offset	= DB8500_PRCMU_LEGACY_OFFSET,
+};
+
 /* minimum static i/o mapping required to boot U8500 platforms */
 static struct map_desc u8500_uart_io_desc[] __initdata = {
 	__IO_DEV_DESC(U8500_UART0_BASE, SZ_4K),
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c
index f84d439..8f8004f 100644
--- a/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@ -25,7 +25,6 @@
 #include <asm/mach/map.h>
 
 #include "setup.h"
-#include "devices.h"
 
 #include "board-mop500.h"
 #include "db8500-regs.h"
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
deleted file mode 100644
index c59f89d..0000000
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
- * License terms: GNU General Public License (GPL) version 2
- */
-
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
-#include <linux/io.h>
-#include <linux/amba/bus.h>
-#include <linux/amba/pl022.h>
-#include <linux/mfd/dbx500-prcmu.h>
-
-#include "setup.h"
-#include "irqs.h"
-
-#include "db8500-regs.h"
-#include "devices-db8500.h"
-
-struct prcmu_pdata db8500_prcmu_pdata = {
-	.ab_platdata	= &ab8500_platdata,
-	.ab_irq		= IRQ_DB8500_AB8500,
-	.irq_base	= IRQ_PRCMU_BASE,
-	.version_offset	= DB8500_PRCMU_FW_VERSION_OFFSET,
-	.legacy_offset	= DB8500_PRCMU_LEGACY_OFFSET,
-};
diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h
deleted file mode 100644
index b8ffc99..0000000
--- a/arch/arm/mach-ux500/devices-db8500.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
- * License terms: GNU General Public License (GPL), version 2.
- */
-
-#ifndef __DEVICES_DB8500_H
-#define __DEVICES_DB8500_H
-
-#include "irqs.h"
-#include "db8500-regs.h"
-
-struct platform_device;
-
-extern struct ab8500_platform_data ab8500_platdata;
-extern struct prcmu_pdata db8500_prcmu_pdata;
-
-#endif
diff --git a/arch/arm/mach-ux500/devices.h b/arch/arm/mach-ux500/devices.h
deleted file mode 100644
index 5bca7c6..0000000
--- a/arch/arm/mach-ux500/devices.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * License terms: GNU General Public License (GPL) version 2
- */
-
-#ifndef __ASM_ARCH_DEVICES_H__
-#define __ASM_ARCH_DEVICES_H__
-
-struct platform_device;
-struct amba_device;
-
-extern struct amba_device ux500_pl031_device;
-
-#endif
-- 
1.8.1.2

Re: [PATCH 2/7] ARM: ux500: Consolidate [A|D]8500 platform data

[Linus Walleij]

On Wed, Nov 6, 2013 at 11:05 AM, Lee Jones <lee.jones@linaro.org> wrote:

> Move the platform data from all these files into one, delete empty
> files and remove all references to them.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Not that I fully understand $subject, but whatever, good
riddance, patch applied.

Yours,
Linus Walleij

Re: [PATCH 2/7] ARM: ux500: Consolidate [A|D]8500 platform data

[Lee Jones]

On Wed, 06 Nov 2013, Linus Walleij wrote:

> On Wed, Nov 6, 2013 at 11:05 AM, Lee Jones <lee.jones@linaro.org> wrote:
> 
> > Move the platform data from all these files into one, delete empty
> > files and remove all references to them.
> >
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> 
> Not that I fully understand $subject, but whatever, good
> riddance, patch applied.

Sorry, it's midding a 'B' - [A|D]B8500

Some people prefer something like {A,D}B500

Take your pick and fixup as you see fit.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: PINCTRL:We May need mutex protect in pinctrl API

[Linus Walleij]

On Thu, Nov 7, 2013 at 5:53 AM, xulinuxkernel@gmail.com
<xulinuxkernel@gmail.com> wrote:

> Recently, our company use kernel 3.10 instead of 3.8.When we test the kernel
> we found there would be hang up in pinctrl subsystem,the reason may be as
> following,
> In out system,nand and spi pins are some of the same,so we need frequently
> get pinctrl and put pinctrl. and sd card also frequently get and put
> pinctrl.
> when the nand and sd card both come in
> pinctrl_lookup_state

If you're repeatedly doing pinctrl_lookup_state() in your driver,
then *this* is the problem, not that the pinctrl_lookup_state()
is not mutexed.

You should lookup your states at probe() and at runtime
only use pinctrl_select_state() to move between different
states.

Can you please refer me to the code in the upstream kernel
that is causing this.

If your code is not upstream and you're abusing the interface
as described above, the actual problem you have is that
you need to get your code upstream and properly reviewed
by the community.

Yours,
Linus Walleij

Re: Re: PINCTRL:We May need mutex protect in pinctrl API

[Linus Walleij]

On Thu, Nov 7, 2013 at 10:48 AM, xulinuxkernel@gmail.com
<xulinuxkernel@gmail.com> wrote:

> sorry,our code is not upstream.
> But if two threads come in pinctrl_select_state()  at the same time,
> Is that okay?

Why would two threads come in there at the same time?

We have exactly one pinctrl* handle per device, and we
select the state on it. This is like for example the device
driver would have one thread telling it to go to "default"
state and another thread telling it to go to "idle" or "sleep"
state for example.

If we really have a device driver doing such things
for a good reason, then we need to protect it, but I
want to see that device driver first.

I am quite sure that it's safe to say that the upstream
kernel does not contain a device that will ask the hardware
to move around between different states like this from
different threads, such calls will be serialized by the
nature of sequencing in e.g. runtime PM.

I need to see the device driver and the use case so I
can understand why this would be needed.

I think the need from this arise from an abuse of the
pin controller states.

Yours,
Linus Walleij

[PATCH 3/7] ARM: ux500: Remove ATAG support for SDI (MMC)

[Lee Jones]

This hasn't been used since we moved over to a Device Tree only platform.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/Makefile           |   3 +-
 arch/arm/mach-ux500/board-mop500-sdi.c | 166 ---------------------------------
 arch/arm/mach-ux500/board-mop500.h     |   4 -
 3 files changed, 1 insertion(+), 172 deletions(-)
 delete mode 100644 arch/arm/mach-ux500/board-mop500-sdi.c

diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index 66f351f..e34c010 100644
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -5,8 +5,7 @@
 obj-y				:= cpu.o devices.o id.o timer.o pm.o
 obj-$(CONFIG_CACHE_L2X0)	+= cache-l2x0.o
 obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o
-obj-$(CONFIG_MACH_MOP500)	+= board-mop500-sdi.o \
-				board-mop500-regulators.o \
+obj-$(CONFIG_MACH_MOP500)	+= board-mop500-regulators.o \
 				board-mop500-pins.o \
 				board-mop500-audio.o
 obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
deleted file mode 100644
index fcbf3a1..0000000
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * Author: Hanumath Prasad <hanumath.prasad@stericsson.com>
- * License terms: GNU General Public License (GPL) version 2
- */
-
-#include <linux/kernel.h>
-#include <linux/gpio.h>
-#include <linux/amba/bus.h>
-#include <linux/amba/mmci.h>
-#include <linux/mmc/host.h>
-#include <linux/platform_device.h>
-#include <linux/platform_data/dma-ste-dma40.h>
-
-#include <asm/mach-types.h>
-
-#include "db8500-regs.h"
-#include "board-mop500.h"
-#include "ste-dma40-db8500.h"
-
-/*
- * v2 has a new version of this block that need to be forced, the number found
- * in hardware is incorrect
- */
-#define U8500_SDI_V2_PERIPHID 0x10480180
-
-/*
- * SDI 0 (MicroSD slot)
- */
-
-#ifdef CONFIG_STE_DMA40
-struct stedma40_chan_cfg mop500_sdi0_dma_cfg_rx = {
-	.mode = STEDMA40_MODE_LOGICAL,
-	.dir = DMA_DEV_TO_MEM,
-	.dev_type = DB8500_DMA_DEV29_SD_MM0,
-};
-
-static struct stedma40_chan_cfg mop500_sdi0_dma_cfg_tx = {
-	.mode = STEDMA40_MODE_LOGICAL,
-	.dir = DMA_MEM_TO_DEV,
-	.dev_type = DB8500_DMA_DEV29_SD_MM0,
-};
-#endif
-
-struct mmci_platform_data mop500_sdi0_data = {
-	.f_max		= 100000000,
-	.capabilities	= MMC_CAP_4_BIT_DATA |
-				MMC_CAP_SD_HIGHSPEED |
-				MMC_CAP_MMC_HIGHSPEED |
-				MMC_CAP_ERASE |
-				MMC_CAP_UHS_SDR12 |
-				MMC_CAP_UHS_SDR25,
-	.gpio_wp	= -1,
-	.sigdir		= MCI_ST_FBCLKEN |
-				MCI_ST_CMDDIREN |
-				MCI_ST_DATA0DIREN |
-				MCI_ST_DATA2DIREN,
-#ifdef CONFIG_STE_DMA40
-	.dma_filter	= stedma40_filter,
-	.dma_rx_param	= &mop500_sdi0_dma_cfg_rx,
-	.dma_tx_param	= &mop500_sdi0_dma_cfg_tx,
-#endif
-};
-
-/*
- * SDI1 (SDIO WLAN)
- */
-#ifdef CONFIG_STE_DMA40
-static struct stedma40_chan_cfg sdi1_dma_cfg_rx = {
-	.mode = STEDMA40_MODE_LOGICAL,
-	.dir = DMA_DEV_TO_MEM,
-	.dev_type = DB8500_DMA_DEV32_SD_MM1,
-};
-
-static struct stedma40_chan_cfg sdi1_dma_cfg_tx = {
-	.mode = STEDMA40_MODE_LOGICAL,
-	.dir = DMA_MEM_TO_DEV,
-	.dev_type = DB8500_DMA_DEV32_SD_MM1,
-};
-#endif
-
-struct mmci_platform_data mop500_sdi1_data = {
-	.ocr_mask	= MMC_VDD_29_30,
-	.f_max		= 100000000,
-	.capabilities	= MMC_CAP_4_BIT_DATA |
-				MMC_CAP_NONREMOVABLE,
-	.gpio_cd	= -1,
-	.gpio_wp	= -1,
-#ifdef CONFIG_STE_DMA40
-	.dma_filter	= stedma40_filter,
-	.dma_rx_param	= &sdi1_dma_cfg_rx,
-	.dma_tx_param	= &sdi1_dma_cfg_tx,
-#endif
-};
-
-/*
- * SDI 2 (POP eMMC, not on DB8500ed)
- */
-
-#ifdef CONFIG_STE_DMA40
-struct stedma40_chan_cfg mop500_sdi2_dma_cfg_rx = {
-	.mode = STEDMA40_MODE_LOGICAL,
-	.dir = DMA_DEV_TO_MEM,
-	.dev_type =  DB8500_DMA_DEV28_SD_MM2,
-};
-
-static struct stedma40_chan_cfg mop500_sdi2_dma_cfg_tx = {
-	.mode = STEDMA40_MODE_LOGICAL,
-	.dir = DMA_MEM_TO_DEV,
-	.dev_type = DB8500_DMA_DEV28_SD_MM2,
-};
-#endif
-
-struct mmci_platform_data mop500_sdi2_data = {
-	.ocr_mask	= MMC_VDD_165_195,
-	.f_max		= 100000000,
-	.capabilities	= MMC_CAP_4_BIT_DATA |
-				MMC_CAP_8_BIT_DATA |
-				MMC_CAP_NONREMOVABLE |
-				MMC_CAP_MMC_HIGHSPEED |
-				MMC_CAP_ERASE |
-				MMC_CAP_CMD23,
-	.gpio_cd	= -1,
-	.gpio_wp	= -1,
-#ifdef CONFIG_STE_DMA40
-	.dma_filter	= stedma40_filter,
-	.dma_rx_param	= &mop500_sdi2_dma_cfg_rx,
-	.dma_tx_param	= &mop500_sdi2_dma_cfg_tx,
-#endif
-};
-
-/*
- * SDI 4 (on-board eMMC)
- */
-
-#ifdef CONFIG_STE_DMA40
-struct stedma40_chan_cfg mop500_sdi4_dma_cfg_rx = {
-	.mode = STEDMA40_MODE_LOGICAL,
-	.dir = DMA_DEV_TO_MEM,
-	.dev_type =  DB8500_DMA_DEV42_SD_MM4,
-};
-
-static struct stedma40_chan_cfg mop500_sdi4_dma_cfg_tx = {
-	.mode = STEDMA40_MODE_LOGICAL,
-	.dir = DMA_MEM_TO_DEV,
-	.dev_type = DB8500_DMA_DEV42_SD_MM4,
-};
-#endif
-
-struct mmci_platform_data mop500_sdi4_data = {
-	.f_max		= 100000000,
-	.capabilities	= MMC_CAP_4_BIT_DATA |
-				MMC_CAP_8_BIT_DATA |
-				MMC_CAP_NONREMOVABLE |
-				MMC_CAP_MMC_HIGHSPEED |
-				MMC_CAP_ERASE |
-				MMC_CAP_CMD23,
-	.gpio_cd	= -1,
-	.gpio_wp	= -1,
-#ifdef CONFIG_STE_DMA40
-	.dma_filter	= stedma40_filter,
-	.dma_rx_param	= &mop500_sdi4_dma_cfg_rx,
-	.dma_tx_param	= &mop500_sdi4_dma_cfg_tx,
-#endif
-};
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index d48e866..78861f6 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -79,10 +79,6 @@
 #define SNOWBALL_EN_3V3_ETH_GPIO	MOP500_AB8500_PIN_GPIO(26)	/* GPIO26 */
 
 struct device;
-extern struct mmci_platform_data mop500_sdi0_data;
-extern struct mmci_platform_data mop500_sdi1_data;
-extern struct mmci_platform_data mop500_sdi2_data;
-extern struct mmci_platform_data mop500_sdi4_data;
 extern struct msp_i2s_platform_data msp0_platform_data;
 extern struct msp_i2s_platform_data msp1_platform_data;
 extern struct msp_i2s_platform_data msp2_platform_data;
-- 
1.8.1.2

Re: [PATCH 3/7] ARM: ux500: Remove ATAG support for SDI (MMC)

[Ulf Hansson]

On 6 November 2013 11:05, Lee Jones <lee.jones@linaro.org> wrote:
> This hasn't been used since we moved over to a Device Tree only platform.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  arch/arm/mach-ux500/Makefile           |   3 +-
>  arch/arm/mach-ux500/board-mop500-sdi.c | 166 ---------------------------------
>  arch/arm/mach-ux500/board-mop500.h     |   4 -
>  3 files changed, 1 insertion(+), 172 deletions(-)
>  delete mode 100644 arch/arm/mach-ux500/board-mop500-sdi.c
>
> diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
> index 66f351f..e34c010 100644
> --- a/arch/arm/mach-ux500/Makefile
> +++ b/arch/arm/mach-ux500/Makefile
> @@ -5,8 +5,7 @@
>  obj-y                          := cpu.o devices.o id.o timer.o pm.o
>  obj-$(CONFIG_CACHE_L2X0)       += cache-l2x0.o
>  obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o
> -obj-$(CONFIG_MACH_MOP500)      += board-mop500-sdi.o \
> -                               board-mop500-regulators.o \
> +obj-$(CONFIG_MACH_MOP500)      += board-mop500-regulators.o \
>                                 board-mop500-pins.o \
>                                 board-mop500-audio.o
>  obj-$(CONFIG_SMP)              += platsmp.o headsmp.o
> diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
> deleted file mode 100644
> index fcbf3a1..0000000
> --- a/arch/arm/mach-ux500/board-mop500-sdi.c
> +++ /dev/null
> @@ -1,166 +0,0 @@
> -/*
> - * Copyright (C) ST-Ericsson SA 2010
> - *
> - * Author: Hanumath Prasad <hanumath.prasad@stericsson.com>
> - * License terms: GNU General Public License (GPL) version 2
> - */
> -
> -#include <linux/kernel.h>
> -#include <linux/gpio.h>
> -#include <linux/amba/bus.h>
> -#include <linux/amba/mmci.h>
> -#include <linux/mmc/host.h>
> -#include <linux/platform_device.h>
> -#include <linux/platform_data/dma-ste-dma40.h>
> -
> -#include <asm/mach-types.h>
> -
> -#include "db8500-regs.h"
> -#include "board-mop500.h"
> -#include "ste-dma40-db8500.h"
> -
> -/*
> - * v2 has a new version of this block that need to be forced, the number found
> - * in hardware is incorrect
> - */
> -#define U8500_SDI_V2_PERIPHID 0x10480180
> -
> -/*
> - * SDI 0 (MicroSD slot)
> - */
> -
> -#ifdef CONFIG_STE_DMA40
> -struct stedma40_chan_cfg mop500_sdi0_dma_cfg_rx = {
> -       .mode = STEDMA40_MODE_LOGICAL,
> -       .dir = DMA_DEV_TO_MEM,
> -       .dev_type = DB8500_DMA_DEV29_SD_MM0,
> -};
> -
> -static struct stedma40_chan_cfg mop500_sdi0_dma_cfg_tx = {
> -       .mode = STEDMA40_MODE_LOGICAL,
> -       .dir = DMA_MEM_TO_DEV,
> -       .dev_type = DB8500_DMA_DEV29_SD_MM0,
> -};
> -#endif
> -
> -struct mmci_platform_data mop500_sdi0_data = {
> -       .f_max          = 100000000,
> -       .capabilities   = MMC_CAP_4_BIT_DATA |
> -                               MMC_CAP_SD_HIGHSPEED |
> -                               MMC_CAP_MMC_HIGHSPEED |
> -                               MMC_CAP_ERASE |
> -                               MMC_CAP_UHS_SDR12 |
> -                               MMC_CAP_UHS_SDR25,

I guess all the above caps is having binders in DT then?

> -       .gpio_wp        = -1,
> -       .sigdir         = MCI_ST_FBCLKEN |
> -                               MCI_ST_CMDDIREN |
> -                               MCI_ST_DATA0DIREN |
> -                               MCI_ST_DATA2DIREN,
> -#ifdef CONFIG_STE_DMA40
> -       .dma_filter     = stedma40_filter,
> -       .dma_rx_param   = &mop500_sdi0_dma_cfg_rx,
> -       .dma_tx_param   = &mop500_sdi0_dma_cfg_tx,
> -#endif
> -};
> -
> -/*
> - * SDI1 (SDIO WLAN)
> - */
> -#ifdef CONFIG_STE_DMA40
> -static struct stedma40_chan_cfg sdi1_dma_cfg_rx = {
> -       .mode = STEDMA40_MODE_LOGICAL,
> -       .dir = DMA_DEV_TO_MEM,
> -       .dev_type = DB8500_DMA_DEV32_SD_MM1,
> -};
> -
> -static struct stedma40_chan_cfg sdi1_dma_cfg_tx = {
> -       .mode = STEDMA40_MODE_LOGICAL,
> -       .dir = DMA_MEM_TO_DEV,
> -       .dev_type = DB8500_DMA_DEV32_SD_MM1,
> -};
> -#endif
> -
> -struct mmci_platform_data mop500_sdi1_data = {
> -       .ocr_mask       = MMC_VDD_29_30,
> -       .f_max          = 100000000,
> -       .capabilities   = MMC_CAP_4_BIT_DATA |
> -                               MMC_CAP_NONREMOVABLE,
> -       .gpio_cd        = -1,
> -       .gpio_wp        = -1,
> -#ifdef CONFIG_STE_DMA40
> -       .dma_filter     = stedma40_filter,
> -       .dma_rx_param   = &sdi1_dma_cfg_rx,
> -       .dma_tx_param   = &sdi1_dma_cfg_tx,
> -#endif
> -};
> -
> -/*
> - * SDI 2 (POP eMMC, not on DB8500ed)
> - */
> -
> -#ifdef CONFIG_STE_DMA40
> -struct stedma40_chan_cfg mop500_sdi2_dma_cfg_rx = {
> -       .mode = STEDMA40_MODE_LOGICAL,
> -       .dir = DMA_DEV_TO_MEM,
> -       .dev_type =  DB8500_DMA_DEV28_SD_MM2,
> -};
> -
> -static struct stedma40_chan_cfg mop500_sdi2_dma_cfg_tx = {
> -       .mode = STEDMA40_MODE_LOGICAL,
> -       .dir = DMA_MEM_TO_DEV,
> -       .dev_type = DB8500_DMA_DEV28_SD_MM2,
> -};
> -#endif
> -
> -struct mmci_platform_data mop500_sdi2_data = {
> -       .ocr_mask       = MMC_VDD_165_195,
> -       .f_max          = 100000000,
> -       .capabilities   = MMC_CAP_4_BIT_DATA |
> -                               MMC_CAP_8_BIT_DATA |
> -                               MMC_CAP_NONREMOVABLE |
> -                               MMC_CAP_MMC_HIGHSPEED |
> -                               MMC_CAP_ERASE |
> -                               MMC_CAP_CMD23,

Dito

> -       .gpio_cd        = -1,
> -       .gpio_wp        = -1,
> -#ifdef CONFIG_STE_DMA40
> -       .dma_filter     = stedma40_filter,
> -       .dma_rx_param   = &mop500_sdi2_dma_cfg_rx,
> -       .dma_tx_param   = &mop500_sdi2_dma_cfg_tx,
> -#endif
> -};
> -
> -/*
> - * SDI 4 (on-board eMMC)
> - */
> -
> -#ifdef CONFIG_STE_DMA40
> -struct stedma40_chan_cfg mop500_sdi4_dma_cfg_rx = {
> -       .mode = STEDMA40_MODE_LOGICAL,
> -       .dir = DMA_DEV_TO_MEM,
> -       .dev_type =  DB8500_DMA_DEV42_SD_MM4,
> -};
> -
> -static struct stedma40_chan_cfg mop500_sdi4_dma_cfg_tx = {
> -       .mode = STEDMA40_MODE_LOGICAL,
> -       .dir = DMA_MEM_TO_DEV,
> -       .dev_type = DB8500_DMA_DEV42_SD_MM4,
> -};
> -#endif
> -
> -struct mmci_platform_data mop500_sdi4_data = {
> -       .f_max          = 100000000,
> -       .capabilities   = MMC_CAP_4_BIT_DATA |
> -                               MMC_CAP_8_BIT_DATA |
> -                               MMC_CAP_NONREMOVABLE |
> -                               MMC_CAP_MMC_HIGHSPEED |
> -                               MMC_CAP_ERASE |
> -                               MMC_CAP_CMD23,

Dito

> -       .gpio_cd        = -1,
> -       .gpio_wp        = -1,
> -#ifdef CONFIG_STE_DMA40
> -       .dma_filter     = stedma40_filter,
> -       .dma_rx_param   = &mop500_sdi4_dma_cfg_rx,
> -       .dma_tx_param   = &mop500_sdi4_dma_cfg_tx,
> -#endif
> -};
> diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
> index d48e866..78861f6 100644
> --- a/arch/arm/mach-ux500/board-mop500.h
> +++ b/arch/arm/mach-ux500/board-mop500.h
> @@ -79,10 +79,6 @@
>  #define SNOWBALL_EN_3V3_ETH_GPIO       MOP500_AB8500_PIN_GPIO(26)      /* GPIO26 */
>
>  struct device;
> -extern struct mmci_platform_data mop500_sdi0_data;
> -extern struct mmci_platform_data mop500_sdi1_data;
> -extern struct mmci_platform_data mop500_sdi2_data;
> -extern struct mmci_platform_data mop500_sdi4_data;
>  extern struct msp_i2s_platform_data msp0_platform_data;
>  extern struct msp_i2s_platform_data msp1_platform_data;
>  extern struct msp_i2s_platform_data msp2_platform_data;
> --
> 1.8.1.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

Kind regards
Ulf Hansson

Re: [PATCH 3/7] ARM: ux500: Remove ATAG support for SDI (MMC)

[Lee Jones]

> > -struct mmci_platform_data mop500_sdi0_data = {
> > -       .f_max          = 100000000,
> > -       .capabilities   = MMC_CAP_4_BIT_DATA |
> > -                               MMC_CAP_SD_HIGHSPEED |
> > -                               MMC_CAP_MMC_HIGHSPEED |
> > -                               MMC_CAP_ERASE |
> > -                               MMC_CAP_UHS_SDR12 |
> > -                               MMC_CAP_UHS_SDR25,
> 
> I guess all the above caps is having binders in DT then?

They're not there yet, no. But this stuff is not used anymore in
Mainline hence the patch. I attempted to supply bindings for them, but
they were rejected. Would you like to have a stab at that?

We are suffering with some MMC issues presently on Snowball, this
could well be the cause.

> Dito
> Dito

Likewise.

NB: When you post review comments, try not to forget to <snip> all
unrelated cruft. Scrolling down for pages to find them is not optimal.


-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 3/7] ARM: ux500: Remove ATAG support for SDI (MMC)

[Linus Walleij]

On Thu, Nov 7, 2013 at 1:07 PM, Lee Jones <lee.jones@linaro.org> wrote:

>> > -struct mmci_platform_data mop500_sdi0_data = {
>> > -       .f_max          = 100000000,
>> > -       .capabilities   = MMC_CAP_4_BIT_DATA |
>> > -                               MMC_CAP_SD_HIGHSPEED |
>> > -                               MMC_CAP_MMC_HIGHSPEED |
>> > -                               MMC_CAP_ERASE |
>> > -                               MMC_CAP_UHS_SDR12 |
>> > -                               MMC_CAP_UHS_SDR25,
>>
>> I guess all the above caps is having binders in DT then?
>
> They're not there yet, no. But this stuff is not used anymore in
> Mainline hence the patch. I attempted to supply bindings for them, but
> they were rejected. Would you like to have a stab at that?

Yeah but we basically regressed the ux500 with the patch now
queued for v3.13:
commit 49c129519a7a8840767321c38d2eaf84a263529b
"ARM: ux500: Stop passing MMC's platform data for Device Tree boots"

Which deleted the passing of this non-yet-DT:ed platform
data.

Since it's a regression we need to do a fixup patch for the
v3.13 series adding it back.

Since this patch probably needs to be rewritten on top of
that I don't merge this patch as of now.

Yours,
Linus Walleij

Re: [PATCH 3/7] ARM: ux500: Remove ATAG support for SDI (MMC)

[Lee Jones]

On Fri, 08 Nov 2013, Linus Walleij wrote:

> On Thu, Nov 7, 2013 at 1:07 PM, Lee Jones <lee.jones@linaro.org> wrote:
> 
> >> > -struct mmci_platform_data mop500_sdi0_data = {
> >> > -       .f_max          = 100000000,
> >> > -       .capabilities   = MMC_CAP_4_BIT_DATA |
> >> > -                               MMC_CAP_SD_HIGHSPEED |
> >> > -                               MMC_CAP_MMC_HIGHSPEED |
> >> > -                               MMC_CAP_ERASE |
> >> > -                               MMC_CAP_UHS_SDR12 |
> >> > -                               MMC_CAP_UHS_SDR25,
> >>
> >> I guess all the above caps is having binders in DT then?
> >
> > They're not there yet, no. But this stuff is not used anymore in
> > Mainline hence the patch. I attempted to supply bindings for them, but
> > they were rejected. Would you like to have a stab at that?
> 
> Yeah but we basically regressed the ux500 with the patch now
> queued for v3.13:
> commit 49c129519a7a8840767321c38d2eaf84a263529b
> "ARM: ux500: Stop passing MMC's platform data for Device Tree boots"
> 
> Which deleted the passing of this non-yet-DT:ed platform
> data.
> 
> Since it's a regression we need to do a fixup patch for the
> v3.13 series adding it back.

Okay, do you want me to do that?

> Since this patch probably needs to be rewritten on top of
> that I don't merge this patch as of now.

Sure.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 3/7] ARM: ux500: Remove ATAG support for SDI (MMC)

[Linus Walleij]

On Fri, Nov 8, 2013 at 10:26 AM, Lee Jones <lee.jones@linaro.org> wrote:
> On Fri, 08 Nov 2013, Linus Walleij wrote:
>> On Thu, Nov 7, 2013 at 1:07 PM, Lee Jones <lee.jones@linaro.org> wrote:

>> Since it's a regression we need to do a fixup patch for the
>> v3.13 series adding it back.
>
> Okay, do you want me to do that?

Sure, thanks! :-)

Yours,
Linus Walleij

Re: [PATCH 3/7] ARM: ux500: Remove ATAG support for SDI (MMC)

[Russell King - ARM Linux]

On Wed, Nov 06, 2013 at 10:05:44AM +0000, Lee Jones wrote:
> This hasn't been used since we moved over to a Device Tree only platform.

The patch summary line is slightly off.  There's nothing here to do with
ATAGs.

Re: [PATCH 3/7] ARM: ux500: Remove ATAG support for SDI (MMC)

[Lee Jones]

On Thu, 07 Nov 2013, Russell King - ARM Linux wrote:

> On Wed, Nov 06, 2013 at 10:05:44AM +0000, Lee Jones wrote:
> > This hasn't been used since we moved over to a Device Tree only platform.
> 
> The patch summary line is slightly off.  There's nothing here to do with
> ATAGs.

Oh I see. Yes you're right, it was just what Arnd, myself and a few
others called non-DT 'cos it was easier.

Linus are you happy to fixup the subject lines of these two commits or
would you like me to re-submit?

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[PATCH 4/7] ARM: ux500: Clean-up non-DT IRQ initialisation

[Lee Jones]

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/cpu.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c
index 8f8004f..d11ac4b 100644
--- a/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@ -63,12 +63,7 @@ void __init ux500_init_irq(void)
 	} else
 		ux500_unknown_soc();
 
-#ifdef CONFIG_OF
-	if (of_have_populated_dt())
-		irqchip_init();
-	else
-#endif
-		gic_init(0, 29, dist_base, cpu_base);
+	irqchip_init();
 
 	/*
 	 * Init clocks here so that they are available for system timer
@@ -78,16 +73,11 @@ void __init ux500_init_irq(void)
 		prcmu_early_init(U8500_PRCMU_BASE, SZ_8K - 1);
 		ux500_pm_init(U8500_PRCMU_BASE, SZ_8K - 1);
 
-		if (of_have_populated_dt())
-			u8500_of_clk_init(U8500_CLKRST1_BASE,
-					  U8500_CLKRST2_BASE,
-					  U8500_CLKRST3_BASE,
-					  U8500_CLKRST5_BASE,
-					  U8500_CLKRST6_BASE);
-		else
-			u8500_clk_init(U8500_CLKRST1_BASE, U8500_CLKRST2_BASE,
-				       U8500_CLKRST3_BASE, U8500_CLKRST5_BASE,
-				       U8500_CLKRST6_BASE);
+		u8500_of_clk_init(U8500_CLKRST1_BASE,
+				  U8500_CLKRST2_BASE,
+				  U8500_CLKRST3_BASE,
+				  U8500_CLKRST5_BASE,
+				  U8500_CLKRST6_BASE);
 	} else if (cpu_is_u9540()) {
 		prcmu_early_init(U8500_PRCMU_BASE, SZ_8K - 1);
 		ux500_pm_init(U8500_PRCMU_BASE, SZ_8K - 1);
-- 
1.8.1.2

Re: [PATCH 4/7] ARM: ux500: Clean-up non-DT IRQ initialisation

[Linus Walleij]

On Wed, Nov 6, 2013 at 11:05 AM, Lee Jones <lee.jones@linaro.org> wrote:

> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Patch applied. I added some commit blurb tho.

Yours,
Linus Walleij

[PATCH 5/7] ARM: ux500: Remove unused call to register AMBA devices

[Lee Jones]

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/Makefile  |  2 +-
 arch/arm/mach-ux500/devices.c | 26 --------------------------
 arch/arm/mach-ux500/setup.h   |  3 ---
 3 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 arch/arm/mach-ux500/devices.c

diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index e34c010..a4f58bb 100644
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel, U8500 machine.
 #
 
-obj-y				:= cpu.o devices.o id.o timer.o pm.o
+obj-y				:= cpu.o id.o timer.o pm.o
 obj-$(CONFIG_CACHE_L2X0)	+= cache-l2x0.o
 obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o
 obj-$(CONFIG_MACH_MOP500)	+= board-mop500-regulators.o \
diff --git a/arch/arm/mach-ux500/devices.c b/arch/arm/mach-ux500/devices.c
deleted file mode 100644
index 0f9e52b..0000000
--- a/arch/arm/mach-ux500/devices.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
- * License terms: GNU General Public License (GPL) version 2
- */
-
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
-#include <linux/io.h>
-#include <linux/amba/bus.h>
-
-#include "setup.h"
-
-#include "db8500-regs.h"
-
-void __init amba_add_devices(struct amba_device *devs[], int num)
-{
-	int i;
-
-	for (i = 0; i < num; i++) {
-		struct amba_device *d = devs[i];
-		amba_device_register(d, &iomem_resource);
-	}
-}
diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
index bdb3564..e5682da 100644
--- a/arch/arm/mach-ux500/setup.h
+++ b/arch/arm/mach-ux500/setup.h
@@ -27,9 +27,6 @@ extern void __init ux500_init_irq(void);
 
 extern struct device *ux500_soc_device_init(const char *soc_id);
 
-struct amba_device;
-extern void __init amba_add_devices(struct amba_device *devs[], int num);
-
 extern void ux500_timer_init(void);
 
 #define __IO_DEV_DESC(x, sz)	{		\
-- 
1.8.1.2

Re: [PATCH 5/7] ARM: ux500: Remove unused call to register AMBA devices

[Linus Walleij]

On Wed, Nov 6, 2013 at 11:05 AM, Lee Jones <lee.jones@linaro.org> wrote:

> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Applied with a blurb.

Yours,
Linus Walleij

[PATCH 6/7] ARM: ux500: Clean-up legacy extern prototype

[Lee Jones]

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/setup.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
index e5682da..7164cfd 100644
--- a/arch/arm/mach-ux500/setup.h
+++ b/arch/arm/mach-ux500/setup.h
@@ -19,9 +19,6 @@
 void ux500_restart(enum reboot_mode mode, const char *cmd);
 
 void __init ux500_map_io(void);
-extern void __init u8500_map_io(void);
-
-extern struct device * __init u8500_init_devices(void);
 
 extern void __init ux500_init_irq(void);
 
-- 
1.8.1.2

Re: [PATCH 6/7] ARM: ux500: Clean-up legacy extern prototype

[Linus Walleij]

On Wed, Nov 6, 2013 at 11:05 AM, Lee Jones <lee.jones@linaro.org> wrote:

> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Applied with a blurb.

Yours,
Linus Walleij

[PATCH 7/7] ARM: ux500: Remove checking for DT during timer init as we are now DT only

[Lee Jones]

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/timer.c | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c
index 05a4ff7..ca60bbd 100644
--- a/arch/arm/mach-ux500/timer.c
+++ b/arch/arm/mach-ux500/timer.c
@@ -27,18 +27,11 @@ static DEFINE_TWD_LOCAL_TIMER(u8500_twd_local_timer,
 static void __init ux500_twd_init(void)
 {
 	struct twd_local_timer *twd_local_timer;
-	int err;
 
 	/* Use this to switch local timer base if changed in new ASICs */
 	twd_local_timer = &u8500_twd_local_timer;
 
-	if (of_have_populated_dt())
-		clocksource_of_init();
-	else {
-		err = twd_local_timer_register(twd_local_timer);
-		if (err)
-			pr_err("twd_local_timer_register failed %d\n", err);
-	}
+	clocksource_of_init();
 }
 #else
 #define ux500_twd_init()	do { } while(0)
@@ -63,20 +56,15 @@ void __init ux500_timer_init(void)
 		ux500_unknown_soc();
 	}
 
-	/* TODO: Once MTU has been DT:ed place code above into else. */
-	if (of_have_populated_dt()) {
-#ifdef CONFIG_OF
-		np = of_find_matching_node(NULL, prcmu_timer_of_match);
-		if (!np)
-#endif
-			goto dt_fail;
+	np = of_find_matching_node(NULL, prcmu_timer_of_match);
+	if (!np)
+		goto dt_fail;
 
-		tmp_base = of_iomap(np, 0);
-		if (!tmp_base)
-			goto dt_fail;
+	tmp_base = of_iomap(np, 0);
+	if (!tmp_base)
+		goto dt_fail;
 
-		prcmu_timer_base = tmp_base;
-	}
+	prcmu_timer_base = tmp_base;
 
 dt_fail:
 	/* Doing it the old fashioned way. */
-- 
1.8.1.2

Re: [PATCH 7/7] ARM: ux500: Remove checking for DT during timer init as we are now DT only

[Linus Walleij]

On Wed, Nov 6, 2013 at 11:05 AM, Lee Jones <lee.jones@linaro.org> wrote:

> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Applied with a blurb.

Yours,
Linus Walleij