soc/amd/common: Fix indirect includes

Builds that would otherwise be reproducible are sometimes
broken due to added #include combined with __LINE__ used
in assert() statement.

Change-Id: If4a02393799a34bbae4f6e506052774526c1a969
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37266
Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl

@@ -12,7 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#include <soc/iomap.h>
+
+#include <amdblocks/acpimmio_map.h>
 
 /* Grunt specific I2S machine driver */
 Device (I2S)

src/soc/amd/common/block/gpio_banks/gpio.c

@@ -20,6 +20,7 @@
 #include <console/console.h>
 #include <gpio.h>
 #include <amdblocks/acpimmio.h>
+#include <amdblocks/acpimmio_map.h>
 #include <soc/gpio.h>
 #include <soc/smi.h>
 #include <assert.h>

src/soc/amd/common/block/include/amdblocks/gpio_banks.h

@@ -18,6 +18,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include <amdblocks/acpimmio_map.h>
 
 struct soc_amd_gpio {
 	uint8_t gpio;

src/soc/amd/picasso/acpi/sb_fch.asl

@@ -15,6 +15,7 @@
 
 #include <soc/gpio.h>
 #include <soc/iomap.h>
+#include <amdblocks/acpimmio_map.h>
 
 Device (AAHB)
 {

src/soc/amd/stoneyridge/acpi/sb_fch.asl

@@ -15,6 +15,7 @@
 
 #include <soc/gpio.h>
 #include <soc/iomap.h>
+#include <amdblocks/acpimmio_map.h>
 
 Device (AAHB)
 {