Merge tag 'ux500-dt-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt

A set of device tree-related cleanups for the ux500 platform from Linus
Walleij:

- Rename SSP/SPI clocks to the name found in the hardware
  reference manual. (Also includes a rename in the U300
  device tree file.)
- Delete dead non-DT code.
- Drop now completely unused GPIO definition header file.
- Delete all hardcoded IRQ number assignments. This hits
  MFD a bit so the patch has been ACKed by Lee Jones from
  the MFD side.

* tag 'ux500-dt-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  mfd: dbx500/abx500: root out hardcoded IRQ assignments
  ARM: ux500: drop a chunk of GPIO definitions
  ARM: ux500: skip GIC CPU and dist address checks
  ARM: ux500: delete pointless DT config option
  ARM: u300: switch SSP/SPI clock name to "SSPCLK"
  ARM: ux500: switch SSP/SPI clock name to "SSPCLK"

Signed-off-by: Olof Johansson <olof@lixom.net>

14 files changed, 43 insertions, 357 deletions

diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi
index e0853ea02df2..e41eedca3ce3 100644
--- a/arch/arm/boot/dts/ste-dbx5x0.dtsi
+++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi
@@ -705,7 +705,7 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                         clocks = <&prcc_kclk 3 1>, <&prcc_pclk 3 1>;
-                        clock-names = "ssp0clk", "apb_pclk";
+                        clock-names = "SSPCLK", "apb_pclk";
                         dmas = <&dma 8 0 0x2>, /* Logical - DevToMem */
                                <&dma 8 0 0x0>; /* Logical - MemToDev */
                         dma-names = "rx", "tx";
@@ -718,7 +718,7 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                         clocks = <&prcc_kclk 3 2>, <&prcc_pclk 3 2>;
-                        clock-names = "ssp1clk", "apb_pclk";
+                        clock-names = "SSPCLK", "apb_pclk";
                         dmas = <&dma 9 0 0x2>, /* Logical - DevToMem */
                                <&dma 9 0 0x0>; /* Logical - MemToDev */
                         dma-names = "rx", "tx";
@@ -732,7 +732,7 @@
                         #size-cells = <0>;
                         /* Same clock wired to kernel and pclk */
                         clocks = <&prcc_pclk 2 8>, <&prcc_pclk 2 8>;
-                        clock-names = "spi0clk", "apb_pclk";
+                        clock-names = "SSPCLK", "apb_pclk";
                         dmas = <&dma 0 0 0x2>, /* Logical - DevToMem */
                                <&dma 0 0 0x0>; /* Logical - MemToDev */
                         dma-names = "rx", "tx";
@@ -746,7 +746,7 @@
                         #size-cells = <0>;
                         /* Same clock wired to kernel and pclk */
                         clocks = <&prcc_pclk 2 2>, <&prcc_pclk 2 2>;
-                        clock-names = "spi1clk", "apb_pclk";
+                        clock-names = "SSPCLK", "apb_pclk";
                         dmas = <&dma 35 0 0x2>, /* Logical - DevToMem */
                                <&dma 35 0 0x0>; /* Logical - MemToDev */
                         dma-names = "rx", "tx";
@@ -760,7 +760,7 @@
                         #size-cells = <0>;
                         /* Same clock wired to kernel and pclk */
                         clocks = <&prcc_pclk 2 1>, <&prcc_pclk 2 1>;
-                        clock-names = "spi2clk", "apb_pclk";
+                        clock-names = "SSPCLK", "apb_pclk";
                         dmas = <&dma 33 0 0x2>, /* Logical - DevToMem */
                                <&dma 33 0 0x0>; /* Logical - MemToDev */
                         dma-names = "rx", "tx";
@@ -774,7 +774,7 @@
                         #size-cells = <0>;
                         /* Same clock wired to kernel and pclk */
                         clocks = <&prcc_pclk 1 7>, <&prcc_pclk 1 7>;
-                        clock-names = "spi3clk", "apb_pclk";
+                        clock-names = "SSPCLK", "apb_pclk";
                         dmas = <&dma 40 0 0x2>, /* Logical - DevToMem */
                                <&dma 40 0 0x0>; /* Logical - MemToDev */
                         dma-names = "rx", "tx";
diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts
index a9da4800daf0..6fe688e9e4da 100644
--- a/arch/arm/boot/dts/ste-u300.dts
+++ b/arch/arm/boot/dts/ste-u300.dts
@@ -457,7 +457,7 @@
                         interrupt-parent = <&vica>;
                         interrupts = <23>;
                         clocks = <&spi_clk>, <&spi_clk>;
-                        clock-names = "apb_pclk", "spi_clk";
+                        clock-names = "SSPCLK", "apb_pclk";
                         dmas = <&dmac 27 &dmac 28>;
                         dma-names = "tx", "rx";
                         num-cs = <3>;
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index 0034d2cd6973..b2019dc50e40 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -73,11 +73,6 @@ config UX500_AUTO_PLATFORM
           a working kernel. If everything else is disabled, this
           automatically enables MACH_MOP500.
 
-config MACH_UX500_DT
-        bool "Generic U8500 support using device tree"
-        depends on MACH_MOP500
-        select USE_OF
-
 endmenu
 
 config UX500_DEBUG_UART
diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c
index 9309ad4cbd09..b2a0899e7453 100644
--- a/arch/arm/mach-ux500/board-mop500-audio.c
+++ b/arch/arm/mach-ux500/board-mop500-audio.c
@@ -9,7 +9,6 @@
 #include <linux/gpio.h>
 #include <linux/platform_data/dma-ste-dma40.h>
 
-#include "irqs.h"
 #include <linux/platform_data/asoc-ux500-msp.h>
 
 #include "ste-dma40-db8500.h"
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index bb408b8f48de..32cc0d8d8a0e 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -7,78 +7,9 @@
 #ifndef __BOARD_MOP500_H
 #define __BOARD_MOP500_H
 
-/* For NOMADIK_NR_GPIO */
-#include "irqs.h"
 #include <linux/platform_data/asoc-ux500-msp.h>
 #include <linux/amba/mmci.h>
 
-/* Snowball specific GPIO assignments, this board has no GPIO expander */
-#define SNOWBALL_ACCEL_INT1_GPIO        163
-#define SNOWBALL_ACCEL_INT2_GPIO        164
-#define SNOWBALL_MAGNET_DRDY_GPIO       165
-#define SNOWBALL_SDMMC_EN_GPIO          217
-#define SNOWBALL_SDMMC_1V8_3V_GPIO      228
-#define SNOWBALL_SDMMC_CD_GPIO          218
-
-/* HREFv60-specific GPIO assignments, this board has no GPIO expander */
-#define HREFV60_SDMMC_1V8_3V_GPIO       5
-#define HREFV60_CAMERA_FLASH_ENABLE     21
-#define HREFV60_MAGNET_DRDY_GPIO        32
-#define HREFV60_DISP1_RST_GPIO          65
-#define HREFV60_DISP2_RST_GPIO          66
-#define HREFV60_ACCEL_INT1_GPIO         82
-#define HREFV60_ACCEL_INT2_GPIO         83
-#define HREFV60_SDMMC_CD_GPIO           95
-#define HREFV60_XSHUTDOWN_SECONDARY_SENSOR 140
-#define HREFV60_TOUCH_RST_GPIO          143
-#define HREFV60_HAL_SW_GPIO             145
-#define HREFV60_SDMMC_EN_GPIO           169
-#define HREFV60_MMIO_XENON_CHARGE       170
-#define HREFV60_PROX_SENSE_GPIO         217
-
-/* MOP500 generic GPIOs */
-#define CAMERA_FLASH_INT_PIN            7
-#define CYPRESS_TOUCH_INT_PIN           84
-#define XSHUTDOWN_PRIMARY_SENSOR        141