exynos5250: Change all SoC headers to <soc/headername.h> system

This patch aligns exynos5250 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 Daisy.

Change-Id: I39805c0346e117a0f9b2667763ecaa428f0f55a8
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: db6762f0c8425371d9860f908a5cefdeee8d1abc
Original-Change-Id: Ic358061ddcbbe7d83a95ca11247b8b505b20491d
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/224500
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9323
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

src/mainboard/google/daisy/chromeos.c

@@ -21,11 +21,11 @@
 #include <console/console.h>
 #include <ec/google/chromeec/ec.h>
 #include <ec/google/chromeec/ec_commands.h>
+#include <soc/cpu.h>
+#include <soc/gpio.h>
 #include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include <bootmode.h>
-#include <soc/samsung/exynos5250/cpu.h>
-#include <soc/samsung/exynos5250/gpio.h>
 
 void fill_lb_gpios(struct lb_gpios *gpios)
 {

src/mainboard/google/daisy/mainboard.c

@@ -17,26 +17,26 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <arch/cache.h>
+#include <boot/coreboot_tables.h>
 #include <console/console.h>
+#include <cbmem.h>
+#include <delay.h>
 #include <device/device.h>
 #include <device/i2c.h>
 #include <drivers/ti/tps65090/tps65090.h>
-#include <cbmem.h>
-#include <delay.h>
 #include <edid.h>
-#include <vbe.h>
+#include <soc/clk.h>
-#include <boot/coreboot_tables.h>
+#include <soc/dp.h>
-#include <arch/cache.h>
+#include <soc/dp-core.h>
-#include <soc/samsung/exynos5250/tmu.h>
+#include <soc/gpio.h>
-#include <soc/samsung/exynos5250/clk.h>
+#include <soc/i2c.h>
-#include <soc/samsung/exynos5250/gpio.h>
+#include <soc/periph.h>
-#include <soc/samsung/exynos5250/power.h>
+#include <soc/power.h>
-#include <soc/samsung/exynos5250/i2c.h>
+#include <soc/tmu.h>
-#include <soc/samsung/exynos5250/dp-core.h>
+#include <soc/usb.h>
-#include <soc/samsung/exynos5250/dp.h>
-#include <soc/samsung/exynos5250/periph.h>
-#include <soc/samsung/exynos5250/usb.h>
 #include <symbols.h>
+#include <vbe.h>
 
 #include "exynos5250.h"
 

src/mainboard/google/daisy/memlayout.ld

@@ -1 +1 @@
-#include <soc/samsung/exynos5250/memlayout.ld>
+#include <soc/memlayout.ld>

src/mainboard/google/daisy/memory.c

@@ -18,14 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <console/console.h>
+#include <soc/gpio.h>
+#include <soc/setup.h>
+#include <soc/dmc.h>
+#include <soc/clk.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <console/console.h>
-
-#include <soc/samsung/exynos5250/gpio.h>
-#include <soc/samsung/exynos5250/setup.h>
-#include <soc/samsung/exynos5250/dmc.h>
-#include <soc/samsung/exynos5250/clk.h>
 
 const struct mem_timings mem_timings[] = {
 	{

src/mainboard/google/daisy/romstage.c

@@ -17,30 +17,28 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <types.h>
+#include <arch/cache.h>
-
+#include <arch/exception.h>
+#include <arch/stages.h>
 #include <armv7.h>
 #include <cbfs.h>
 #include <cbmem.h>
-#include <timestamp.h>
-
-#include <arch/cache.h>
-#include <arch/exception.h>
-#include <soc/samsung/exynos5250/i2c.h>
-#include <soc/samsung/exynos5250/clk.h>
-#include <soc/samsung/exynos5250/cpu.h>
-#include <soc/samsung/exynos5250/dmc.h>
-#include <soc/samsung/exynos5250/gpio.h>
-#include <soc/samsung/exynos5250/setup.h>
-#include <soc/samsung/exynos5250/periph.h>
-#include <soc/samsung/exynos5250/power.h>
-#include <soc/samsung/exynos5250/trustzone.h>
-#include <soc/samsung/exynos5250/wakeup.h>
 #include <console/console.h>
 #include <program_loading.h>
-
-#include <drivers/maxim/max77686/max77686.h>
 #include <device/i2c.h>
+#include <drivers/maxim/max77686/max77686.h>
+#include <soc/clk.h>
+#include <soc/cpu.h>
+#include <soc/dmc.h>
+#include <soc/gpio.h>
+#include <soc/i2c.h>
+#include <soc/setup.h>
+#include <soc/periph.h>
+#include <soc/power.h>
+#include <soc/trustzone.h>
+#include <soc/wakeup.h>
+#include <timestamp.h>
+#include <types.h>
 
 #include "exynos5250.h"
 

src/mainboard/google/daisy/wakeup.c

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <soc/samsung/exynos5250/gpio.h>
+#include <soc/gpio.h>
-#include <soc/samsung/exynos5250/wakeup.h>
+#include <soc/wakeup.h>
 
 int wakeup_need_reset(void)
 {

src/soc/samsung/exynos5250/Makefile.inc

@@ -48,6 +48,8 @@ ramstage-y += fb.c
 ramstage-y += usb.c
 ramstage-y += cbmem.c
 
+CPPFLAGS_common += -Isrc/soc/samsung/exynos5250/include/
+
 $(objcbfs)/bootblock.raw.elf: $(objcbfs)/bootblock.elf
 	cp $< $@
 

src/soc/samsung/exynos5250/alternate_cbfs.c

@@ -20,13 +20,13 @@
 
 #include <assert.h>
 #include <cbfs.h>  /* This driver serves as a CBFS media source. */
+#include <console/console.h>
+#include <soc/alternate_cbfs.h>
+#include <soc/power.h>
+#include <soc/spi.h>
 #include <stdlib.h>
 #include <string.h>
 #include <symbols.h>
-#include <console/console.h>
-#include "alternate_cbfs.h"
-#include "power.h"
-#include "spi.h"
 
 /* This allows USB A-A firmware upload from a compatible host in four parts:
  * The first two are the bare BL1 and the Coreboot boot block, which are just

src/soc/samsung/exynos5250/bootblock.c

@@ -18,9 +18,8 @@
  */
 
 #include <bootblock_common.h>
-
+#include <soc/clk.h>
-#include "clk.h"
+#include <soc/wakeup.h>
-#include "wakeup.h"
 
 void bootblock_soc_init(void)
 {

src/soc/samsung/exynos5250/cbmem.c

@@ -19,7 +19,7 @@
 
 #include <stddef.h>
 #include <cbmem.h>
-#include "cpu.h"
+#include <soc/cpu.h>
 
 void *cbmem_top(void)
 {

src/soc/samsung/exynos5250/chip.h

@@ -20,7 +20,7 @@
 #ifndef CPU_SAMSUNG_EXYNOS5250_H
 #define CPU_SAMSUNG_EXYNOS5250_H
 
-#include "gpio.h"
+#include <soc/gpio.h>
 
 struct soc_samsung_exynos5250_config {
 	/* special magic numbers! */

src/soc/samsung/exynos5250/clock.c

@@ -17,13 +17,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <arch/io.h>
 #include <assert.h>
+#include <console/console.h>
+#include <soc/clk.h>
+#include <soc/periph.h>
 #include <stdlib.h>
 #include <timer.h>
-#include <arch/io.h>
-#include <console/console.h>
-#include "clk.h"
-#include "periph.h"
 
 /* input clock of PLL: SMDK5250 has 24MHz input clock */
 #define CONFIG_SYS_CLK_FREQ            24000000

src/soc/samsung/exynos5250/clock_init.c

@@ -21,9 +21,9 @@
 
 #include <delay.h>
 #include <console/console.h>
-#include "clk.h"
+#include <soc/clk.h>
-#include "dp.h"
+#include <soc/dp.h>
-#include "setup.h"
+#include <soc/setup.h>
 
 void system_clock_init(struct mem_timings *mem,
 		struct arm_clk_ratios *arm_clk_ratio)

src/soc/samsung/exynos5250/cpu.c

@@ -18,18 +18,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <arch/cache.h>
+#include <cbmem.h>
+#include <console/console.h>
+#include <delay.h>
+#include <device/device.h>
+#include <soc/clk.h>
+#include <soc/cpu.h>
+#include <soc/dp-core.h>
+#include <soc/fimd.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stddef.h>
+
-#include <delay.h>
-#include <console/console.h>
-#include <device/device.h>
-#include <cbmem.h>
-#include <arch/cache.h>
-#include "fimd.h"
-#include "dp-core.h"
-#include "cpu.h"
-#include "clk.h"
 #include "chip.h"
 
 static unsigned int cpu_id;

src/soc/samsung/exynos5250/dmc_common.c

@@ -20,13 +20,12 @@
 /* Mem setup common file for different types of DDR present on SMDK5250 boards.
  */
 
-#include <console/console.h>
 #include <arch/io.h>
+#include <console/console.h>
 #include <delay.h>
-#include "setup.h"
+#include <soc/clk.h>
-#include "dmc.h"
+#include <soc/dmc.h>
-#include "clk.h"
+#include <soc/setup.h>
-#include "setup.h"
 
 #define ZQ_INIT_TIMEOUT	10000
 

src/soc/samsung/exynos5250/dmc_init_ddr3.c

@@ -19,13 +19,13 @@
 
 /* DDR3 mem setup file for SMDK5250 board based on EXYNOS5 */
 
-#include <delay.h>
 #include <arch/io.h>
 #include <console/console.h>
-#include "clk.h"
+#include <delay.h>
-#include "cpu.h"
+#include <soc/clk.h>
-#include "dmc.h"
+#include <soc/cpu.h>
-#include "setup.h"
+#include <soc/dmc.h>
+#include <soc/setup.h>
 
 #define RDLVL_COMPLETE_TIMEOUT	10000
 

src/soc/samsung/exynos5250/dp-reg.c

@@ -19,16 +19,16 @@
 
 /* Samsung DP (Display port) register interface driver. */
 
-#include <console/console.h>
 #include <arch/io.h>
+#include <console/console.h>
 #include <delay.h>
-#include "timer.h"
+#include <soc/clk.h>
-#include "clk.h"
+#include <soc/cpu.h>
-#include "cpu.h"
+#include <soc/dp.h>
-#include "periph.h"
+#include <soc/dp-core.h>
-#include "dp.h"
+#include <soc/fimd.h>
-#include "fimd.h"
+#include <soc/periph.h>
-#include "dp-core.h"
+#include <timer.h>
 
 void s5p_dp_reset(struct s5p_dp_device *dp)
 {

src/soc/samsung/exynos5250/fb.c

@@ -20,19 +20,18 @@
 
 /* LCD driver for Exynos */
 
+#include <arch/io.h>
+#include <console/console.h>
 #include <delay.h>
+#include <soc/dp.h>
+#include <soc/dp-core.h>
+#include <soc/fimd.h>
+#include <soc/i2c.h>
+#include <soc/power.h>
+#include <soc/sysreg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <timer.h>
-#include <arch/io.h>
-#include <console/console.h>
-#include "power.h"
-#include "sysreg.h"
-
-#include "dp.h"
-#include "dp-core.h"
-#include "fimd.h"
-#include "i2c.h"
 
 /*
  * Here is the rough outline of how we bring up the display:

src/soc/samsung/exynos5250/gpio.c

@@ -17,12 +17,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <console/console.h>
-#include <string.h>
-#include <delay.h>
 #include <assert.h>
-#include "gpio.h"
+#include <console/console.h>
-#include "cpu.h"
+#include <delay.h>
+#include <soc/cpu.h>
+#include <soc/gpio.h>
+#include <string.h>
 
 #define CON_MASK(x)		(0xf << ((x) << 2))
 #define CON_SFR(x, v)		((v) << ((x) << 2))

src/soc/samsung/exynos5250/i2c.c

@@ -18,14 +18,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <arch/io.h>
 #include <assert.h>
 #include <console/console.h>
 #include <delay.h>
-#include <arch/io.h>
 #include <device/i2c.h>
-#include "clk.h"
+#include <soc/clk.h>
-#include "i2c.h"
+#include <soc/i2c.h>
-#include "periph.h"
+#include <soc/periph.h>
 
 struct __attribute__ ((packed)) i2c_regs
 {

src/soc/samsung/exynos5250/include/soc/clk.h

@@ -21,10 +21,11 @@
 #ifndef CPU_SAMSUNG_EXYNOS5250_CLK_H
 #define CPU_SAMSUNG_EXYNOS5250_CLK_H
 
+#include <soc/cpu.h>
+#include <soc/dmc.h>
+#include <soc/pinmux.h>
 #include <stdint.h>
 
-#include "cpu.h"
-
 enum periph_id;
 
 #define APLL	0
@@ -66,9 +67,6 @@ void set_mmc_clk(int dev_index, unsigned int div);
  */
 unsigned long clock_get_periph_rate(enum periph_id peripheral);
 
-#include "pinmux.h"
-
-
 #define MCT_HZ 24000000
 
 /*
@@ -594,8 +592,6 @@ void clock_gate(void);
 void mct_start(void);
 uint64_t mct_raw_value(void);
 
-#include "dmc.h"
-
 /* These are the ratio's for configuring ARM clock */
 struct arm_clk_ratios {
 	unsigned int arm_freq_mhz;	/* Frequency of ARM core in MHz */

src/soc/samsung/exynos5250/include/soc/dmc.h

@@ -20,7 +20,7 @@
 
 #ifndef __ASSEMBLER__
 
-#include "cpu.h"
+#include <soc/cpu.h>
 
 struct exynos5_dmc {
 	unsigned int concontrol;

src/soc/samsung/exynos5250/include/soc/dp.h

@@ -23,6 +23,8 @@
 #ifndef CPU_SAMSUNG_EXYNOS5250_DP_H
 #define CPU_SAMSUNG_EXYNOS5250_DP_H
 
+#include <soc/cpu.h>
+
 /* DSIM register map */
 struct exynos5_dp {
 	u8	res1[0x10];

src/soc/samsung/exynos5250/include/soc/fimd.h

@@ -22,7 +22,7 @@
 #ifndef CPU_SAMSUNG_EXYNOS5250_FIMD_H
 #define CPU_SAMSUNG_EXYNOS5250_FIMD_H
 
-#include "cpu.h"
+#include <soc/cpu.h>
 
 /* FIMD register map */
 struct exynos5_fimd {

src/soc/samsung/exynos5250/include/soc/gpio.h

@@ -20,7 +20,7 @@
 #ifndef CPU_SAMSUNG_EXYNOS5250_GPIO_H
 #define CPU_SAMSUNG_EXYNOS5250_GPIO_H
 
-#include "cpu.h"
+#include <soc/cpu.h>
 
 struct gpio_bank {
 	unsigned int	con;

src/soc/samsung/exynos5250/include/soc/power.h

@@ -22,7 +22,7 @@
 #ifndef CPU_SAMSUNG_EXYNOS5250_POWER_H
 #define CPU_SAMSUNG_EXYNOS5250_POWER_H
 
-#include "cpu.h"
+#include <soc/cpu.h>
 
 /* Enable HW thermal trip with PS_HOLD_CONTROL register ENABLE_HW_TRIP bit */
 void power_enable_hw_thermal_trip(void);

src/soc/samsung/exynos5250/include/soc/sysreg.h

@@ -22,7 +22,7 @@
 #ifndef CPU_SAMSUNG_EXYNOS5250_SYSREG_H
 #define CPU_SAMSUNG_EXYNOS5250_SYSREG_H
 
-#include "cpu.h"
+#include <soc/cpu.h>
 
 /* sysreg map */
 struct exynos5_sysreg {

src/soc/samsung/exynos5250/include/soc/usb.h

@@ -20,7 +20,7 @@
 #ifndef CPU_SAMSUNG_EXYNOS5250_USB_H
 #define CPU_SAMSUNG_EXYNOS5250_USB_H
 
-#include "cpu.h"
+#include <soc/cpu.h>
 
 #define CLK_24MHZ               5
 

src/soc/samsung/exynos5250/mct.c

@@ -17,9 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <stdint.h>
 #include <arch/io.h>
-#include "clk.h"
+#include <soc/clk.h>
+#include <stdint.h>
 
 uint64_t mct_raw_value(void)
 {

src/soc/samsung/exynos5250/monotonic_timer.c

@@ -17,11 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <soc/clk.h>
 #include <stdint.h>
 #include <timer.h>
 
-#include "clk.h"
-
 static const uint32_t clocks_per_usec = MCT_HZ/1000000;
 
 void timer_monotonic_get(struct mono_time *mt)

src/soc/samsung/exynos5250/pinmux.c

@@ -17,10 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <console/console.h>
 #include <assert.h>
-#include "gpio.h"
+#include <console/console.h>
-#include "pinmux.h"
+#include <soc/gpio.h>
+#include <soc/pinmux.h>
 
 static void exynos_pinmux_uart(int start, int count)
 {

src/soc/samsung/exynos5250/power.c

@@ -22,9 +22,9 @@
 #include <arch/io.h>
 #include <console/console.h>
 #include <halt.h>
-#include "dmc.h"
+#include <soc/dmc.h>
-#include "power.h"
+#include <soc/power.h>
-#include "setup.h"
+#include <soc/setup.h>
 
 /* Set the PS-Hold drive value */
 static void ps_hold_setup(void)

src/soc/samsung/exynos5250/spi.c

@@ -18,13 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <assert.h>
-#include <stdlib.h>
 #include <arch/io.h>
+#include <assert.h>
 #include <console/console.h>
-#include "clk.h"
+#include <soc/clk.h>
-#include "gpio.h"
+#include <soc/gpio.h>
-#include "spi.h"
+#include <soc/spi.h>
+#include <stdlib.h>
 
 #if defined(CONFIG_DEBUG_SPI) && CONFIG_DEBUG_SPI
 # define DEBUG_SPI(x,...)	printk(BIOS_DEBUG, "EXYNOS_SPI: " x)

src/soc/samsung/exynos5250/timer.c

@@ -18,10 +18,9 @@
  */
 
 #include <console/console.h>
-#include <timer.h>
 #include <delay.h>
-
+#include <soc/clk.h>
-#include "clk.h"
+#include <timer.h>
 
 void init_timer(void)
 {

src/soc/samsung/exynos5250/tmu.c

@@ -20,10 +20,10 @@
 
 /* EXYNOS - Thermal Management Unit */
 
-#include <console/console.h>
 #include <arch/io.h>
-#include "power.h"
+#include <console/console.h>
-#include "tmu.h"
+#include <soc/power.h>
+#include <soc/tmu.h>
 
 #define TRIMINFO_RELOAD		1
 #define CORE_EN			1

src/soc/samsung/exynos5250/trustzone.c

@@ -19,7 +19,7 @@
  */
 
 #include <arch/io.h>
-#include "trustzone.h"
+#include <soc/trustzone.h>
 
 /* Setting TZPC[TrustZone Protection Controller] */
 void trustzone_init(void)

src/soc/samsung/exynos5250/uart.c

@@ -17,15 +17,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <types.h>
-#include <console/uart.h>
 #include <arch/io.h>
 #include <boot/coreboot_tables.h>
-#include "uart.h"
+#include <console/uart.h>
-#include "clk.h"
+#include <soc/clk.h>
-#include "cpu.h"
+#include <soc/cpu.h>
-#include "periph.h"
+#include <soc/periph.h>
-#include "uart.h"
+#include <soc/uart.h>
+#include <types.h>
 
 #define RX_FIFO_COUNT_MASK	0xff
 #define RX_FIFO_FULL_MASK	(1 << 8)

src/soc/samsung/exynos5250/usb.c

@@ -18,14 +18,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <delay.h>
 #include <arch/io.h>
 #include <console/console.h>
+#include <delay.h>
 #include <device/device.h>
-#include "gpio.h"
+#include <soc/gpio.h>
-#include "power.h"
+#include <soc/power.h>
-#include "sysreg.h"
+#include <soc/sysreg.h>
-#include "usb.h"
+#include <soc/usb.h>
 
 static void reset_dwc3(struct exynos5_usb_drd_dwc3 *dwc3)
 {

src/soc/samsung/exynos5250/wakeup.c

@@ -18,8 +18,8 @@
  */
 
 #include <console/console.h>
-#include "power.h"
+#include <soc/power.h>
-#include "wakeup.h"
+#include <soc/wakeup.h>
 
 void wakeup(void)
 {