commit 13f66507afdcde5170546e5ca1ce5a945895eb10
author Kyösti Mälkki <kyosti.malkki@gmail.com> Sun Mar 03 08:01:05 2019 +0200
committer Kyösti Mälkki <kyosti.malkki@gmail.com> Mon Mar 04 15:57:39 2019 +0000
tree 40c1d05a05b05b596f290c186aa59a8b4d9768ab
parent 065857ee7fd61b05025d7a803e82f2b9b53cbc9a

device/mmio.h: Add include file for MMIO ops

MMIO operations are arch-agnostic so the include
path should not be arch/.

Change-Id: I0fd70f5aeca02e98e96b980c3aca0819f5c44b98
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/31691
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/soc/nvidia/tegra210/addressmap.c

diff --git a/src/soc/nvidia/tegra210/addressmap.c b/src/soc/nvidia/tegra210/addressmap.c
index 18bb081..4f11d4e 100644
--- a/src/soc/nvidia/tegra210/addressmap.c
+++ b/src/soc/nvidia/tegra210/addressmap.c
@@ -14,7 +14,7 @@
  */
 
 #include <assert.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <commonlib/helpers.h>
 #include <console/console.h>
 #include <soc/addressmap.h>

src/soc/nvidia/tegra210/bootblock.c

diff --git a/src/soc/nvidia/tegra210/bootblock.c b/src/soc/nvidia/tegra210/bootblock.c
index 3536447..c10920d 100644
--- a/src/soc/nvidia/tegra210/bootblock.c
+++ b/src/soc/nvidia/tegra210/bootblock.c
@@ -18,6 +18,7 @@
 #include <arch/stages.h>
 #include <bootblock_common.h>
 #include <console/console.h>
+#include <device/mmio.h>
 #include <delay.h>
 #include <program_loading.h>
 #include <soc/addressmap.h>

src/soc/nvidia/tegra210/ccplex.c

diff --git a/src/soc/nvidia/tegra210/ccplex.c b/src/soc/nvidia/tegra210/ccplex.c
index 867f106..cc1e284 100644
--- a/src/soc/nvidia/tegra210/ccplex.c
+++ b/src/soc/nvidia/tegra210/ccplex.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <console/console.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>

src/soc/nvidia/tegra210/clock.c

diff --git a/src/soc/nvidia/tegra210/clock.c b/src/soc/nvidia/tegra210/clock.c
index 5484d62..55ee50b 100644
--- a/src/soc/nvidia/tegra210/clock.c
+++ b/src/soc/nvidia/tegra210/clock.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <assert.h>
 #include <console/console.h>
 #include <delay.h>

src/soc/nvidia/tegra210/cpu.c

diff --git a/src/soc/nvidia/tegra210/cpu.c b/src/soc/nvidia/tegra210/cpu.c
index 0303150..8d74bd3 100644
--- a/src/soc/nvidia/tegra210/cpu.c
+++ b/src/soc/nvidia/tegra210/cpu.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <assert.h>
 #include <console/console.h>
 #include <soc/addressmap.h>

src/soc/nvidia/tegra210/dc.c

diff --git a/src/soc/nvidia/tegra210/dc.c b/src/soc/nvidia/tegra210/dc.c
index 1000346..ceffb41 100644
--- a/src/soc/nvidia/tegra210/dc.c
+++ b/src/soc/nvidia/tegra210/dc.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 #include <console/console.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <edid.h>

src/soc/nvidia/tegra210/dma.c

diff --git a/src/soc/nvidia/tegra210/dma.c b/src/soc/nvidia/tegra210/dma.c
index 21e581f..03c5e67 100644
--- a/src/soc/nvidia/tegra210/dma.c
+++ b/src/soc/nvidia/tegra210/dma.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <console/console.h>
 #include <inttypes.h>
 #include <soc/addressmap.h>

src/soc/nvidia/tegra210/dsi.c

diff --git a/src/soc/nvidia/tegra210/dsi.c b/src/soc/nvidia/tegra210/dsi.c
index 3f52567..76054f0 100644
--- a/src/soc/nvidia/tegra210/dsi.c
+++ b/src/soc/nvidia/tegra210/dsi.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 #include <console/console.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <delay.h>

src/soc/nvidia/tegra210/flow_ctrl.c

diff --git a/src/soc/nvidia/tegra210/flow_ctrl.c b/src/soc/nvidia/tegra210/flow_ctrl.c
index 0eb8357..b25e2708 100644
--- a/src/soc/nvidia/tegra210/flow_ctrl.c
+++ b/src/soc/nvidia/tegra210/flow_ctrl.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <soc/addressmap.h>
 #include <soc/flow_ctrl.h>
 

src/soc/nvidia/tegra210/i2c6.c

diff --git a/src/soc/nvidia/tegra210/i2c6.c b/src/soc/nvidia/tegra210/i2c6.c
index bdc2e22..483fd59 100644
--- a/src/soc/nvidia/tegra210/i2c6.c
+++ b/src/soc/nvidia/tegra210/i2c6.c
@@ -14,6 +14,7 @@
  * GNU General Public License for more details.
  */
 
+#include <device/mmio.h>
 #include <delay.h>
 #include <soc/addressmap.h>
 #include <soc/clk_rst.h>

src/soc/nvidia/tegra210/include/soc/clock.h

diff --git a/src/soc/nvidia/tegra210/include/soc/clock.h b/src/soc/nvidia/tegra210/include/soc/clock.h
index 87d0850..6d8c338 100644
--- a/src/soc/nvidia/tegra210/include/soc/clock.h
+++ b/src/soc/nvidia/tegra210/include/soc/clock.h
@@ -18,8 +18,8 @@
 #define __SOC_NVIDIA_TEGRA210_CLOCK_H__
 
 #include <arch/hlt.h>
-#include <arch/io.h>
 #include <console/console.h>
+#include <device/mmio.h>
 #include <soc/clk_rst.h>
 #include <stdint.h>
 #include <stdlib.h>

src/soc/nvidia/tegra210/include/soc/id.h

diff --git a/src/soc/nvidia/tegra210/include/soc/id.h b/src/soc/nvidia/tegra210/include/soc/id.h
index 42b2be6..49081db 100644
--- a/src/soc/nvidia/tegra210/include/soc/id.h
+++ b/src/soc/nvidia/tegra210/include/soc/id.h
@@ -17,7 +17,7 @@
 #define __SOC_NVIDIA_TEGRA210_INCLUDE_SOC_ID_H__
 
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <soc/addressmap.h>
 
 static inline int context_avp(void)

src/soc/nvidia/tegra210/include/soc/tegra_dsi.h

diff --git a/src/soc/nvidia/tegra210/include/soc/tegra_dsi.h b/src/soc/nvidia/tegra210/include/soc/tegra_dsi.h
index dbaaa22..00bf659 100644
--- a/src/soc/nvidia/tegra210/include/soc/tegra_dsi.h
+++ b/src/soc/nvidia/tegra210/include/soc/tegra_dsi.h
@@ -15,6 +15,8 @@
 #ifndef __TEGRA_DSI_H__
 #define __TEGRA_DSI_H__
 
+#include <device/mmio.h>
+
 #define DSI_INCR_SYNCPT			0x00
 #define DSI_INCR_SYNCPT_CONTROL		0x01
 #define DSI_INCR_SYNCPT_ERROR		0x02

src/soc/nvidia/tegra210/mipi.c

diff --git a/src/soc/nvidia/tegra210/mipi.c b/src/soc/nvidia/tegra210/mipi.c
index b19db43..f863496 100644
--- a/src/soc/nvidia/tegra210/mipi.c
+++ b/src/soc/nvidia/tegra210/mipi.c
@@ -15,7 +15,7 @@
 
 #include <types.h>
 #include <console/console.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <delay.h>

src/soc/nvidia/tegra210/monotonic_timer.c

diff --git a/src/soc/nvidia/tegra210/monotonic_timer.c b/src/soc/nvidia/tegra210/monotonic_timer.c
index e33cce0..ecedd828 100644
--- a/src/soc/nvidia/tegra210/monotonic_timer.c
+++ b/src/soc/nvidia/tegra210/monotonic_timer.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <soc/addressmap.h>
 #include <timer.h>
 

src/soc/nvidia/tegra210/padconfig.c

diff --git a/src/soc/nvidia/tegra210/padconfig.c b/src/soc/nvidia/tegra210/padconfig.c
index 40927d1cc..b054f39 100644
--- a/src/soc/nvidia/tegra210/padconfig.c
+++ b/src/soc/nvidia/tegra210/padconfig.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <soc/addressmap.h>
 #include <soc/padconfig.h>
 

src/soc/nvidia/tegra210/power.c

diff --git a/src/soc/nvidia/tegra210/power.c b/src/soc/nvidia/tegra210/power.c
index cef5b99..51928ae 100644
--- a/src/soc/nvidia/tegra210/power.c
+++ b/src/soc/nvidia/tegra210/power.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <assert.h>
 #include <console/console.h>
 #include <soc/addressmap.h>

src/soc/nvidia/tegra210/ram_code.c

diff --git a/src/soc/nvidia/tegra210/ram_code.c b/src/soc/nvidia/tegra210/ram_code.c
index 8715410..91f96ae 100644
--- a/src/soc/nvidia/tegra210/ram_code.c
+++ b/src/soc/nvidia/tegra210/ram_code.c
@@ -14,7 +14,7 @@
  *
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <soc/addressmap.h>
 #include <soc/sdram.h>
 #include <soc/nvidia/tegra/apbmisc.h>

src/soc/nvidia/tegra210/ramstage.c

diff --git a/src/soc/nvidia/tegra210/ramstage.c b/src/soc/nvidia/tegra210/ramstage.c
index 61e5341..54f4204 100644
--- a/src/soc/nvidia/tegra210/ramstage.c
+++ b/src/soc/nvidia/tegra210/ramstage.c
@@ -15,6 +15,7 @@
 
 #include <arch/lib_helpers.h>
 #include <arch/stages.h>
+#include <device/mmio.h>
 #include <gic.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>

src/soc/nvidia/tegra210/sdram.c

diff --git a/src/soc/nvidia/tegra210/sdram.c b/src/soc/nvidia/tegra210/sdram.c
index 53a2c49..e1d91fd 100644
--- a/src/soc/nvidia/tegra210/sdram.c
+++ b/src/soc/nvidia/tegra210/sdram.c
@@ -14,7 +14,7 @@
  *
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <console/console.h>
 #include <delay.h>
 #include <soc/addressmap.h>

src/soc/nvidia/tegra210/spi.c

diff --git a/src/soc/nvidia/tegra210/spi.c b/src/soc/nvidia/tegra210/spi.c
index ad6e200..6330779 100644
--- a/src/soc/nvidia/tegra210/spi.c
+++ b/src/soc/nvidia/tegra210/spi.c
@@ -15,7 +15,7 @@
  */
 
 #include <arch/cache.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <assert.h>
 #include <boot_device.h>
 #include <console/console.h>

src/soc/nvidia/tegra210/uart.c

diff --git a/src/soc/nvidia/tegra210/uart.c b/src/soc/nvidia/tegra210/uart.c
index 6fa8429..a91818c 100644
--- a/src/soc/nvidia/tegra210/uart.c
+++ b/src/soc/nvidia/tegra210/uart.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <boot/coreboot_tables.h>
 #include <console/uart.h>
 #include <drivers/uart/uart8250reg.h>