diff mbox series

[U-Boot,v1,2/2] x86: tangier: Add Bluetooth to ACPI table

Message ID 20180104164013.64456-2-andriy.shevchenko@linux.intel.com
State Accepted
Commit 5d8c4ebd95e23a606a40a73920b8d7d096a91d37
Delegated to: Bin Meng
Headers show
Series [U-Boot,v1,1/2] x86: tangier: Use actual GPIO hardware numbers | expand

Commit Message

Andy Shevchenko Jan. 4, 2018, 4:40 p.m. UTC
As defined on reference board followed by Intel Edison a Bluetooth
device is attached to HSU0, i.e. PCI 0000:04.1.

Describe it in ACPI accordingly.

Note, we use BCM2E95 ID here as one most suitable for such device based
on the description in commit message of commit 89ab37b489d1
	("Bluetooth: hci_bcm: Add support for BCM2E95 and BCM2E96")
in the Linux kernel source tree.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 .../include/asm/arch-tangier/acpi/southcluster.asl | 51 ++++++++++++++++++++++
 1 file changed, 51 insertions(+)

Comments

Bin Meng Jan. 8, 2018, 3:20 a.m. UTC | #1
On Fri, Jan 5, 2018 at 12:40 AM, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> As defined on reference board followed by Intel Edison a Bluetooth
> device is attached to HSU0, i.e. PCI 0000:04.1.
>
> Describe it in ACPI accordingly.
>
> Note, we use BCM2E95 ID here as one most suitable for such device based
> on the description in commit message of commit 89ab37b489d1
>         ("Bluetooth: hci_bcm: Add support for BCM2E95 and BCM2E96")
> in the Linux kernel source tree.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  .../include/asm/arch-tangier/acpi/southcluster.asl | 51 ++++++++++++++++++++++
>  1 file changed, 51 insertions(+)
>

Acked-by: Bin Meng <bmeng.cn@gmail.com>
Simon Glass Jan. 8, 2018, 4:51 a.m. UTC | #2
On 4 January 2018 at 09:40, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> As defined on reference board followed by Intel Edison a Bluetooth
> device is attached to HSU0, i.e. PCI 0000:04.1.
>
> Describe it in ACPI accordingly.
>
> Note, we use BCM2E95 ID here as one most suitable for such device based
> on the description in commit message of commit 89ab37b489d1
>         ("Bluetooth: hci_bcm: Add support for BCM2E95 and BCM2E96")
> in the Linux kernel source tree.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  .../include/asm/arch-tangier/acpi/southcluster.asl | 51 ++++++++++++++++++++++
>  1 file changed, 51 insertions(+)

Reviewed-by: Simon Glass <sjg@chromium.org>
Bin Meng Jan. 9, 2018, 1:51 a.m. UTC | #3
On Mon, Jan 8, 2018 at 12:51 PM, Simon Glass <sjg@chromium.org> wrote:
> On 4 January 2018 at 09:40, Andy Shevchenko
> <andriy.shevchenko@linux.intel.com> wrote:
>> As defined on reference board followed by Intel Edison a Bluetooth
>> device is attached to HSU0, i.e. PCI 0000:04.1.
>>
>> Describe it in ACPI accordingly.
>>
>> Note, we use BCM2E95 ID here as one most suitable for such device based
>> on the description in commit message of commit 89ab37b489d1
>>         ("Bluetooth: hci_bcm: Add support for BCM2E95 and BCM2E96")
>> in the Linux kernel source tree.
>>
>> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>> ---
>>  .../include/asm/arch-tangier/acpi/southcluster.asl | 51 ++++++++++++++++++++++
>>  1 file changed, 51 insertions(+)
>
> Reviewed-by: Simon Glass <sjg@chromium.org>

applied to u-boot-x86, thanks!
diff mbox series

Patch

diff --git a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
index 8162df59b5..2b3b897c5b 100644
--- a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
+++ b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl
@@ -260,6 +260,57 @@  Device (PCI0)
             Return (STA_VISIBLE)
         }
     }
+
+    Device (HSU0)
+    {
+        Name (_ADR, 0x00040001)
+
+        Method (_STA, 0, NotSerialized)
+        {
+            Return (STA_VISIBLE)
+        }
+
+        Device (BTH0)
+        {
+            Name (_HID, "BCM2E95")
+            Name (_DEP, Package ()
+            {
+                GPIO,
+                HSU0
+            })
+
+            Method (_STA, 0, NotSerialized)
+            {
+                Return (STA_VISIBLE)
+            }
+
+            Method (_CRS, 0, NotSerialized)
+            {
+                Name (RBUF, ResourceTemplate ()
+                {
+                    UartSerialBus (0x0001C200, DataBitsEight, StopBitsOne,
+                        0xFC, LittleEndian, ParityTypeNone, FlowControlHardware,
+                        0x20, 0x20, "\\_SB.PCI0.HSU0", 0, ResourceConsumer, , )
+                    GpioInt (Level, ActiveHigh, Exclusive, PullNone, 0,
+                        "\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 185 }
+                    GpioIo (Exclusive, PullDefault, 0, 0, IoRestrictionOutputOnly,
+                        "\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 184 }
+                    GpioIo (Exclusive, PullDefault, 0, 0, IoRestrictionOutputOnly,
+                        "\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 71 }
+                })
+                Return (RBUF)
+            }
+
+            Name (_DSD, Package () {
+                ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+                Package () {
+                    Package () { "host-wakeup-gpios", Package () { ^BTH0, 0, 0, 0 } },
+                    Package () { "device-wakeup-gpios", Package () { ^BTH0, 1, 0, 0 } },
+                    Package () { "shutdown-gpios", Package () { ^BTH0, 2, 0, 0 } },
+                }
+            })
+        }
+    }
 }
 
 Device (FLIS)