[coreboot-gerrit] Patch set updated for coreboot: pcengines/apu1: Add ACPI led, button and GPIO devices.

Tobias Diedrich (ranma+coreboot@tdiedrich.de) gerrit at coreboot.org
Mon Jun 15 11:11:37 CEST 2015


Tobias Diedrich (ranma+coreboot at tdiedrich.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10540

-gerrit

commit f55a32c521e9ae045cddba6b9c89d28d1a5f37de
Author: Tobias Diedrich <ranma+coreboot at tdiedrich.de>
Date:   Sat Jun 13 13:29:50 2015 +0200

    pcengines/apu1: Add ACPI led, button and GPIO devices.
    
    Provide ACPI devices with devicetree-compatible annotations for the
    three leds and the button of the APU1, as well as the GPIO driver.
    
    This will cause the Linux kernel to automatically load the following
    modules:
      leds_gpio (CONFIG_LEDS_GPIO)
      gpio_keys_polled (CONFIG_KEYBOARD_GPIO_POLLED)
      gpio_sb8xx (CONFIG_GPIO_SB8XX)
    
    See
    http://events.linuxfoundation.org/sites/events/files/slides/ACPI_vs_DT.pdf
    and https://lwn.net/Articles/612062/ for some more information on how
    the PRP0001 HID works.
    
    To make this usable a Linux GPIO driver for the AMD chipset is also
    required, which I am currently working on, but have not submitted
    upstream yet.
    
    The default settings for the three leds copy the default from
    src/mainboard/pcengines/apu1/mainboard.c:
    /*
     * LED1/D7/GPIO_189 should be 0
     * LED2/D6/GPIO_190 should be 1
     * LED3/D5/GPIO_191 should be 1
     */
    mmio_base = find_gpio_base();
    configure_gpio(mmio_base, GPIO_189, GPIO_FTN_1, GPIO_OUTPUT | GPIO_DATA_LOW);
    configure_gpio(mmio_base, GPIO_190, GPIO_FTN_1, GPIO_OUTPUT | GPIO_DATA_HIGH);
    configure_gpio(mmio_base, GPIO_191, GPIO_FTN_1, GPIO_OUTPUT | GPIO_DATA_HIGH);
    
    TODO: "linux,default-trigger none" together with "linux,default-state
    keep" would be best and should cause linux to not touch the led state by
    defaul, but doesn't actually work.
    
    Change-Id: I956ee92d9d98ef27a83ccb30d314543bd8634f2c
    Signed-off-by: Tobias Diedrich <ranma+coreboot at tdiedrich.de>
---
 src/mainboard/pcengines/apu1/acpi/buttons.asl | 57 +++++++++++++++++++++
 src/mainboard/pcengines/apu1/acpi/gpio.asl    | 40 +++++++++++++++
 src/mainboard/pcengines/apu1/acpi/leds.asl    | 74 +++++++++++++++++++++++++++
 src/mainboard/pcengines/apu1/dsdt.asl         |  3 ++
 4 files changed, 174 insertions(+)

diff --git a/src/mainboard/pcengines/apu1/acpi/buttons.asl b/src/mainboard/pcengines/apu1/acpi/buttons.asl
new file mode 100644
index 0000000..e7c3165
--- /dev/null
+++ b/src/mainboard/pcengines/apu1/acpi/buttons.asl
@@ -0,0 +1,57 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Based on the example of Mika Westerberg: https://lwn.net/Articles/612062/
+ *
+ * Copyright (C) 2015 Tobias Diedrich, Mika Westerberg
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.
+ */
+
+Scope (\_SB.PCI0.SBUS)
+{
+	Device (BTNS)
+	{
+		Name (_HID, "PRP0001")
+
+		Name (_CRS, ResourceTemplate () {
+			GpioIo (Exclusive, PullUp, 0, 0, IoRestrictionInputOnly,
+				"\\_SB.PCI0.SBUS.GPIO", 0, ResourceConsumer) {187}
+		})
+
+		Name (_DSD, Package () {
+			ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+			Package () {
+				Package () {"compatible", Package () {"gpio-keys-polled"}},
+				Package () {"poll-interval", 100},
+				Package () {"autorepeat", 1}
+			}
+		})
+
+		Device (BTN1)
+		{
+			Name (_DSD, Package () {
+				ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+				Package () {
+					/* BTN_1 is 0x101 in linux/input.h */
+					Package () {"linux,code", 257},
+					Package () {"linux,input-type", 1},
+					/* labeled S1 on the board, MODESW in the gpio header files */
+					Package () {"label", "switch1"},
+					Package () {"gpios", Package () {^^BTNS, 0, 0, 1 /* low-active */}},
+				}
+			})
+		}
+	}
+}
diff --git a/src/mainboard/pcengines/apu1/acpi/gpio.asl b/src/mainboard/pcengines/apu1/acpi/gpio.asl
new file mode 100644
index 0000000..50fe7e1
--- /dev/null
+++ b/src/mainboard/pcengines/apu1/acpi/gpio.asl
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Based on the example of Mika Westerberg: https://lwn.net/Articles/612062/
+ *
+ * Copyright (C) 2015 Tobias Diedrich, Mika Westerberg
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.
+ */
+
+Scope (\_SB.PCI0.SBUS)
+{
+	Device (GPIO)
+	{
+		Name (_HID, "PRP0001")
+
+		Name (_CRS, ResourceTemplate () {
+			/* ACPI_MMIO_BASE + gpio offset */
+			Memory32Fixed(ReadWrite, 0xFED80100, 0x0000100)
+		})
+
+		Name (_DSD, Package () {
+			ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+			Package () {
+				Package () {"compatible", Package () {"gpio-sb8xx"}},
+			}
+		})
+	}
+}
diff --git a/src/mainboard/pcengines/apu1/acpi/leds.asl b/src/mainboard/pcengines/apu1/acpi/leds.asl
new file mode 100644
index 0000000..6329bcb
--- /dev/null
+++ b/src/mainboard/pcengines/apu1/acpi/leds.asl
@@ -0,0 +1,74 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Based on the example of Mika Westerberg: https://lwn.net/Articles/612062/
+ *
+ * Copyright (C) 2015 Tobias Diedrich, Mika Westerberg
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.
+ */
+
+Scope (\_SB.PCI0.SBUS)
+{
+	Device (LEDS)
+	{
+		Name (_HID, "PRP0001")
+
+		Name (_CRS, ResourceTemplate () {
+			GpioIo (Exclusive, PullUp, 0, 0, IoRestrictionOutputOnly,
+				"\\_SB.PCI0.SBUS.GPIO", 0, ResourceConsumer) {189, 190, 191}
+		})
+
+		Name (_DSD, Package () {
+			ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+			Package () {
+				Package () {"compatible", Package () {"gpio-leds"}},
+			}
+		})
+
+		Device (LED1)
+		{
+			Name (_DSD, Package () {
+				ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+				Package () {
+					Package () {"label", "led1"},
+					Package () {"gpios", Package () {^^LEDS, 0, 0, 1 /* low-active */}},
+					Package () {"linux,default-trigger", "default-on"},
+				} }) }
+
+		Device (LED2)
+		{
+			Name (_DSD, Package () {
+				ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+				Package () {
+					Package () {"label", "led2"},
+					Package () {"gpios", Package () {^^LEDS, 0, 1, 1 /* low-active */}},
+					Package () {"linux,default-trigger", "none"},
+				}
+			})
+		}
+
+		Device (LED3)
+		{
+			Name (_DSD, Package () {
+				ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+				Package () {
+					Package () {"label", "led3"},
+					Package () {"gpios", Package () {^^LEDS, 0, 2, 1 /* low-active */}},
+					Package () {"linux,default-trigger", "none"},
+				}
+			})
+		}
+	}
+}
diff --git a/src/mainboard/pcengines/apu1/dsdt.asl b/src/mainboard/pcengines/apu1/dsdt.asl
index 799f1fd..d0f720b 100644
--- a/src/mainboard/pcengines/apu1/dsdt.asl
+++ b/src/mainboard/pcengines/apu1/dsdt.asl
@@ -64,6 +64,9 @@ DefinitionBlock (
 	#include "acpi/sleep.asl"
 
 	#include "acpi/gpe.asl"
+	#include "acpi/gpio.asl"
+	#include "acpi/leds.asl"
+	#include "acpi/buttons.asl"
 	#include "acpi/thermal.asl"
 }
 /* End of ASL file */



More information about the coreboot-gerrit mailing list