| Message ID | 1449804086-3464-9-git-send-email-zhaoshenglong@huawei.com |
|---|---|
| State | New |
| Headers | show |
On Fri, 11 Dec 2015 11:21:24 +0800 Shannon Zhao <zhaoshenglong@huawei.com> wrote: > From: Shannon Zhao <shannon.zhao@linaro.org> > > Here GPIO pin 3 is used for Power Button, add _E03 in ACPI DSDT table. > > Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> > Tested-by: Wei Huang <wei@redhat.com> > --- > hw/arm/virt-acpi-build.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index e5dc2d5..1ffff62 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -339,6 +339,20 @@ static void acpi_dsdt_add_gpio(Aml *scope, const > MemMapEntry *gpio_memmap, aml_append(crs, aml_interrupt(AML_CONSUMER, > AML_LEVEL, AML_ACTIVE_HIGH, AML_EXCLUSIVE, &gpio_irq, 1)); > aml_append(dev, aml_name_decl("_CRS", crs)); > + > + Aml *aei = aml_resource_template(); > + /* Pin 3 for power button */ > + const uint32_t pin_list[1] = {3}; Sorry, just noticed, do we allow declarations in the middle of the block? The same applies to 'Aml *method' below. > + aml_append(aei, aml_gpio_int(AML_CONSUMER, AML_EDGE, > AML_ACTIVE_HIGH, > + AML_EXCLUSIVE, AML_PULL_UP, 0, > pin_list, 1, > + "GPO0", NULL, 0)); > + aml_append(dev, aml_name_decl("_AEI", aei)); > + > + /* _E03 is handle for power button */ > + Aml *method = aml_method("_E03", 0, AML_NOTSERIALIZED); > + aml_append(method, aml_notify(aml_name(ACPI_POWER_BUTTON_DEVICE), > + aml_int(0x80))); > + aml_append(dev, method); > aml_append(scope, dev); > } >
On 16 December 2015 at 15:51, Igor Mammedov <imammedo@redhat.com> wrote: > On Fri, 11 Dec 2015 11:21:24 +0800 > Shannon Zhao <zhaoshenglong@huawei.com> wrote: > >> From: Shannon Zhao <shannon.zhao@linaro.org> >> >> Here GPIO pin 3 is used for Power Button, add _E03 in ACPI DSDT table. >> >> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> >> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> >> Tested-by: Wei Huang <wei@redhat.com> >> --- >> hw/arm/virt-acpi-build.c | 14 ++++++++++++++ >> 1 file changed, 14 insertions(+) >> >> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c >> index e5dc2d5..1ffff62 100644 >> --- a/hw/arm/virt-acpi-build.c >> +++ b/hw/arm/virt-acpi-build.c >> @@ -339,6 +339,20 @@ static void acpi_dsdt_add_gpio(Aml *scope, const >> MemMapEntry *gpio_memmap, aml_append(crs, aml_interrupt(AML_CONSUMER, >> AML_LEVEL, AML_ACTIVE_HIGH, AML_EXCLUSIVE, &gpio_irq, 1)); >> aml_append(dev, aml_name_decl("_CRS", crs)); >> + >> + Aml *aei = aml_resource_template(); >> + /* Pin 3 for power button */ >> + const uint32_t pin_list[1] = {3}; > Sorry, just noticed, > do we allow declarations in the middle of the block? > The same applies to 'Aml *method' below. No, we prefer not to, but the file is full of them already... thanks -- PMM
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index e5dc2d5..1ffff62 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -339,6 +339,20 @@ static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap, aml_append(crs, aml_interrupt(AML_CONSUMER, AML_LEVEL, AML_ACTIVE_HIGH, AML_EXCLUSIVE, &gpio_irq, 1)); aml_append(dev, aml_name_decl("_CRS", crs)); + + Aml *aei = aml_resource_template(); + /* Pin 3 for power button */ + const uint32_t pin_list[1] = {3}; + aml_append(aei, aml_gpio_int(AML_CONSUMER, AML_EDGE, AML_ACTIVE_HIGH, + AML_EXCLUSIVE, AML_PULL_UP, 0, pin_list, 1, + "GPO0", NULL, 0)); + aml_append(dev, aml_name_decl("_AEI", aei)); + + /* _E03 is handle for power button */ + Aml *method = aml_method("_E03", 0, AML_NOTSERIALIZED); + aml_append(method, aml_notify(aml_name(ACPI_POWER_BUTTON_DEVICE), + aml_int(0x80))); + aml_append(dev, method); aml_append(scope, dev); }