From 73d1ed66d316489d8dfd7f1b61dd0c4fceb0e24b Mon Sep 17 00:00:00 2001
From: Julius Werner <jwerner@chromium.org>
Date: Mon, 20 Oct 2014 13:20:49 -0700
Subject: ipq806x: Change all SoC headers to <soc/headername.h> system

This patch aligns ipq806x to the new SoC header include scheme.
Also alphabetized headers in affected files since we touch them anyway.

BUG=None
TEST=Tested with whole series. Compiled Storm.

Change-Id: Icb81a77e6f458625f5379a980e8760388dd3a1f9
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 1bf23774c9ffa5d08c211f3658d39adcfa47b339
Original-Change-Id: I283cc7e6094be977d67ed4146f376cebcea6774a
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/224502
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9368
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: Patrick Georgi <pgeorgi@google.com>
---
 src/mainboard/google/storm/boardid.c    | 2 +-
 src/mainboard/google/storm/cdp.c        | 4 ++--
 src/mainboard/google/storm/mainboard.c  | 7 +++----
 src/mainboard/google/storm/memlayout.ld | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/mainboard/google')

diff --git a/src/mainboard/google/storm/boardid.c b/src/mainboard/google/storm/boardid.c
index 683b5f4812..a8dd84439b 100644
--- a/src/mainboard/google/storm/boardid.c
+++ b/src/mainboard/google/storm/boardid.c
@@ -17,10 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <stdlib.h>
 #include <boardid.h>
 #include <gpiolib.h>
 #include <console/console.h>
+#include <stdlib.h>
 
 /*
  * Storm boards dedicate to the board ID three GPIOs in tertiary mode: 29, 30
diff --git a/src/mainboard/google/storm/cdp.c b/src/mainboard/google/storm/cdp.c
index 94845c7322..7e1aeb66ad 100644
--- a/src/mainboard/google/storm/cdp.c
+++ b/src/mainboard/google/storm/cdp.c
@@ -1,9 +1,9 @@
 
 /* * Copyright (c) 2012 - 2013 The Linux Foundation. All rights reserved.* */
 
+#include <soc/gpio.h>
+#include <soc/cdp.h>
 #include <types.h>
-#include <cdp.h>
-#include <gpio.h>
 
 void ipq_configure_gpio(const gpio_func_data_t *gpio, unsigned count)
 {
diff --git a/src/mainboard/google/storm/mainboard.c b/src/mainboard/google/storm/mainboard.c
index 478e2a8b8d..acadce5b2a 100644
--- a/src/mainboard/google/storm/mainboard.c
+++ b/src/mainboard/google/storm/mainboard.c
@@ -24,13 +24,12 @@
 #include <delay.h>
 #include <device/device.h>
 #include <gpiolib.h>
+#include <soc/clock.h>
+#include <soc/gpio.h>
+#include <soc/usb.h>
 #include <string.h>
 #include <symbols.h>
 
-#include <soc/qualcomm/ipq806x/include/clock.h>
-#include <soc/qualcomm/ipq806x/include/gpio.h>
-#include <soc/qualcomm/ipq806x/include/usb.h>
-
 /* convenient shorthand (in MB) */
 #define DRAM_START           ((uintptr_t)_dram / MiB)
 #define DRAM_SIZE            (CONFIG_DRAM_SIZE_MB)
diff --git a/src/mainboard/google/storm/memlayout.ld b/src/mainboard/google/storm/memlayout.ld
index 1735835321..ead7f47838 100644
--- a/src/mainboard/google/storm/memlayout.ld
+++ b/src/mainboard/google/storm/memlayout.ld
@@ -1 +1 @@
-#include <soc/qualcomm/ipq806x/memlayout.ld>
+#include <soc/memlayout.ld>
-- 
cgit v1.2.3