From d47bfb2bcb4b4690be7d771570ea4842d73b7fb8 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: May 03 2015 17:35:23 +0000
Subject: Enable ACPI on aarch64 (add minor patch to disable EXPERT requirement so we don't pull all those options in too)


---

diff --git a/arm64-acpi-drop-expert.patch b/arm64-acpi-drop-expert.patch
new file mode 100644
index 0000000..cb0d77c
--- /dev/null
+++ b/arm64-acpi-drop-expert.patch
@@ -0,0 +1,13 @@
+diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
+index ab2cbb5..87a6c19 100644
+--- a/drivers/acpi/Kconfig
++++ b/drivers/acpi/Kconfig
+@@ -5,7 +5,7 @@
+ menuconfig ACPI
+ 	bool "ACPI (Advanced Configuration and Power Interface) Support"
+ 	depends on !IA64_HP_SIM
+-	depends on IA64 || X86 || (ARM64 && EXPERT)
++	depends on IA64 || X86 || ARM64
+ 	depends on PCI
+ 	select PNP
+ 	default y
diff --git a/config-arm-generic b/config-arm-generic
index a6b5a8e..e2fdcb5 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -46,6 +46,7 @@ CONFIG_ARM_AMBA=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_ARM_CCI=y
 CONFIG_ARM_CCN=y
+CONFIG_ARM_CCI400_PMU=y
 CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_ARM_GIC=y
@@ -257,8 +258,6 @@ CONFIG_CMA_AREAS=7
 
 # CONFIG_ARM_PTDUMP is not set
 
-# CONFIG_ARM_CCI400_PMU is not set
-
 # CONFIG_PATA_PLATFORM is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_KEYBOARD_OMAP4 is not set
diff --git a/config-arm64 b/config-arm64
index 652262a..ae9ba10 100644
--- a/config-arm64
+++ b/config-arm64
@@ -140,6 +140,7 @@ CONFIG_ACPI_IPMI=y
 CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_HED=m
 CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_PCC=y
 
 CONFIG_NET_SB1000=y
 CONFIG_AMD_XGBE=m
diff --git a/kernel.spec b/kernel.spec
index 055213a..0af46f7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -577,6 +577,7 @@ Patch21000: amd-xgbe-a0-Add-support-for-XGBE-on-A0.patch
 Patch21001: amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch
 Patch21002: arm64-avoid-needing-console-to-enable-serial-console.patch
 Patch21003: usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch
+Patch21004: arm64-acpi-drop-expert.patch
 
 # ARMv7
 Patch21020: ARM-tegra-usb-no-reset.patch
@@ -1198,6 +1199,7 @@ ApplyPatch amd-xgbe-a0-Add-support-for-XGBE-on-A0.patch
 ApplyPatch amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch
 ApplyPatch arm64-avoid-needing-console-to-enable-serial-console.patch
 ApplyPatch usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch
+ApplyPatch arm64-acpi-drop-expert.patch
 
 #
 # ARM
@@ -2199,6 +2201,9 @@ fi
 #
 # 
 %changelog
+* Sun May  3 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable ACPI on aarch64
+
 * Fri May 01 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc1.git1.1
 - Linux v4.1-rc1-117-g4a152c3913fb
 - Reenable debugging options.