mb/prodrive/hermes: Clean up some cosmetics

Use lowercase for hex numbers, sort includes alphabetically and avoid
relying on indirect inclusion. Include `<intelblocks/gpio.h>` instead
of `<intelblocks/gpio_defs.h>`, as the latter implcitly relies on one
definition from `<soc/gpio.h>`. Also drop useless dsdt.asl and fix up
the indentation of some includes.

Tested with BUILD_TIMELESS=1, Prodrive Hermes remains identical.

Change-Id: I3aeb9a644cf33cb4b1987174f40ef0fc7daccfa9
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59672
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>

1 files changed, 3 insertions, 6 deletions

diff --git a/src/mainboard/prodrive/hermes/dsdt.asl b/src/mainboard/prodrive/hermes/dsdt.asl
index 97bee96406..9d62f408c6 100644
--- a/src/mainboard/prodrive/hermes/dsdt.asl
+++ b/src/mainboard/prodrive/hermes/dsdt.asl
@@ -7,22 +7,19 @@ DefinitionBlock(
 	ACPI_DSDT_REV_2,
 	OEM_ID,
 	ACPI_TABLE_CREATOR,
-	0x20110725	// OEM revision
+	0x20110725
 )
 {
 	#include <acpi/dsdt_top.asl>
 	#include <soc/intel/common/block/acpi/acpi/platform.asl>
-
-	// global NVS and variables
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 
 	Scope (\_SB) {
 		Device (PCI0) {
-		#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
-		#include <soc/intel/cannonlake/acpi/southbridge.asl>
+			#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
+			#include <soc/intel/cannonlake/acpi/southbridge.asl>
 		}
 	}
 
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
-
 }