[linux-yocto] [PATCH 16/52] arm: axxia: Remove GPIO platform data

[Daniel Dragomir]

From: Anders Berg <anders.berg at avagotech.com>

Use DT based config for GPIO and drop the platform data setup.

Signed-off-by: Anders Berg <anders.berg at avagotech.com>
---
 arch/arm/boot/dts/axm55xx.dtsi |  6 ++++++
 arch/arm/mach-axxia/axxia.c    | 18 ------------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/arch/arm/boot/dts/axm55xx.dtsi b/arch/arm/boot/dts/axm55xx.dtsi
index 5ec77f8..4b81a74 100644
--- a/arch/arm/boot/dts/axm55xx.dtsi
+++ b/arch/arm/boot/dts/axm55xx.dtsi
@@ -15,6 +15,8 @@
 	interrupt-parent = <&gic>;
 
 	aliases {
+		gpio0     = &gpio0;
+		gpio1     = &gpio1;
 		serial0	  = &serial0;
 		serial1   = &serial1;
 		serial2	  = &serial2;
@@ -358,6 +360,8 @@
 					     <0 15 4>,
 					     <0 16 4>,
 					     <0 17 4>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
 				status = "disabled";
 			};
 
@@ -367,6 +371,8 @@
 				gpio-controller;
 				reg = <0x20 0x10093000 0x00 0x1000>;
 				interrupts = <0 18 4>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
 				status = "disabled";
 			};
 
diff --git a/arch/arm/mach-axxia/axxia.c b/arch/arm/mach-axxia/axxia.c
index 768b3ba..d3f3e91 100644
--- a/arch/arm/mach-axxia/axxia.c
+++ b/arch/arm/mach-axxia/axxia.c
@@ -153,27 +153,9 @@ static struct mmci_platform_data mmc_plat_data = {
 	.gpio_cd  = -ENOSYS
 };
 
-struct pl061_platform_data gpio0_plat_data = {
-	.gpio_base  = 0,
-	.irq_base   = 0,
-	.directions = 0,	/* startup directions, 1: out, 0: in */
-	.values     = 0		/* startup values */
-};
-
-struct pl061_platform_data gpio1_plat_data = {
-	.gpio_base  = 8,
-	.irq_base   = 0,
-	.directions = 0,	/* startup directions, 1: out, 0: in */
-	.values     = 0		/* startup values */
-};
-
 static struct of_dev_auxdata axxia_auxdata_lookup[] __initdata = {
 	OF_DEV_AUXDATA("arm,primecell", 0x20101E0000ULL,
 		       "mmci",  &mmc_plat_data),
-	OF_DEV_AUXDATA("arm,primecell", 0x2010092000ULL,
-		       "gpio0", &gpio0_plat_data),
-	OF_DEV_AUXDATA("arm,primecell", 0x2010093000ULL,
-		       "gpio1", &gpio1_plat_data),
 	{}
 };
 
-- 
1.8.1.4