Skip to contentSkip to conversation

Ux500 multiplatform v2

PATCH New Linus Walleij 3 participants 19 messages Apr 5, 2013 – Apr 7, 2013

Subsystems (11)
lore
Share & tools
lore
#0 lore raw

cover Ux500 multiplatform v2

From: Linus Walleij <[email protected]>

This is the complete Ux500 multiplatform patchset.

The only thing missing is a few ACKs from the MFD
maintainer (Samuel Ortiz).

Arnd Bergmann (7):
ARM: ux500: move mach/msp.h to <linux/platform_data/*>
staging: ste_rmi4: kill platform_data hack
ARM: ux500: split out prcmu initialization
ARM: ux500: make irqs.h local to platform
ARM: ux500: make remaining headers local
ARM: ux500: move to multiplatform
ARM: ux500: build hotplug.o for ARMv7-a

Linus Walleij (7):
ARM: ux500: move debugmacro to debug includes
clk: ux500: pass clock base adresses in init call
mfd: prcmu: pass a base and size with the early initcall
mfd: db8500-prcmu: get base address from resource
ARM: ux500: move PM-related PRCMU functions to machine
ARM: ux500: make debug macro stand-alone
ARM: ux500: get rid of <mach/[hardware|db8500-regs].h>

 arch/arm/Kconfig                                   |  15 -
 arch/arm/Kconfig.debug                             |   8 +
 arch/arm/include/debug/ux500.S                     |  48 ++++
 arch/arm/mach-ux500/Kconfig                        |  14 +
 arch/arm/mach-ux500/Makefile                       |   4 +-
 arch/arm/mach-ux500/board-mop500-audio.c           |   7 +-
 arch/arm/mach-ux500/board-mop500-pins.c            |   2 -
 arch/arm/mach-ux500/board-mop500-sdi.c             |   4 +-
 arch/arm/mach-ux500/board-mop500-u8500uib.c        |   9 +-
 arch/arm/mach-ux500/board-mop500-uib.c             |   1 -
 arch/arm/mach-ux500/board-mop500.c                 |  66 +----
 arch/arm/mach-ux500/board-mop500.h                 |   4 +-
 arch/arm/mach-ux500/cache-l2x0.c                   |   2 +-
 arch/arm/mach-ux500/cpu-db8500.c                   |  12 +-
 arch/arm/mach-ux500/cpu.c                          |  33 ++-
 arch/arm/mach-ux500/cpuidle.c                      |   5 +-
 .../mach-ux500/{include/mach => }/db8500-regs.h    |  28 ++
 arch/arm/mach-ux500/devices-common.c               |   3 +-
 arch/arm/mach-ux500/devices-db8500.c               |   8 +-
 arch/arm/mach-ux500/devices-db8500.h               |   3 +-
 arch/arm/mach-ux500/devices.c                      |   5 +-
 arch/arm/mach-ux500/{include/mach => }/devices.h   |   0
 arch/arm/mach-ux500/hotplug.c                      |   2 +-
 arch/arm/mach-ux500/id.c                           |   4 +-
 arch/arm/mach-ux500/include/mach/debug-macro.S     |  39 ---
 arch/arm/mach-ux500/include/mach/hardware.h        |  47 ---
 arch/arm/mach-ux500/include/mach/timex.h           |   6 -
 arch/arm/mach-ux500/include/mach/uncompress.h      |  57 ----
 .../{include/mach => }/irqs-board-mop500.h         |   0
 .../mach-ux500/{include/mach => }/irqs-db8500.h    |  25 --
 arch/arm/mach-ux500/{include/mach => }/irqs.h      |   6 +-
 arch/arm/mach-ux500/platsmp.c                      |   4 +-
 arch/arm/mach-ux500/pm.c                           | 167 +++++++++++
 arch/arm/mach-ux500/{include/mach => }/setup.h     |   0
 arch/arm/mach-ux500/timer.c                        |   6 +-
 arch/arm/mach-ux500/usb.c                          |   2 +-
 drivers/clk/ux500/clk-prcc.c                       |   1 -
 drivers/clk/ux500/u8500_clk.c                      | 142 ++++-----
 drivers/clocksource/clksrc-dbx500-prcmu.c          |   3 -
 drivers/crypto/ux500/cryp/cryp.c                   |   2 -
 drivers/crypto/ux500/cryp/cryp_core.c              |   1 -
 drivers/crypto/ux500/hash/hash_core.c              |   1 -
 drivers/mfd/db8500-prcmu.c                         | 316 ++++++++++-----------
 drivers/mfd/dbx500-prcmu-regs.h                    | 204 ++++++-------
 drivers/staging/ste_rmi4/Makefile                  |   1 -
 .../staging/ste_rmi4/board-mop500-u8500uib-rmi4.c  |  31 --
 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c      |  31 +-
 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h      |   1 -
 include/linux/mfd/db8500-prcmu.h                   |  10 +-
 include/linux/mfd/dbx500-prcmu.h                   |  38 +--
 include/linux/platform_data/arm-ux500-pm.h         |  21 ++
 .../linux/platform_data/asoc-ux500-msp.h           |   0
 include/linux/platform_data/clk-ux500.h            |   3 +-
 sound/soc/ux500/mop500_ab8500.c                    |   2 -
 sound/soc/ux500/ux500_msp_dai.c                    |   4 +-
 sound/soc/ux500/ux500_msp_i2s.c                    |   4 +-
 sound/soc/ux500/ux500_msp_i2s.h                    |   2 -
 57 files changed, 699 insertions(+), 765 deletions(-)
 create mode 100644 arch/arm/include/debug/ux500.S
 rename arch/arm/mach-ux500/{include/mach => }/db8500-regs.h (88%)
 rename arch/arm/mach-ux500/{include/mach => }/devices.h (100%)
 delete mode 100644 arch/arm/mach-ux500/include/mach/debug-macro.S
 delete mode 100644 arch/arm/mach-ux500/include/mach/hardware.h
 delete mode 100644 arch/arm/mach-ux500/include/mach/timex.h
 delete mode 100644 arch/arm/mach-ux500/include/mach/uncompress.h
 rename arch/arm/mach-ux500/{include/mach => }/irqs-board-mop500.h (100%)
 rename arch/arm/mach-ux500/{include/mach => }/irqs-db8500.h (83%)
 rename arch/arm/mach-ux500/{include/mach => }/irqs.h (93%)
 create mode 100644 arch/arm/mach-ux500/pm.c
 rename arch/arm/mach-ux500/{include/mach => }/setup.h (100%)
 delete mode 100644 drivers/staging/ste_rmi4/board-mop500-u8500uib-rmi4.c
 create mode 100644 include/linux/platform_data/arm-ux500-pm.h
 rename arch/arm/mach-ux500/include/mach/msp.h => include/linux/platform_data/asoc-ux500-msp.h (100%)
Signature · 1 line
1.7.11.3
#1 lore raw

PATCH 1/14 ARM: ux500: move debugmacro to debug includes

From: Linus Walleij <[email protected]>

This moves the Ux500 debug macro to the debug headers to make way for multiplatform support.

---
 arch/arm/Kconfig.debug                                            | 8 ++++++++
 .../include/mach/debug-macro.S => include/debug/ux500.S}          | 0
 2 files changed, 8 insertions(+)
 rename arch/arm/{mach-ux500/include/mach/debug-macro.S => include/debug/ux500.S} (100%)
arch/arm/Kconfig.debug +8 -0
index acdddda..a7b6f8b 100644
@@ -414,6 +414,13 @@ choice
 		  Say Y here if you want the debug print routines to direct
 		  their output to the uart1 port on SiRFmarco devices.
 
+	config DEBUG_UX500_UART
+		depends on ARCH_U8500
+		bool "Use Ux500 UART for low-level debug"
+		help
+		  Say Y here if you want kernel low-level debugging support
+		  on Ux500 based platforms.
+
 	config DEBUG_VEXPRESS_UART0_DETECT
 		bool "Autodetect UART0 on Versatile Express Cortex-A core tiles"
 		depends on ARCH_VEXPRESS && CPU_CP15_MMU
@@ -598,6 +605,7 @@ config DEBUG_LL_INCLUDE
 		DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
 	default "debug/vt8500.S" if DEBUG_VT8500_UART0
 	default "debug/tegra.S" if DEBUG_TEGRA_UART
+	default "debug/ux500.S" if DEBUG_UX500_UART
 	default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
 	default "mach/debug-macro.S"
 
arch/arm/include/debug/ux500.S renamed from arch/arm/mach-ux500/include/mach/debug-macro.S +0 -0
similarity index 100%
rename from arch/arm/mach-ux500/include/mach/debug-macro.S
rename to arch/arm/include/debug/ux500.S
Signature · 1 line
1.7.11.3
#2 lore raw

PATCH 2/14 clk: ux500: pass clock base adresses in init call

In reply to Linus Walleij

From: Linus Walleij <[email protected]>

The ux500 clock driver was including <mach/db8500-regs.h> which will not work when building for multiplatform support since <mach/*> is going away.

Pass the base adresses in the init call instead.

---
 arch/arm/mach-ux500/cpu.c               |   4 +-
 drivers/clk/ux500/u8500_clk.c           | 142 ++++++++++++++++----------------
 include/linux/platform_data/clk-ux500.h |   3 +-
 3 files changed, 76 insertions(+), 73 deletions(-)
arch/arm/mach-ux500/cpu.c +3 -1
index 537870d..741d06a 100644
@@ -72,7 +72,9 @@ void __init ux500_init_irq(void)
 		db8500_prcmu_early_init();
 
 	if (cpu_is_u8500_family() || cpu_is_u9540())
-		u8500_clk_init();
+		u8500_clk_init(U8500_CLKRST1_BASE, U8500_CLKRST2_BASE,
+			       U8500_CLKRST3_BASE, U8500_CLKRST5_BASE,
+			       U8500_CLKRST6_BASE);
 	else if (cpu_is_u8540())
 		u8540_clk_init();
 }
drivers/clk/ux500/u8500_clk.c +71 -71

383 lines not on this page · raw message

include/linux/platform_data/clk-ux500.h +2 -1
index 3af0da1..320d9c3 100644
@@ -10,7 +10,8 @@
 #ifndef __CLK_UX500_H
 #define __CLK_UX500_H
 
-void u8500_clk_init(void);
+void u8500_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
+		    u32 clkrst5_base, u32 clkrst6_base);
 void u9540_clk_init(void);
 void u8540_clk_init(void);
 
Signature · 1 line
1.7.11.3
#3 lore raw

PATCH 3/14 ARM: ux500: move mach/msp.h to <linux/platform_data/*>

In reply to Linus Walleij

From: Arnd Bergmann <[email protected]>

This header file only contains platform data structure definitions, so it's straightforward to move.

[Delete one include rather than move it]
---
 arch/arm/mach-ux500/board-mop500-audio.c                                | 2 +-
 arch/arm/mach-ux500/board-mop500.h                                      | 2 +-
 .../include/mach/msp.h => include/linux/platform_data/asoc-ux500-msp.h  | 0
 sound/soc/ux500/ux500_msp_dai.c                                         | 2 +-
 sound/soc/ux500/ux500_msp_i2s.c                                         | 2 +-
 sound/soc/ux500/ux500_msp_i2s.h                                         | 2 --
 6 files changed, 4 insertions(+), 6 deletions(-)
 rename arch/arm/mach-ux500/include/mach/msp.h => include/linux/platform_data/asoc-ux500-msp.h (100%)
arch/arm/mach-ux500/board-mop500-audio.c +1 -1
index 7209db7..43bbee1 100644
@@ -13,7 +13,7 @@
 #include <mach/devices.h>
 #include <mach/hardware.h>
 #include <mach/irqs.h>
-#include <mach/msp.h>
+#include <linux/platform_data/asoc-ux500-msp.h>
 
 #include "ste-dma40-db8500.h"
 #include "board-mop500.h"
arch/arm/mach-ux500/board-mop500.h +1 -1
index eaa605f..eb81caf1 100644
@@ -9,7 +9,7 @@
 
 /* For NOMADIK_NR_GPIO */
 #include <mach/irqs.h>
-#include <mach/msp.h>
+#include <linux/platform_data/asoc-ux500-msp.h>
 #include <linux/amba/mmci.h>
 
 /* Snowball specific GPIO assignments, this board has no GPIO expander */
include/linux/platform_data/asoc-ux500-msp.h renamed from arch/arm/mach-ux500/include/mach/msp.h +0 -0
similarity index 100%
rename from arch/arm/mach-ux500/include/mach/msp.h
rename to include/linux/platform_data/asoc-ux500-msp.h
sound/soc/ux500/ux500_msp_dai.c +1 -1
index 94a3e57..0d9713e 100644
@@ -19,9 +19,9 @@
 #include <linux/clk.h>
 #include <linux/regulator/consumer.h>
 #include <linux/mfd/dbx500-prcmu.h>
+#include <linux/platform_data/asoc-ux500-msp.h>
 
 #include <mach/hardware.h>
-#include <mach/msp.h>
 
 #include <sound/soc.h>
 #include <sound/soc-dai.h>
sound/soc/ux500/ux500_msp_i2s.c +1 -1
index a26c6bf..a582007 100644
@@ -20,9 +20,9 @@
 #include <linux/slab.h>
 #include <linux/io.h>
 #include <linux/of.h>
+#include <linux/platform_data/asoc-ux500-msp.h>
 
 #include <mach/hardware.h>
-#include <mach/msp.h>
 
 #include <sound/soc.h>
 
sound/soc/ux500/ux500_msp_i2s.h +0 -2
index 1311c0d..437f0c0 100644
@@ -17,8 +17,6 @@
 
 #include <linux/platform_device.h>
 
-#include <mach/msp.h>
-
 #define MSP_INPUT_FREQ_APB 48000000
 
 /*** Stereo mode. Used for APB data accesses as 16 bits accesses (mono),
Signature · 1 line
1.7.11.3
#4 lore raw

PATCH 4/14 staging: ste_rmi4: kill platform_data hack

In reply to Linus Walleij

From: Arnd Bergmann <[email protected]>

There is only one instance of the platform data for synaptics_i2c_rmi4 in the mainline kernel, so there is no point of pretending its variable here. The only member that has a dependency on the platform is actually the interrupt number, and there is a field in the i2c_client structure that gets initialized from the board info, so we can trivially move the board_into into the platform without knowledge of the platform_data structure.

---
 arch/arm/mach-ux500/board-mop500-u8500uib.c        |  7 +++--
 drivers/staging/ste_rmi4/Makefile                  |  1 -
 .../staging/ste_rmi4/board-mop500-u8500uib-rmi4.c  | 31 ----------------------
 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c      | 31 +++++++++++++---------
 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h      |  1 -
 5 files changed, 23 insertions(+), 48 deletions(-)
 delete mode 100644 drivers/staging/ste_rmi4/board-mop500-u8500uib-rmi4.c
arch/arm/mach-ux500/board-mop500-u8500uib.c +5 -2
index ead91c9..0b5e14a 100644
@@ -16,8 +16,11 @@
 
 #include "board-mop500.h"
 
-/* Dummy data that can be overridden by staging driver */
-struct i2c_board_info __initdata __weak mop500_i2c3_devices_u8500[] = {
+static struct i2c_board_info __initdata mop500_i2c3_devices_u8500[] = {
+	{
+		I2C_BOARD_INFO("synaptics_rmi4_i2c", 0x4B),
+		.irq = NOMADIK_GPIO_TO_IRQ(84),
+	},
 };
 
 /*
drivers/staging/ste_rmi4/Makefile +0 -1
index e4c0335..6cce2ed 100644
@@ -2,4 +2,3 @@
 # Makefile for the RMI4 touchscreen driver.
 #
 obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += synaptics_i2c_rmi4.o
-obj-$(CONFIG_MACH_MOP500) += board-mop500-u8500uib-rmi4.o
drivers/staging/ste_rmi4/board-mop500-u8500uib-rmi4.c deleted +0 -31
deleted file mode 100644
index 47439c3..0000000
@@ -1,31 +0,0 @@
-/*
- * Some platform data for the RMI4 touchscreen that will override the __weak
- * platform data in the Ux500 machine if this driver is activated.
- */
-#include <linux/i2c.h>
-#include <linux/gpio.h>
-#include <linux/interrupt.h>
-#include <mach/irqs.h>
-#include "synaptics_i2c_rmi4.h"
-
-/*
- * Synaptics RMI4 touchscreen interface on the U8500 UIB
- */
-
-/*
- * Descriptor structure.
- * Describes the number of i2c devices on the bus that speak RMI.
- */
-static struct synaptics_rmi4_platform_data rmi4_i2c_dev_platformdata = {
-	.irq_number     = NOMADIK_GPIO_TO_IRQ(84),
-	.irq_type       = (IRQF_TRIGGER_FALLING | IRQF_SHARED),
-	.x_flip		= false,
-	.y_flip		= true,
-};
-
-struct i2c_board_info __initdata mop500_i2c3_devices_u8500[] = {
-	{
-		I2C_BOARD_INFO("synaptics_rmi4_i2c", 0x4B),
-		.platform_data = &rmi4_i2c_dev_platformdata,
-	},
-};
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c +18 -13
index 6a21f67..2e35307 100644
@@ -864,6 +864,16 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata)
 	return 0;
 }
 
+/*
+ * Descriptor structure.
+ * Describes the number of i2c devices on the bus that speak RMI.
+ */
+static struct synaptics_rmi4_platform_data synaptics_rmi4_platformdata = {
+	.irq_type       = (IRQF_TRIGGER_FALLING | IRQF_SHARED),
+	.x_flip		= false,
+	.y_flip		= true,
+};
+
 /**
  * synaptics_rmi4_probe() - Initialze the i2c-client touchscreen driver
  * @i2c: i2c client structure pointer
@@ -890,10 +900,8 @@ static int synaptics_rmi4_probe
 		return -EIO;
 	}
 
-	if (!platformdata) {
-		dev_err(&client->dev, "%s: no platform data\n", __func__);
-		return -EINVAL;
-	}
+	if (!platformdata)
+		platformdata = &synaptics_rmi4_platformdata;
 
 	/* Allocate and initialize the instance data for this client */
 	rmi4_data = kcalloc(2, sizeof(struct synaptics_rmi4_data),
@@ -977,13 +985,13 @@ static int synaptics_rmi4_probe
 	synaptics_rmi4_i2c_block_read(rmi4_data,
 			rmi4_data->fn01_data_base_addr + 1, intr_status,
 				rmi4_data->number_of_interrupt_register);
-	retval = request_threaded_irq(platformdata->irq_number, NULL,
+	retval = request_threaded_irq(client->irq, NULL,
 					synaptics_rmi4_irq,
 					platformdata->irq_type,
 					DRIVER_NAME, rmi4_data);
 	if (retval) {
 		dev_err(&client->dev, "%s:Unable to get attn irq %d\n",
-				__func__, platformdata->irq_number);
+				__func__, client->irq);
 		goto err_query_dev;
 	}
 
@@ -996,7 +1004,7 @@ static int synaptics_rmi4_probe
 	return retval;
 
 err_free_irq:
-	free_irq(platformdata->irq_number, rmi4_data);
+	free_irq(client->irq, rmi4_data);
 err_query_dev:
 	regulator_disable(rmi4_data->regulator);
 err_regulator_enable:
@@ -1019,11 +1027,10 @@ err_input:
 static int synaptics_rmi4_remove(struct i2c_client *client)
 {
 	struct synaptics_rmi4_data *rmi4_data = i2c_get_clientdata(client);
-	const struct synaptics_rmi4_platform_data *pdata = rmi4_data->board;
 
 	rmi4_data->touch_stopped = true;
 	wake_up(&rmi4_data->wait);
-	free_irq(pdata->irq_number, rmi4_data);
+	free_irq(client->irq, rmi4_data);
 	input_unregister_device(rmi4_data->input_dev);
 	regulator_disable(rmi4_data->regulator);
 	regulator_put(rmi4_data->regulator);
@@ -1046,10 +1053,9 @@ static int synaptics_rmi4_suspend(struct device *dev)
 	int retval;
 	unsigned char intr_status;
 	struct synaptics_rmi4_data *rmi4_data = dev_get_drvdata(dev);
-	const struct synaptics_rmi4_platform_data *pdata = rmi4_data->board;
 
 	rmi4_data->touch_stopped = true;
-	disable_irq(pdata->irq_number);
+	disable_irq(rmi4_data->i2c_client->irq);
 
 	retval = synaptics_rmi4_i2c_block_read(rmi4_data,
 				rmi4_data->fn01_data_base_addr + 1,
@@ -1080,11 +1086,10 @@ static int synaptics_rmi4_resume(struct device *dev)
 	int retval;
 	unsigned char intr_status;
 	struct synaptics_rmi4_data *rmi4_data = dev_get_drvdata(dev);
-	const struct synaptics_rmi4_platform_data *pdata = rmi4_data->board;
 
 	regulator_enable(rmi4_data->regulator);
 
-	enable_irq(pdata->irq_number);
+	enable_irq(rmi4_data->i2c_client->irq);
 	rmi4_data->touch_stopped = false;
 
 	retval = synaptics_rmi4_i2c_block_read(rmi4_data,
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h +0 -1
index 384436e..8c9166b 100644
@@ -38,7 +38,6 @@
  * This structure gives platform data for rmi4.
  */
 struct synaptics_rmi4_platform_data {
-	int irq_number;
 	int irq_type;
 	bool x_flip;
 	bool y_flip;
Signature · 1 line
1.7.11.3
#5 lore raw

PATCH 5/14 mfd: prcmu: pass a base and size with the early initcall

In reply to Linus Walleij

From: Linus Walleij <[email protected]>

This patch will make an early remapping of the PRCMU, to be used when setting up the clocks, that will call down into parts of the PRCMU driver before it is probed.

Going forward this will be removed like this:

- The mailbox subsystem need to be merged.
http://marc.info/?l=linux-kernel&m=136314559201983&w=2

- At this point the PRCMU clock code can be moved over to the ux500 clock driver in drivers/clk/ux500/* and maintained there in a decentralized manner.

- This early initcall and PRCMU base parameters become part of the ux500_clk_init() call instead.

---
 arch/arm/mach-ux500/cpu.c        | 17 +++++++++++------
 drivers/mfd/db8500-prcmu.c       | 13 ++++++++++++-
 include/linux/mfd/db8500-prcmu.h |  4 ++--
 include/linux/mfd/dbx500-prcmu.h |  6 +++---
 4 files changed, 28 insertions(+), 12 deletions(-)
arch/arm/mach-ux500/cpu.c +11 -6
index 741d06a..af13b6d 100644
@@ -8,7 +8,7 @@
 
 #include <linux/platform_device.h>
 #include <linux/io.h>
-#include <linux/mfd/db8500-prcmu.h>
+#include <linux/mfd/dbx500-prcmu.h>
 #include <linux/clksrc-dbx500-prcmu.h>
 #include <linux/sys_soc.h>
 #include <linux/err.h>
@@ -68,15 +68,20 @@ void __init ux500_init_irq(void)
 	 * Init clocks here so that they are available for system timer
 	 * initialization.
 	 */
-	if (cpu_is_u8500_family() || cpu_is_u9540())
-		db8500_prcmu_early_init();
-
-	if (cpu_is_u8500_family() || cpu_is_u9540())
+	if (cpu_is_u8500_family()) {
+		prcmu_early_init(U8500_PRCMU_BASE, SZ_8K - 1);
 		u8500_clk_init(U8500_CLKRST1_BASE, U8500_CLKRST2_BASE,
 			       U8500_CLKRST3_BASE, U8500_CLKRST5_BASE,
 			       U8500_CLKRST6_BASE);
-	else if (cpu_is_u8540())
+	} else if (cpu_is_u9540()) {
+		prcmu_early_init(U8500_PRCMU_BASE, SZ_8K - 1);
+		u8500_clk_init(U8500_CLKRST1_BASE, U8500_CLKRST2_BASE,
+			       U8500_CLKRST3_BASE, U8500_CLKRST5_BASE,
+			       U8500_CLKRST6_BASE);
+	} else if (cpu_is_u8540()) {
+		prcmu_early_init(U8500_PRCMU_BASE, SZ_8K + SZ_4K - 1);
 		u8540_clk_init();
+	}
 }
 
 void __init ux500_init_late(void)
drivers/mfd/db8500-prcmu.c +12 -1
index 21f261b..9166427 100644
@@ -2825,8 +2825,19 @@ static void dbx500_fw_version_init(struct platform_device *pdev,
 	}
 }
 
-void __init db8500_prcmu_early_init(void)
+void __init db8500_prcmu_early_init(u32 phy_base, u32 size)
 {
+	/*
+	 * This is a temporary remap to bring up the clocks. It is
+	 * subsequently replaces with a real remap. After the merge of
+	 * the mailbox subsystem all of this early code goes away, and the
+	 * clock driver can probe independently. An early initcall will
+	 * still be needed, but it can be diverted into drivers/clk/ux500/*.
+	 */
+	prcmu_base = ioremap(phy_base, size);
+	if (!prcmu_base)
+		pr_err("%s: ioremap() of prcmu registers failed!\n", __func__);
+
 	spin_lock_init(&mb0_transfer.lock);
 	spin_lock_init(&mb0_transfer.dbb_irqs_lock);
 	mutex_init(&mb0_transfer.ac_wake_lock);
include/linux/mfd/db8500-prcmu.h +2 -2
index 77a46ae..ac943df 100644
@@ -489,7 +489,7 @@ struct prcmu_auto_pm_config {
 
 #ifdef CONFIG_MFD_DB8500_PRCMU
 
-void db8500_prcmu_early_init(void);
+void db8500_prcmu_early_init(u32 phy_base, u32 size);
 int prcmu_set_rc_a2p(enum romcode_write);
 enum romcode_read prcmu_get_rc_p2a(void);
 enum ap_pwrst prcmu_get_xp70_current_state(void);
@@ -553,7 +553,7 @@ void db8500_prcmu_write_masked(unsigned int reg, u32 mask, u32 value);
 
 #else /* !CONFIG_MFD_DB8500_PRCMU */
 
-static inline void db8500_prcmu_early_init(void) {}
+static inline void db8500_prcmu_early_init(u32 phy_base, u32 size) {}
 
 static inline int prcmu_set_rc_a2p(enum romcode_write code)
 {
include/linux/mfd/dbx500-prcmu.h +3 -3
index 3abcca9..8c546cb 100644
@@ -276,9 +276,9 @@ struct prcmu_fw_version {
 
 #if defined(CONFIG_UX500_SOC_DB8500)
 
-static inline void __init prcmu_early_init(void)
+static inline void prcmu_early_init(u32 phy_base, u32 size)
 {
-	return db8500_prcmu_early_init();
+	return db8500_prcmu_early_init(phy_base, size);
 }
 
 static inline int prcmu_set_power_state(u8 state, bool keep_ulp_clk,
@@ -500,7 +500,7 @@ static inline int prcmu_config_a9wdog(u8 num, bool sleep_auto_off)
 }
 #else
 
-static inline void __init prcmu_early_init(void) {}
+static inline void prcmu_early_init(u32 phy_base, u32 size) {}
 
 static inline int prcmu_set_power_state(u8 state, bool keep_ulp_clk,
 	bool keep_ap_pll)
Signature · 1 line
1.7.11.3
#6 lore raw

PATCH 6/14 mfd: db8500-prcmu: get base address from resource

In reply to Linus Walleij

From: Linus Walleij <[email protected]>

We cannot use a global variable stored in <mach/hardware.h> to find the base address of the PRCMU. The real resource is already there from the board, so use this to look up the base address instead.

Currently the patch is kept minimal so as not to interfere with other work being done on refactoring this driver, but at a later point the defines using (prcmu_base + 0xnnn) need to be replaced by pure offset defined for (0xnnn) and the base inlined with the readl()/writel() and similar codepaths.

---
Sam, I'm requesting an ACK for taking this through the ARM SoC tree.

---
 arch/arm/mach-ux500/cpu-db8500.c            |   2 -
 arch/arm/mach-ux500/cpu.c                   |   2 -
 arch/arm/mach-ux500/include/mach/hardware.h |   2 -
 drivers/mfd/db8500-prcmu.c                  |  47 ++++---
 drivers/mfd/dbx500-prcmu-regs.h             | 208 ++++++++++++++--------------
 5 files changed, 131 insertions(+), 130 deletions(-)
arch/arm/mach-ux500/cpu-db8500.c +0 -2
index 19235cf..8c58dff 100644
@@ -94,8 +94,6 @@ void __init u8500_map_io(void)
 		iotable_init(u9540_io_desc, ARRAY_SIZE(u9540_io_desc));
 	else
 		iotable_init(u8500_io_desc, ARRAY_SIZE(u8500_io_desc));
-
-	_PRCMU_BASE = __io_address(U8500_PRCMU_BASE);
 }
 
 static struct resource db8500_pmu_resources[] = {
arch/arm/mach-ux500/cpu.c +0 -2
index af13b6d..38459e9 100644
@@ -30,8 +30,6 @@
 #include "board-mop500.h"
 #include "id.h"
 
-void __iomem *_PRCMU_BASE;
-
 /*
  * FIXME: Should we set up the GPIO domain here?
  *
arch/arm/mach-ux500/include/mach/hardware.h +0 -2
index 5201dda..4eece2a 100644
@@ -39,8 +39,6 @@
 
 #ifndef __ASSEMBLY__
 
-extern void __iomem *_PRCMU_BASE;
-
 #define ARRAY_AND_SIZE(x)	(x), ARRAY_SIZE(x)
 
 #endif				/* __ASSEMBLY__ */
drivers/mfd/db8500-prcmu.c +29 -18

141 lines not on this page · raw message

drivers/mfd/dbx500-prcmu-regs.h +102 -106

297 lines not on this page · raw message

Signature · 1 line
1.7.11.3
#7 lore raw

PATCH 7/14 ARM: ux500: move PM-related PRCMU functions to machine

In reply to Linus Walleij

From: Linus Walleij <[email protected]>

We are trying to decompose and decentralize the code in the DB8500 PRCMU out into subdrivers. The code moved in this patch concerns a group of functions used for decoupling and recoupling the IRQs from the GIC. During sleep and idle the Ux500 system will transfer all IRQ handling to the PRCMU using these functions.

Basically we are left with the two alternatives of code placement as:

- arch/arm/mach-ux500/pm.c - this because the code is closely related to the GIC, and takes ownership of some of the registers from the PRCMU related to this PM functionality.

- drivers/mfd/db8500-prcmu-pm.c - because the code is affecting stuff in the PRCMU register range. But then this code needs to remap and handle GIC registers.

This patch implementation is taking the first approach.

Currently the cpuidle driver is the only piece of code using this set of functions, but it will later also be used by the suspend/resume code which is currently under review.

The header file is moved to:
<linux/platform_data/arm-ux500-pm.h>
The function prototypes need to be placed in a globally visible header since the CPUidle code is planned to move out to drivers/cpuidle.

---
Sam, I'm requesting an ACK for taking this through the ARM SoC tree.

---
 arch/arm/mach-ux500/Makefile               |   2 +-
 arch/arm/mach-ux500/cpu.c                  |   4 +
 arch/arm/mach-ux500/cpuidle.c              |   3 +-
 arch/arm/mach-ux500/pm.c                   | 167 +++++++++++++++++++++++++++++
 drivers/mfd/db8500-prcmu.c                 | 114 --------------------
 include/linux/mfd/db8500-prcmu.h           |   6 --
 include/linux/mfd/dbx500-prcmu.h           |  30 ------
 include/linux/platform_data/arm-ux500-pm.h |  21 ++++
 8 files changed, 195 insertions(+), 152 deletions(-)
 create mode 100644 arch/arm/mach-ux500/pm.c
 create mode 100644 include/linux/platform_data/arm-ux500-pm.h
arch/arm/mach-ux500/Makefile +1 -1
index f24710d..580a4db 100644
@@ -3,7 +3,7 @@
 #
 
 obj-y				:= cpu.o devices.o devices-common.o \
-				   id.o usb.o timer.o
+				   id.o usb.o timer.o pm.o
 obj-$(CONFIG_CPU_IDLE)          += cpuidle.o
 obj-$(CONFIG_CACHE_L2X0)	+= cache-l2x0.o
 obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o devices-db8500.o
arch/arm/mach-ux500/cpu.c +4 -0
index 38459e9..ee69439d 100644
@@ -20,6 +20,7 @@
 #include <linux/irqchip.h>
 #include <linux/irqchip/arm-gic.h>
 #include <linux/platform_data/clk-ux500.h>
+#include <linux/platform_data/arm-ux500-pm.h>
 
 #include <asm/mach/map.h>
 
@@ -68,16 +69,19 @@ void __init ux500_init_irq(void)
 	 */
 	if (cpu_is_u8500_family()) {
 		prcmu_early_init(U8500_PRCMU_BASE, SZ_8K - 1);
+		ux500_pm_init(U8500_PRCMU_BASE, SZ_8K - 1);
 		u8500_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);
 		u8500_clk_init(U8500_CLKRST1_BASE, U8500_CLKRST2_BASE,
 			       U8500_CLKRST3_BASE, U8500_CLKRST5_BASE,
 			       U8500_CLKRST6_BASE);
 	} else if (cpu_is_u8540()) {
 		prcmu_early_init(U8500_PRCMU_BASE, SZ_8K + SZ_4K - 1);
+		ux500_pm_init(U8500_PRCMU_BASE, SZ_8K + SZ_4K - 1);
 		u8540_clk_init();
 	}
 }
arch/arm/mach-ux500/cpuidle.c +2 -1
index ce91493..1e5bb66 100644
@@ -16,6 +16,7 @@
 #include <linux/atomic.h>
 #include <linux/smp.h>
 #include <linux/mfd/dbx500-prcmu.h>
+#include <linux/platform_data/arm-ux500-pm.h>
 
 #include <asm/cpuidle.h>
 #include <asm/proc-fns.h>
@@ -130,7 +131,7 @@ int __init ux500_idle_init(void)
 	int ret, cpu;
 	struct cpuidle_device *device;
 
-        /* Configure wake up reasons */
+	/* Configure wake up reasons */
 	prcmu_enable_wakeups(PRCMU_WAKEUP(ARM) | PRCMU_WAKEUP(RTC) |
 			     PRCMU_WAKEUP(ABB));
 
arch/arm/mach-ux500/pm.c new file +167 -0

167 lines not on this page · raw message

drivers/mfd/db8500-prcmu.c +0 -114

126 lines not on this page · raw message

include/linux/mfd/db8500-prcmu.h +0 -6
index ac943df..0bd6944 100644
@@ -522,12 +522,6 @@ int db8500_prcmu_load_a9wdog(u8 id, u32 val);
 void db8500_prcmu_system_reset(u16 reset_code);
 int db8500_prcmu_set_power_state(u8 state, bool keep_ulp_clk, bool keep_ap_pll);
 u8 db8500_prcmu_get_power_state_result(void);
-int db8500_prcmu_gic_decouple(void);
-int db8500_prcmu_gic_recouple(void);
-int db8500_prcmu_copy_gic_settings(void);
-bool db8500_prcmu_gic_pending_irq(void);
-bool db8500_prcmu_pending_irq(void);
-bool db8500_prcmu_is_cpu_in_wfi(int cpu);
 void db8500_prcmu_enable_wakeups(u32 wakeups);
 int db8500_prcmu_set_epod(u16 epod_id, u8 epod_state);
 int db8500_prcmu_request_clock(u8 clock, bool enable);
include/linux/mfd/dbx500-prcmu.h +0 -30
index 8c546cb..fc43cec 100644
@@ -293,36 +293,6 @@ static inline u8 prcmu_get_power_state_result(void)
 	return db8500_prcmu_get_power_state_result();
 }
 
-static inline int prcmu_gic_decouple(void)
-{
-	return db8500_prcmu_gic_decouple();
-}
-
-static inline int prcmu_gic_recouple(void)
-{
-	return db8500_prcmu_gic_recouple();
-}
-
-static inline bool prcmu_gic_pending_irq(void)
-{
-	return db8500_prcmu_gic_pending_irq();
-}
-
-static inline bool prcmu_is_cpu_in_wfi(int cpu)
-{
-	return db8500_prcmu_is_cpu_in_wfi(cpu);
-}
-
-static inline int prcmu_copy_gic_settings(void)
-{
-	return db8500_prcmu_copy_gic_settings();
-}
-
-static inline bool prcmu_pending_irq(void)
-{
-	return db8500_prcmu_pending_irq();
-}
-
 static inline int prcmu_set_epod(u16 epod_id, u8 epod_state)
 {
 	return db8500_prcmu_set_epod(epod_id, epod_state);
include/linux/platform_data/arm-ux500-pm.h new file +21 -0
new file mode 100644
index 0000000..8dff64b
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2010-2013
+ * Author: Rickard Andersson <[email protected]> for
+ *         ST-Ericsson.
+ * Author: Daniel Lezcano <[email protected]> for Linaro.
+ * License terms: GNU General Public License (GPL) version 2
+ *
+ */
+
+#ifndef ARM_UX500_PM_H
+#define ARM_UX500_PM_H
+
+int prcmu_gic_decouple(void);
+int prcmu_gic_recouple(void);
+bool prcmu_gic_pending_irq(void);
+bool prcmu_pending_irq(void);
+bool prcmu_is_cpu_in_wfi(int cpu);
+int prcmu_copy_gic_settings(void);
+void ux500_pm_init(u32 phy_base, u32 size);
+
+#endif /* ARM_UX500_PM_H */
Signature · 1 line
1.7.11.3
#8 lore raw

PATCH 8/14 ARM: ux500: make debug macro stand-alone

In reply to Linus Walleij

From: Linus Walleij <[email protected]>

This pushes the knowledge of physical addresses down into the debug macro so we can get rid of the <mach/hardware.h> dependency.

---
 arch/arm/include/debug/ux500.S | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)
arch/arm/include/debug/ux500.S +16 -7
index 6703522..2848857 100644
@@ -8,7 +8,7 @@
  * published by the Free Software Foundation.
  *
  */
-#include <mach/hardware.h>
+
 
 #if CONFIG_UX500_DEBUG_UART > 2
 #error Invalid Ux500 debug UART
@@ -21,19 +21,28 @@
  */
 
 #ifdef CONFIG_UX500_SOC_DB8500
-#define __UX500_UART(n)	U8500_UART##n##_BASE
+#define U8500_UART0_PHYS_BASE	(0x80120000)
+#define U8500_UART1_PHYS_BASE	(0x80121000)
+#define U8500_UART2_PHYS_BASE	(0x80007000)
+#define U8500_UART0_VIRT_BASE	(0xa8120000)
+#define U8500_UART1_VIRT_BASE	(0xa8121000)
+#define U8500_UART2_VIRT_BASE	(0xa8007000)
+#define __UX500_PHYS_UART(n)	U8500_UART##n##_PHYS_BASE
+#define __UX500_VIRT_UART(n)	U8500_UART##n##_VIRT_BASE
 #endif
 
-#ifndef __UX500_UART
+#if !defined(__UX500_PHYS_UART) || !defined(__UX500_VIRT_UART)
 #error Unknown SOC
 #endif
 
-#define UX500_UART(n)	__UX500_UART(n)
-#define UART_BASE	UX500_UART(CONFIG_UX500_DEBUG_UART)
+#define UX500_PHYS_UART(n)	__UX500_PHYS_UART(n)
+#define UX500_VIRT_UART(n)	__UX500_VIRT_UART(n)
+#define UART_PHYS_BASE	UX500_PHYS_UART(CONFIG_UX500_DEBUG_UART)
+#define UART_VIRT_BASE	UX500_VIRT_UART(CONFIG_UX500_DEBUG_UART)
 
 	.macro	addruart, rp, rv, tmp
-	ldr	\rp, =UART_BASE				@ no, physical address
-	ldr	\rv, =IO_ADDRESS(UART_BASE)		@ yes, virtual address
+	ldr	\rp, =UART_PHYS_BASE		@ no, physical address
+	ldr	\rv, =UART_VIRT_BASE		@ yes, virtual address
 	.endm
 
 #include <asm/hardware/debug-pl01x.S>
Signature · 1 line
1.7.11.3
#9 lore raw

PATCH 9/14 ARM: ux500: get rid of <mach/[hardware|db8500-regs].h>

In reply to Linus Walleij

From: Linus Walleij <[email protected]>

This removes <mach/hardware.h> and <mach/db8500-regs.h> from the Ux500, merging them into the local include "db8500-regs.h" in mach-ux500. There is some impact outside the ux500 machine, but most of it is dealt with in earlier patches.

Contains portions of a clean-up patch from Arnd Bergmann.

---
ChangeLog v1->v2:
- Remove erroneous hunk adding the GIC distbase as resource to the PRCMU. This was done away with in the previous patch.
- Split debug-macro portions into a separate patch.

Sam: seeking your ACKs to take this through ARM SoC.

---
 arch/arm/mach-ux500/board-mop500-audio.c           |  1 -
 arch/arm/mach-ux500/board-mop500-pins.c            |  2 -
 arch/arm/mach-ux500/board-mop500-sdi.c             |  2 +-
 arch/arm/mach-ux500/board-mop500-uib.c             |  1 -
 arch/arm/mach-ux500/board-mop500.c                 |  2 +-
 arch/arm/mach-ux500/cache-l2x0.c                   |  2 +-
 arch/arm/mach-ux500/cpu-db8500.c                   |  4 +-
 arch/arm/mach-ux500/cpu.c                          |  2 +-
 arch/arm/mach-ux500/cpuidle.c                      |  2 +
 .../mach-ux500/{include/mach => }/db8500-regs.h    | 28 ++++++++++++++
 arch/arm/mach-ux500/devices-common.c               |  1 -
 arch/arm/mach-ux500/devices-db8500.c               |  2 +-
 arch/arm/mach-ux500/devices-db8500.h               |  1 +
 arch/arm/mach-ux500/devices.c                      |  3 +-
 arch/arm/mach-ux500/id.c                           |  2 +-
 arch/arm/mach-ux500/include/mach/hardware.h        | 45 ----------------------
 arch/arm/mach-ux500/include/mach/irqs.h            |  2 -
 arch/arm/mach-ux500/include/mach/uncompress.h      |  3 +-
 arch/arm/mach-ux500/platsmp.c                      |  2 +-
 arch/arm/mach-ux500/pm.c                           |  2 +-
 arch/arm/mach-ux500/timer.c                        |  2 +-
 arch/arm/mach-ux500/usb.c                          |  2 +-
 drivers/clk/ux500/clk-prcc.c                       |  1 -
 drivers/clocksource/clksrc-dbx500-prcmu.c          |  1 -
 drivers/crypto/ux500/cryp/cryp.c                   |  2 -
 drivers/crypto/ux500/cryp/cryp_core.c              |  1 -
 drivers/crypto/ux500/hash/hash_core.c              |  1 -
 drivers/mfd/db8500-prcmu.c                         |  2 -
 drivers/mfd/dbx500-prcmu-regs.h                    | 22 -----------
 sound/soc/ux500/mop500_ab8500.c                    |  2 -
 sound/soc/ux500/ux500_msp_dai.c                    |  2 -
 sound/soc/ux500/ux500_msp_i2s.c                    |  2 -
 32 files changed, 46 insertions(+), 103 deletions(-)
 rename arch/arm/mach-ux500/{include/mach => }/db8500-regs.h (88%)
 delete mode 100644 arch/arm/mach-ux500/include/mach/hardware.h
arch/arm/mach-ux500/board-mop500-audio.c +0 -1
index 43bbee1..96e62ef 100644
@@ -11,7 +11,6 @@
 #include <linux/platform_data/dma-ste-dma40.h>
 
 #include <mach/devices.h>
-#include <mach/hardware.h>
 #include <mach/irqs.h>
 #include <linux/platform_data/asoc-ux500-msp.h>
 
arch/arm/mach-ux500/board-mop500-pins.c +0 -2
index 0a3f30d..f3976f9 100644
@@ -13,8 +13,6 @@
 
 #include <asm/mach-types.h>
 
-#include <mach/hardware.h>
-
 #include "pins-db8500.h"
 #include "board-mop500.h"
 
arch/arm/mach-ux500/board-mop500-sdi.c +1 -1
index 051b62c..0ada767 100644
@@ -15,8 +15,8 @@
 
 #include <asm/mach-types.h>
 #include <mach/devices.h>
-#include <mach/hardware.h>
 
+#include "db8500-regs.h"
 #include "devices-db8500.h"
 #include "board-mop500.h"
 #include "ste-dma40-db8500.h"
arch/arm/mach-ux500/board-mop500-uib.c +0 -1
index 7037d36..bdaa422 100644
@@ -11,7 +11,6 @@
 #include <linux/init.h>
 #include <linux/i2c.h>
 
-#include <mach/hardware.h>
 #include "board-mop500.h"
 #include "id.h"
 
arch/arm/mach-ux500/board-mop500.c +1 -1
index b034578..caad80e 100644
@@ -41,13 +41,13 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <mach/hardware.h>
 #include <mach/setup.h>
 #include <mach/devices.h>
 #include <mach/irqs.h>
 #include <linux/platform_data/crypto-ux500.h>
 
 #include "ste-dma40-db8500.h"
+#include "db8500-regs.h"
 #include "devices-db8500.h"
 #include "board-mop500.h"
 #include "board-mop500-regulators.h"
arch/arm/mach-ux500/cache-l2x0.c +1 -1
index 1c1609d..e12cc92 100644
@@ -9,8 +9,8 @@
 
 #include <asm/cacheflush.h>
 #include <asm/hardware/cache-l2x0.h>
-#include <mach/hardware.h>
 
+#include "db8500-regs.h"
 #include "id.h"
 
 static void __iomem *l2x0_base;
arch/arm/mach-ux500/cpu-db8500.c +1 -3
index 8c58dff..d726c06 100644
@@ -28,15 +28,13 @@
 #include <asm/mach/map.h>
 #include <asm/mach/arch.h>
 
-#include <mach/hardware.h>
 #include <mach/setup.h>
 #include <mach/devices.h>
-#include <mach/db8500-regs.h>
 #include <mach/irqs.h>
 
 #include "devices-db8500.h"
 #include "ste-dma40-db8500.h"
-
+#include "db8500-regs.h"
 #include "board-mop500.h"
 #include "id.h"
 
arch/arm/mach-ux500/cpu.c +1 -1
index ee69439d..aa14c5f 100644
@@ -24,11 +24,11 @@
 
 #include <asm/mach/map.h>
 
-#include <mach/hardware.h>
 #include <mach/setup.h>
 #include <mach/devices.h>
 
 #include "board-mop500.h"
+#include "db8500-regs.h"
 #include "id.h"
 
 /*
arch/arm/mach-ux500/cpuidle.c +2 -0
index 1e5bb66..654115a 100644
@@ -21,6 +21,8 @@
 #include <asm/cpuidle.h>
 #include <asm/proc-fns.h>
 
+#include "db8500-regs.h"
+
 static atomic_t master = ATOMIC_INIT(0);
 static DEFINE_SPINLOCK(master_lock);
 static DEFINE_PER_CPU(struct cpuidle_device, ux500_cpuidle_device);
arch/arm/mach-ux500/db8500-regs.h renamed from arch/arm/mach-ux500/include/mach/db8500-regs.h +28 -0
similarity index 88%
rename from arch/arm/mach-ux500/include/mach/db8500-regs.h
rename to arch/arm/mach-ux500/db8500-regs.h
index 1530d49..b2d7a0b 100644
@@ -170,4 +170,32 @@
 /* SoC identification number information */
 #define U8500_BB_UID_BASE      (U8500_BACKUPRAM1_BASE + 0xFC0)
 
+/* Offsets to specific addresses in some IP blocks for DMA */
+#define MSP_TX_RX_REG_OFFSET	0
+#define CRYP1_RX_REG_OFFSET	0x10
+#define CRYP1_TX_REG_OFFSET	0x8
+#define HASH1_TX_REG_OFFSET	0x4
+
+/*
+ * Macros to get at IO space when running virtually
+ * We dont map all the peripherals, let ioremap do
+ * this for us. We map only very basic peripherals here.
+ */
+#define U8500_IO_VIRTUAL	0xf0000000
+#define U8500_IO_PHYSICAL	0xa0000000
+/* This is where we map in the ROM to check ASIC IDs */
+#define UX500_VIRT_ROM		0xf0000000
+
+/* This macro is used in assembly, so no cast */
+#define IO_ADDRESS(x)           \
+	(((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + U8500_IO_VIRTUAL)
+
+/* typesafe io address */
+#define __io_address(n)		IOMEM(IO_ADDRESS(n))
+
+/* Used by some plat-nomadik code */
+#define io_p2v(n)		__io_address(n)
+
+#define ARRAY_AND_SIZE(x)	(x), ARRAY_SIZE(x)
+
 #endif
arch/arm/mach-ux500/devices-common.c +0 -1
index 16b5f71..94868b7 100644
@@ -13,7 +13,6 @@
 #include <linux/platform_device.h>
 #include <linux/platform_data/pinctrl-nomadik.h>
 
-#include <mach/hardware.h>
 #include <mach/irqs.h>
 
 #include "devices-common.h"
arch/arm/mach-ux500/devices-db8500.c +1 -1
index f3d9419..38467bf 100644
@@ -15,10 +15,10 @@
 #include <linux/platform_data/dma-ste-dma40.h>
 #include <linux/mfd/dbx500-prcmu.h>
 
-#include <mach/hardware.h>
 #include <mach/setup.h>
 #include <mach/irqs.h>
 
+#include "db8500-regs.h"
 #include "devices-db8500.h"
 #include "ste-dma40-db8500.h"
 
arch/arm/mach-ux500/devices-db8500.h +1 -0
index dbcb35c..c9db210 100644
@@ -10,6 +10,7 @@
 
 #include <linux/platform_data/usb-musb-ux500.h>
 #include <mach/irqs.h>
+#include "db8500-regs.h"
 #include "devices-common.h"
 
 struct ske_keypad_platform_data;
arch/arm/mach-ux500/devices.c +2 -1
index ea0a2f9..f63a512 100644
@@ -11,9 +11,10 @@
 #include <linux/io.h>
 #include <linux/amba/bus.h>
 
-#include <mach/hardware.h>
 #include <mach/setup.h>
 
+#include "db8500-regs.h"
+
 void __init amba_add_devices(struct amba_device *devs[], int num)
 {
 	int i;
arch/arm/mach-ux500/id.c +1 -1
index 9f95184..a847cf2 100644
@@ -14,9 +14,9 @@
 #include <asm/cacheflush.h>
 #include <asm/mach/map.h>
 
-#include <mach/hardware.h>
 #include <mach/setup.h>
 
+#include "db8500-regs.h"
 #include "id.h"
 
 struct dbx500_asic_id dbx500_id;
arch/arm/mach-ux500/include/mach/hardware.h deleted +0 -45

45 lines not on this page · raw message

arch/arm/mach-ux500/include/mach/irqs.h +0 -2
index fc77b42..829947d 100644
@@ -10,8 +10,6 @@
 #ifndef ASM_ARCH_IRQS_H
 #define ASM_ARCH_IRQS_H
 
-#include <mach/hardware.h>
-
 #define IRQ_LOCALTIMER			29
 #define IRQ_LOCALWDOG			30
 
arch/arm/mach-ux500/include/mach/uncompress.h +2 -1
index 36969d5..533a004 100644
@@ -22,7 +22,8 @@
 #include <asm/mach-types.h>
 #include <linux/io.h>
 #include <linux/amba/serial.h>
-#include <mach/hardware.h>
+/* TODO: This goes away in multiplatform boot, this file gets deleted */
+#include "../../db8500-regs.h"
 
 void __iomem *ux500_uart_base;
 
arch/arm/mach-ux500/platsmp.c +1 -1
index 18f7af3..8a9c070 100644
@@ -22,9 +22,9 @@
 #include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
 
-#include <mach/hardware.h>
 #include <mach/setup.h>
 
+#include "db8500-regs.h"
 #include "id.h"
 
 /* This is called from headsmp.S to wakeup the secondary core */
arch/arm/mach-ux500/pm.c +1 -1
index 6949a13..1a468f0 100644
@@ -13,7 +13,7 @@
 #include <linux/io.h>
 #include <linux/platform_data/arm-ux500-pm.h>
 
-#include <mach/hardware.h>
+#include "db8500-regs.h"
 
 /* ARM WFI Standby signal register */
 #define PRCM_ARM_WFI_STANDBY    (prcmu_base + 0x130)
arch/arm/mach-ux500/timer.c +1 -1
index a6af0b8..5b91fac 100644
@@ -14,9 +14,9 @@
 #include <asm/smp_twd.h>
 
 #include <mach/setup.h>
-#include <mach/hardware.h>
 #include <mach/irqs.h>
 
+#include "db8500-regs.h"
 #include "id.h"
 
 #ifdef CONFIG_HAVE_ARM_TWD
arch/arm/mach-ux500/usb.c +1 -1
index 78ac65f..2dfc72f 100644
@@ -10,7 +10,7 @@
 #include <linux/platform_data/usb-musb-ux500.h>
 #include <linux/platform_data/dma-ste-dma40.h>
 
-#include <mach/hardware.h>
+#include "db8500-regs.h"
 
 #define MUSB_DMA40_RX_CH { \
 		.mode = STEDMA40_MODE_LOGICAL, \
drivers/clk/ux500/clk-prcc.c +0 -1
index 7eee7f7..bd4769a 100644
@@ -13,7 +13,6 @@
 #include <linux/io.h>
 #include <linux/err.h>
 #include <linux/types.h>
-#include <mach/hardware.h>
 
 #include "clk.h"
 
drivers/clocksource/clksrc-dbx500-prcmu.c +0 -1
index c26c369..4f34093 100644
@@ -18,7 +18,6 @@
 #include <asm/sched_clock.h>
 
 #include <mach/setup.h>
-#include <mach/hardware.h>
 
 #define RATE_32K		32768
 
drivers/crypto/ux500/cryp/cryp.c +0 -2
index e208cea..3eafa90 100644
@@ -12,8 +12,6 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 
-#include <mach/hardware.h>
-
 #include "cryp_p.h"
 #include "cryp.h"
 
drivers/crypto/ux500/cryp/cryp_core.c +0 -1
index 8bc5fef..2809b19 100644
@@ -32,7 +32,6 @@
 #include <crypto/scatterwalk.h>
 
 #include <linux/platform_data/crypto-ux500.h>
-#include <mach/hardware.h>
 
 #include "cryp_p.h"
 #include "cryp.h"
drivers/crypto/ux500/hash/hash_core.c +0 -1
index 632c333..1827e9f 100644
@@ -32,7 +32,6 @@
 #include <crypto/algapi.h>
 
 #include <linux/platform_data/crypto-ux500.h>
-#include <mach/hardware.h>
 
 #include "hash_alg.h"
 
drivers/mfd/db8500-prcmu.c +0 -2
index 2d3a5f6..03e2aed 100644
@@ -33,9 +33,7 @@
 #include <linux/regulator/machine.h>
 #include <linux/cpufreq.h>
 #include <linux/platform_data/ux500_wdt.h>
-#include <mach/hardware.h>
 #include <mach/irqs.h>
-#include <mach/db8500-regs.h>
 #include "dbx500-prcmu-regs.h"
 
 /* Index of different voltages to be used when accessing AVSData */
drivers/mfd/dbx500-prcmu-regs.h +0 -22
index 439254d..d14836e 100644
@@ -74,33 +74,11 @@
 #define PRCM_A9PL_FORCE_CLKEN_PRCM_A9PL_FORCE_CLKEN BIT(0)
 #define PRCM_A9PL_FORCE_CLKEN_PRCM_A9AXI_FORCE_CLKEN BIT(1)
 
-/* ARM WFI Standby signal register */
-#define PRCM_ARM_WFI_STANDBY    (prcmu_base + 0x130)
-#define PRCM_ARM_WFI_STANDBY_WFI0               0x08
-#define PRCM_ARM_WFI_STANDBY_WFI1               0x10
-#define PRCM_IOCR		(prcmu_base + 0x310)
-#define PRCM_IOCR_IOFORCE			0x1
-
 /* CPU mailbox registers */
 #define PRCM_MBOX_CPU_VAL	(prcmu_base + 0x0fc)
 #define PRCM_MBOX_CPU_SET	(prcmu_base + 0x100)
 #define PRCM_MBOX_CPU_CLR	(prcmu_base + 0x104)
 
-/* Dual A9 core interrupt management unit registers */
-#define PRCM_A9_MASK_REQ	(prcmu_base + 0x328)
-#define PRCM_A9_MASK_REQ_PRCM_A9_MASK_REQ	0x1
-
-#define PRCM_A9_MASK_ACK	(prcmu_base + 0x32c)
-#define PRCM_ARMITMSK31TO0	(prcmu_base + 0x11c)
-#define PRCM_ARMITMSK63TO32	(prcmu_base + 0x120)
-#define PRCM_ARMITMSK95TO64	(prcmu_base + 0x124)
-#define PRCM_ARMITMSK127TO96	(prcmu_base + 0x128)
-#define PRCM_POWER_STATE_VAL	(prcmu_base + 0x25C)
-#define PRCM_ARMITVAL31TO0	(prcmu_base + 0x260)
-#define PRCM_ARMITVAL63TO32	(prcmu_base + 0x264)
-#define PRCM_ARMITVAL95TO64	(prcmu_base + 0x268)
-#define PRCM_ARMITVAL127TO96	(prcmu_base + 0x26C)
-
 #define PRCM_HOSTACCESS_REQ	(prcmu_base + 0x334)
 #define PRCM_HOSTACCESS_REQ_HOSTACCESS_REQ 0x1
 #define PRCM_HOSTACCESS_REQ_WAKE_REQ	BIT(16)
sound/soc/ux500/mop500_ab8500.c +0 -2
index 78cce23..892ad9a 100644
@@ -17,8 +17,6 @@
 #include <linux/io.h>
 #include <linux/clk.h>
 
-#include <mach/hardware.h>
-
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 #include <sound/pcm.h>
sound/soc/ux500/ux500_msp_dai.c +0 -2
index 0d9713e..54028cf 100644
@@ -21,8 +21,6 @@
 #include <linux/mfd/dbx500-prcmu.h>
 #include <linux/platform_data/asoc-ux500-msp.h>
 
-#include <mach/hardware.h>
-
 #include <sound/soc.h>
 #include <sound/soc-dai.h>
 
sound/soc/ux500/ux500_msp_i2s.c +0 -2
index a582007..f2db6c9 100644
@@ -22,8 +22,6 @@
 #include <linux/of.h>
 #include <linux/platform_data/asoc-ux500-msp.h>
 
-#include <mach/hardware.h>
-
 #include <sound/soc.h>
 
 #include "ux500_msp_i2s.h"
Signature · 1 line
1.7.11.3
#10 lore raw

PATCH 10/14 ARM: ux500: split out prcmu initialization

In reply to Linus Walleij

From: Arnd Bergmann <[email protected]>

This untangles the final bits of the prcmu code from the platform code:

* The IRQ_PRCMU_* definitions move from irqs-db8500.h into prcmu.c because they are only of local significance.
* u8500_thsens_device goes into the prcmu, because it uses a PRCMU IRQ that the platform does not see.
* IRQ_DB8500_AB8500 and IRQ_PRCMU_BASE go into the platform data because the PRCMU does not see it.

[Fixed a oneliner bug]
---
 arch/arm/mach-ux500/board-mop500.c             |  58 ----------
 arch/arm/mach-ux500/devices-db8500.c           |   2 +
 arch/arm/mach-ux500/include/mach/irqs-db8500.h |  25 -----
 drivers/mfd/db8500-prcmu.c                     | 142 +++++++++++++++++++------
 include/linux/mfd/dbx500-prcmu.h               |   2 +
 5 files changed, 116 insertions(+), 113 deletions(-)
arch/arm/mach-ux500/board-mop500.c +0 -58
index caad80e..e1b38ef 100644
@@ -206,63 +206,6 @@ struct ab8500_platform_data ab8500_platdata = {
 	.codec		= &ab8500_codec_pdata,
 };
 
-/*
- * Thermal Sensor
- */
-
-static struct resource db8500_thsens_resources[] = {
-	{
-		.name = "IRQ_HOTMON_LOW",
-		.start  = IRQ_PRCMU_HOTMON_LOW,
-		.end    = IRQ_PRCMU_HOTMON_LOW,
-		.flags  = IORESOURCE_IRQ,
-	},
-	{
-		.name = "IRQ_HOTMON_HIGH",
-		.start  = IRQ_PRCMU_HOTMON_HIGH,
-		.end    = IRQ_PRCMU_HOTMON_HIGH,
-		.flags  = IORESOURCE_IRQ,
-	},
-};
-
-static struct db8500_thsens_platform_data db8500_thsens_data = {
-	.trip_points[0] = {
-		.temp = 70000,
-		.type = THERMAL_TRIP_ACTIVE,
-		.cdev_name = {
-			[0] = "thermal-cpufreq-0",
-		},
-	},
-	.trip_points[1] = {
-		.temp = 75000,
-		.type = THERMAL_TRIP_ACTIVE,
-		.cdev_name = {
-			[0] = "thermal-cpufreq-0",
-		},
-	},
-	.trip_points[2] = {
-		.temp = 80000,
-		.type = THERMAL_TRIP_ACTIVE,
-		.cdev_name = {
-			[0] = "thermal-cpufreq-0",
-		},
-	},
-	.trip_points[3] = {
-		.temp = 85000,
-		.type = THERMAL_TRIP_CRITICAL,
-	},
-	.num_trips = 4,
-};
-
-static struct platform_device u8500_thsens_device = {
-	.name           = "db8500-thermal",
-	.resource       = db8500_thsens_resources,
-	.num_resources  = ARRAY_SIZE(db8500_thsens_resources),
-	.dev	= {
-		.platform_data	= &db8500_thsens_data,
-	},
-};
-
 static struct platform_device u8500_cpufreq_cooling_device = {
 	.name           = "db8500-cpufreq-cooling",
 };
@@ -622,7 +565,6 @@ static struct platform_device *snowball_platform_devs[] __initdata = {
 	&snowball_key_dev,
 	&snowball_sbnet_dev,
 	&snowball_gpio_en_3v3_regulator_dev,
-	&u8500_thsens_device,
 	&u8500_cpufreq_cooling_device,
 };
 
arch/arm/mach-ux500/devices-db8500.c +2 -0
index 38467bf..4c0ef14 100644
@@ -199,6 +199,8 @@ struct platform_device u8500_ske_keypad_device = {
 
 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,
 };
arch/arm/mach-ux500/include/mach/irqs-db8500.h +0 -25
index 68bc149..f3a9d59 100644
@@ -109,31 +109,6 @@
 
 /* Virtual interrupts corresponding to the PRCMU wakeups.  */
 #define IRQ_PRCMU_BASE IRQ_SOC_START
-#define NUM_PRCMU_WAKEUPS (IRQ_PRCMU_END - IRQ_PRCMU_BASE)
-
-#define IRQ_PRCMU_RTC (IRQ_PRCMU_BASE)
-#define IRQ_PRCMU_RTT0 (IRQ_PRCMU_BASE + 1)
-#define IRQ_PRCMU_RTT1 (IRQ_PRCMU_BASE + 2)
-#define IRQ_PRCMU_HSI0 (IRQ_PRCMU_BASE + 3)
-#define IRQ_PRCMU_HSI1 (IRQ_PRCMU_BASE + 4)
-#define IRQ_PRCMU_CA_WAKE (IRQ_PRCMU_BASE + 5)
-#define IRQ_PRCMU_USB (IRQ_PRCMU_BASE + 6)
-#define IRQ_PRCMU_ABB (IRQ_PRCMU_BASE + 7)
-#define IRQ_PRCMU_ABB_FIFO (IRQ_PRCMU_BASE + 8)
-#define IRQ_PRCMU_ARM (IRQ_PRCMU_BASE + 9)
-#define IRQ_PRCMU_MODEM_SW_RESET_REQ (IRQ_PRCMU_BASE + 10)
-#define IRQ_PRCMU_GPIO0 (IRQ_PRCMU_BASE + 11)
-#define IRQ_PRCMU_GPIO1 (IRQ_PRCMU_BASE + 12)
-#define IRQ_PRCMU_GPIO2 (IRQ_PRCMU_BASE + 13)
-#define IRQ_PRCMU_GPIO3 (IRQ_PRCMU_BASE + 14)
-#define IRQ_PRCMU_GPIO4 (IRQ_PRCMU_BASE + 15)
-#define IRQ_PRCMU_GPIO5 (IRQ_PRCMU_BASE + 16)
-#define IRQ_PRCMU_GPIO6 (IRQ_PRCMU_BASE + 17)
-#define IRQ_PRCMU_GPIO7 (IRQ_PRCMU_BASE + 18)
-#define IRQ_PRCMU_GPIO8 (IRQ_PRCMU_BASE + 19)
-#define IRQ_PRCMU_CA_SLEEP (IRQ_PRCMU_BASE + 20)
-#define IRQ_PRCMU_HOTMON_LOW (IRQ_PRCMU_BASE + 21)
-#define IRQ_PRCMU_HOTMON_HIGH (IRQ_PRCMU_BASE + 22)
 #define IRQ_PRCMU_END (IRQ_PRCMU_BASE + 23)
 
 /*
drivers/mfd/db8500-prcmu.c +112 -30

216 lines not on this page · raw message

include/linux/mfd/dbx500-prcmu.h +2 -0
index fc43cec..689e6a0 100644
@@ -237,6 +237,8 @@ struct prcmu_pdata
 	bool enable_set_ddr_opp;
 	bool enable_ape_opp_100_voltage;
 	struct ab8500_platform_data *ab_platdata;
+	int ab_irq;
+	int irq_base;
 	u32 version_offset;
 	u32 legacy_offset;
 	u32 adt_offset;
Signature · 1 line
1.7.11.3
#11 lore raw

PATCH 11/14 ARM: ux500: make irqs.h local to platform

In reply to Linus Walleij

From: Arnd Bergmann <[email protected]>

With the PRCMU out of the way, nothing outside of mach-ux500 uses mach/irqs.h any more, so we can make it a local header file, including the two sub-headers.

---
 arch/arm/mach-ux500/board-mop500-audio.c                   | 2 +-
 arch/arm/mach-ux500/board-mop500-u8500uib.c                | 2 +-
 arch/arm/mach-ux500/board-mop500.c                         | 2 +-
 arch/arm/mach-ux500/board-mop500.h                         | 2 +-
 arch/arm/mach-ux500/cpu-db8500.c                           | 2 +-
 arch/arm/mach-ux500/devices-common.c                       | 2 +-
 arch/arm/mach-ux500/devices-db8500.c                       | 2 +-
 arch/arm/mach-ux500/devices-db8500.h                       | 2 +-
 arch/arm/mach-ux500/{include/mach => }/irqs-board-mop500.h | 0
 arch/arm/mach-ux500/{include/mach => }/irqs-db8500.h       | 0
 arch/arm/mach-ux500/{include/mach => }/irqs.h              | 4 ++--
 arch/arm/mach-ux500/timer.c                                | 2 +-
 12 files changed, 11 insertions(+), 11 deletions(-)
 rename arch/arm/mach-ux500/{include/mach => }/irqs-board-mop500.h (100%)
 rename arch/arm/mach-ux500/{include/mach => }/irqs-db8500.h (100%)
 rename arch/arm/mach-ux500/{include/mach => }/irqs.h (95%)
arch/arm/mach-ux500/board-mop500-audio.c +1 -1
index 96e62ef..def0637 100644
@@ -11,7 +11,7 @@
 #include <linux/platform_data/dma-ste-dma40.h>
 
 #include <mach/devices.h>
-#include <mach/irqs.h>
+#include "irqs.h"
 #include <linux/platform_data/asoc-ux500-msp.h>
 
 #include "ste-dma40-db8500.h"
arch/arm/mach-ux500/board-mop500-u8500uib.c +1 -1
index 0b5e14a..d397c19 100644
@@ -12,7 +12,7 @@
 #include <linux/mfd/tc3589x.h>
 #include <linux/input/matrix_keypad.h>
 
-#include <mach/irqs.h>
+#include "irqs.h"
 
 #include "board-mop500.h"
 
arch/arm/mach-ux500/board-mop500.c +1 -1
index e1b38ef..6e8ee11 100644
@@ -43,7 +43,7 @@
 
 #include <mach/setup.h>
 #include <mach/devices.h>
-#include <mach/irqs.h>
+#include "irqs.h"
 #include <linux/platform_data/crypto-ux500.h>
 
 #include "ste-dma40-db8500.h"
arch/arm/mach-ux500/board-mop500.h +1 -1
index eb81caf1..16bf1ac 100644
@@ -8,7 +8,7 @@
 #define __BOARD_MOP500_H
 
 /* For NOMADIK_NR_GPIO */
-#include <mach/irqs.h>
+#include "irqs.h"
 #include <linux/platform_data/asoc-ux500-msp.h>
 #include <linux/amba/mmci.h>
 
arch/arm/mach-ux500/cpu-db8500.c +1 -1
index d726c06..e11f87d 100644
@@ -30,7 +30,7 @@
 
 #include <mach/setup.h>
 #include <mach/devices.h>
-#include <mach/irqs.h>
+#include "irqs.h"
 
 #include "devices-db8500.h"
 #include "ste-dma40-db8500.h"
arch/arm/mach-ux500/devices-common.c +1 -1
index 94868b7..f71b3d7 100644
@@ -13,7 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/platform_data/pinctrl-nomadik.h>
 
-#include <mach/irqs.h>
+#include "irqs.h"
 
 #include "devices-common.h"
 
arch/arm/mach-ux500/devices-db8500.c +1 -1
index 4c0ef14..45ec955 100644
@@ -16,7 +16,7 @@
 #include <linux/mfd/dbx500-prcmu.h>
 
 #include <mach/setup.h>
-#include <mach/irqs.h>
+#include "irqs.h"
 
 #include "db8500-regs.h"
 #include "devices-db8500.h"
arch/arm/mach-ux500/devices-db8500.h +1 -1
index c9db210..3219983 100644
@@ -9,7 +9,7 @@
 #define __DEVICES_DB8500_H
 
 #include <linux/platform_data/usb-musb-ux500.h>
-#include <mach/irqs.h>
+#include "irqs.h"
 #include "db8500-regs.h"
 #include "devices-common.h"
 
arch/arm/mach-ux500/irqs-board-mop500.h renamed from arch/arm/mach-ux500/include/mach/irqs-board-mop500.h +0 -0
similarity index 100%
rename from arch/arm/mach-ux500/include/mach/irqs-board-mop500.h
rename to arch/arm/mach-ux500/irqs-board-mop500.h
arch/arm/mach-ux500/irqs-db8500.h renamed from arch/arm/mach-ux500/include/mach/irqs-db8500.h +0 -0
similarity index 100%
rename from arch/arm/mach-ux500/include/mach/irqs-db8500.h
rename to arch/arm/mach-ux500/irqs-db8500.h
arch/arm/mach-ux500/irqs.h renamed from arch/arm/mach-ux500/include/mach/irqs.h +2 -2
similarity index 95%
rename from arch/arm/mach-ux500/include/mach/irqs.h
rename to arch/arm/mach-ux500/irqs.h
index 829947d..15b2af6 100644
@@ -34,14 +34,14 @@
 /* This will be overridden by SoC-specific irq headers */
 #define IRQ_SOC_END		IRQ_SOC_START
 
-#include <mach/irqs-db8500.h>
+#include "irqs-db8500.h"
 
 #define IRQ_BOARD_START		IRQ_SOC_END
 /* This will be overridden by board-specific irq headers */
 #define IRQ_BOARD_END		IRQ_BOARD_START
 
 #ifdef CONFIG_MACH_MOP500
-#include <mach/irqs-board-mop500.h>
+#include "irqs-board-mop500.h"
 #endif
 
 #define UX500_NR_IRQS		IRQ_BOARD_END
arch/arm/mach-ux500/timer.c +1 -1
index 5b91fac..2dbbaef 100644
@@ -14,7 +14,7 @@
 #include <asm/smp_twd.h>
 
 #include <mach/setup.h>
-#include <mach/irqs.h>
+#include "irqs.h"
 
 #include "db8500-regs.h"
 #include "id.h"
Signature · 1 line
1.7.11.3
#12 lore raw

PATCH 12/14 ARM: ux500: make remaining headers local

In reply to Linus Walleij

From: Arnd Bergmann <[email protected]>

mach/setup.h and mach/devices.h are only needed from inside of mach-ux500 now, so we can simply move them out of the include/mach directory.

---
 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               | 4 ++--
 arch/arm/mach-ux500/cpu-db8500.c                 | 4 ++--
 arch/arm/mach-ux500/cpu.c                        | 4 ++--
 arch/arm/mach-ux500/devices-db8500.c             | 2 +-
 arch/arm/mach-ux500/devices.c                    | 2 +-
 arch/arm/mach-ux500/{include/mach => }/devices.h | 0
 arch/arm/mach-ux500/hotplug.c                    | 2 +-
 arch/arm/mach-ux500/id.c                         | 2 +-
 arch/arm/mach-ux500/platsmp.c                    | 2 +-
 arch/arm/mach-ux500/{include/mach => }/setup.h   | 0
 arch/arm/mach-ux500/timer.c                      | 2 +-
 drivers/clocksource/clksrc-dbx500-prcmu.c        | 2 --
 14 files changed, 14 insertions(+), 16 deletions(-)
 rename arch/arm/mach-ux500/{include/mach => }/devices.h (100%)
 rename arch/arm/mach-ux500/{include/mach => }/setup.h (100%)
arch/arm/mach-ux500/board-mop500-audio.c +1 -1
index def0637..aba9e56 100644
@@ -10,7 +10,7 @@
 #include <linux/platform_data/pinctrl-nomadik.h>
 #include <linux/platform_data/dma-ste-dma40.h>
 
-#include <mach/devices.h>
+#include "devices.h"
 #include "irqs.h"
 #include <linux/platform_data/asoc-ux500-msp.h>
 
arch/arm/mach-ux500/board-mop500-sdi.c +1 -1
index 0ada767..f76be4a 100644
@@ -14,7 +14,7 @@
 #include <linux/platform_data/dma-ste-dma40.h>
 
 #include <asm/mach-types.h>
-#include <mach/devices.h>
+#include "devices.h"
 
 #include "db8500-regs.h"
 #include "devices-db8500.h"
arch/arm/mach-ux500/board-mop500.c +2 -2
index 6e8ee11..0d59e1a 100644
@@ -41,8 +41,8 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <mach/setup.h>
-#include <mach/devices.h>
+#include "setup.h"
+#include "devices.h"
 #include "irqs.h"
 #include <linux/platform_data/crypto-ux500.h>
 
arch/arm/mach-ux500/cpu-db8500.c +2 -2
index e11f87d..7a66a81 100644
@@ -28,8 +28,8 @@
 #include <asm/mach/map.h>
 #include <asm/mach/arch.h>
 
-#include <mach/setup.h>
-#include <mach/devices.h>
+#include "setup.h"
+#include "devices.h"
 #include "irqs.h"
 
 #include "devices-db8500.h"
arch/arm/mach-ux500/cpu.c +2 -2
index aa14c5f..915e263 100644
@@ -24,8 +24,8 @@
 
 #include <asm/mach/map.h>
 
-#include <mach/setup.h>
-#include <mach/devices.h>
+#include "setup.h"
+#include "devices.h"
 
 #include "board-mop500.h"
 #include "db8500-regs.h"
arch/arm/mach-ux500/devices-db8500.c +1 -1
index 45ec955..1cf94ce 100644
@@ -15,7 +15,7 @@
 #include <linux/platform_data/dma-ste-dma40.h>
 #include <linux/mfd/dbx500-prcmu.h>
 
-#include <mach/setup.h>
+#include "setup.h"
 #include "irqs.h"
 
 #include "db8500-regs.h"
arch/arm/mach-ux500/devices.c +1 -1
index f63a512..0f9e52b 100644
@@ -11,7 +11,7 @@
 #include <linux/io.h>
 #include <linux/amba/bus.h>
 
-#include <mach/setup.h>
+#include "setup.h"
 
 #include "db8500-regs.h"
 
arch/arm/mach-ux500/devices.h renamed from arch/arm/mach-ux500/include/mach/devices.h +0 -0
similarity index 100%
rename from arch/arm/mach-ux500/include/mach/devices.h
rename to arch/arm/mach-ux500/devices.h
arch/arm/mach-ux500/hotplug.c +1 -1
index 2f6af25..87abcf2 100644
@@ -15,7 +15,7 @@
 #include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
 
-#include <mach/setup.h>
+#include "setup.h"
 
 /*
  * platform-specific code to shutdown a CPU
arch/arm/mach-ux500/id.c +1 -1
index a847cf2..0d33d1a 100644
@@ -14,7 +14,7 @@
 #include <asm/cacheflush.h>
 #include <asm/mach/map.h>
 
-#include <mach/setup.h>
+#include "setup.h"
 
 #include "db8500-regs.h"
 #include "id.h"
arch/arm/mach-ux500/platsmp.c +1 -1
index 8a9c070..12ad8ad 100644
@@ -22,7 +22,7 @@
 #include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
 
-#include <mach/setup.h>
+#include "setup.h"
 
 #include "db8500-regs.h"
 #include "id.h"
arch/arm/mach-ux500/setup.h renamed from arch/arm/mach-ux500/include/mach/setup.h +0 -0
similarity index 100%
rename from arch/arm/mach-ux500/include/mach/setup.h
rename to arch/arm/mach-ux500/setup.h
arch/arm/mach-ux500/timer.c +1 -1
index 2dbbaef..290b9c5 100644
@@ -13,7 +13,7 @@
 
 #include <asm/smp_twd.h>
 
-#include <mach/setup.h>
+#include "setup.h"
 #include "irqs.h"
 
 #include "db8500-regs.h"
drivers/clocksource/clksrc-dbx500-prcmu.c +0 -2
index 4f34093..54f3d11 100644
@@ -17,8 +17,6 @@
 
 #include <asm/sched_clock.h>
 
-#include <mach/setup.h>
-
 #define RATE_32K		32768
 
 #define TIMER_MODE_CONTINOUS	0x1
Signature · 1 line
1.7.11.3
#13 lore raw

PATCH 13/14 ARM: ux500: move to multiplatform

In reply to Linus Walleij

From: Arnd Bergmann <[email protected]>

Nothing is holding us up any more, and we can make ux500 coexist with the rest of the platforms. The timex.h and uncompress.h headers are no longer needed now.

---
 arch/arm/Kconfig                              | 15 -------
 arch/arm/mach-ux500/Kconfig                   | 14 +++++++
 arch/arm/mach-ux500/include/mach/timex.h      |  6 ---
 arch/arm/mach-ux500/include/mach/uncompress.h | 58 ---------------------------
 4 files changed, 14 insertions(+), 79 deletions(-)
 delete mode 100644 arch/arm/mach-ux500/include/mach/timex.h
 delete mode 100644 arch/arm/mach-ux500/include/mach/uncompress.h
arch/arm/Kconfig +0 -15
index 5b71469..65badde 100644
@@ -901,21 +901,6 @@ config ARCH_U300
 	help
 	  Support for ST-Ericsson U300 series mobile platforms.
 
-config ARCH_U8500
-	bool "ST-Ericsson U8500 Series"
-	depends on MMU
-	select ARCH_HAS_CPUFREQ
-	select ARCH_REQUIRE_GPIOLIB
-	select ARM_AMBA
-	select CLKDEV_LOOKUP
-	select CPU_V7
-	select GENERIC_CLOCKEVENTS
-	select HAVE_SMP
-	select MIGHT_HAVE_CACHE_L2X0
-	select SPARSE_IRQ
-	help
-	  Support for ST-Ericsson's Ux500 architecture
-
 config ARCH_NOMADIK
 	bool "STMicroelectronics Nomadik"
 	select ARCH_REQUIRE_GPIOLIB
arch/arm/mach-ux500/Kconfig +14 -0
index 3e5bbd0..eeea3bf 100644
@@ -1,3 +1,17 @@
+config ARCH_U8500
+	bool "ST-Ericsson U8500 Series" if ARCH_MULTI_V7
+	depends on MMU
+	select ARCH_HAS_CPUFREQ
+	select ARCH_REQUIRE_GPIOLIB
+	select ARM_AMBA
+	select CLKDEV_LOOKUP
+	select CPU_V7
+	select GENERIC_CLOCKEVENTS
+	select HAVE_SMP
+	select MIGHT_HAVE_CACHE_L2X0
+	help
+	  Support for ST-Ericsson's Ux500 architecture
+
 if ARCH_U8500
 
 config UX500_SOC_COMMON
arch/arm/mach-ux500/include/mach/timex.h deleted +0 -6
deleted file mode 100644
index d0942c1..0000000
@@ -1,6 +0,0 @@
-#ifndef __ASM_ARCH_TIMEX_H
-#define __ASM_ARCH_TIMEX_H
-
-#define CLOCK_TICK_RATE		110000000
-
-#endif
arch/arm/mach-ux500/include/mach/uncompress.h deleted +0 -58

58 lines not on this page · raw message

Signature · 1 line
1.7.11.3
#14 lore raw

PATCH 14/14 ARM: ux500: build hotplug.o for ARMv7-a

In reply to Linus Walleij

From: Arnd Bergmann <[email protected]>

If we try to build this file in a multiplatform configuration with ARMv6 enabled, gas complains about the dsb operation being undefined. Adding -march=armv7-a is safe because that code is only ever run on ux500, which is Cortex-A9.

---
 arch/arm/mach-ux500/Makefile | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-ux500/Makefile +2 -0
index 580a4db..bf9b6be 100644
@@ -15,3 +15,5 @@ obj-$(CONFIG_MACH_MOP500)	+= board-mop500.o board-mop500-sdi.o \
 				board-mop500-audio.o
 obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o
 obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o
+
+CFLAGS_hotplug.o		+= -march=armv7-a
Signature · 1 line
1.7.11.3
#15 lore raw

cover Ux500 multiplatform v2

In reply to Linus Walleij
Quoted 6 lines · Linus Walleij

From: Linus Walleij <[email protected]>

This is the complete Ux500 multiplatform patchset.

The only thing missing is a few ACKs from the MFD
maintainer (Samuel Ortiz).

Ok, very nice!

I'd like to put them into arm-soc really soon to give it some more time in linux-next before the merge window, but I don't want to step on Sam's toes here.

Sam, can you send an ACK or NAK by Monday? If I don't hear back from you, I'll put it into arm-soc as is, and we'll have to address any further comments with add-on patches.

Arnd

#16 lore raw

cover Ux500 multiplatform v2

Hi Arnd,

Quoted 8 lines · Arnd Bergmann
Quoted 6 lines · Linus Walleij

From: Linus Walleij <[email protected]>

This is the complete Ux500 multiplatform patchset.

The only thing missing is a few ACKs from the MFD
maintainer (Samuel Ortiz).

Quoted 7 lines

Ok, very nice!

I'd like to put them into arm-soc really soon to give it some more time in linux-next before the merge window, but I don't want to step on Sam's toes here.

Sam, can you send an ACK or NAK by Monday?

I am fine with Linus' changes. Would it be possible for you to setup a branch where I could also pull those changes from ? Or are the interdependencies too strong to do so ?
I'd like to avoid potential conflicts as much as possible...

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/
#17 lore raw

cover Ux500 multiplatform v2

Quoted 6 lines · Samuel Ortiz
Quoted 1 line · Arnd Bergmann

On Friday 05 April 2013, Linus Walleij wrote:

I am fine with Linus' changes. Would it be possible for you to setup a branch where I could also pull those changes from ? Or are the interdependencies too strong to do so ?

Sure, I always create a stable branch for each pull request I get for this purpose anyway. Actually it might be nice if Linus could produce two branches:
One that has the MFD changes only, and the second one based on the first that adds all the remaining changes. Then you can pull in just the first branch and don't need to add too many changes outside of drivers/mfd to your tree.

I don't think that the patches depend on anything that is already in arm-soc, but we might need to add other changes on top.

Arnd

#18 lore raw

cover Ux500 multiplatform v2

Quoted 4 lines · Arnd Bergmann
Quoted 2 lines · Samuel Ortiz
Quoted 1 line · Arnd Bergmann

On Friday 05 April 2013, Linus Walleij wrote:

Quoted 8 lines
Quoted 3 lines

I am fine with Linus' changes. Would it be possible for you to setup a branch where I could also pull those changes from ? Or are the interdependencies too strong to do so ?

Sure, I always create a stable branch for each pull request I get for this purpose anyway. Actually it might be nice if Linus could produce two branches:
One that has the MFD changes only, and the second one based on the first that adds all the remaining changes.

That would be ideal, yes.

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/