diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-05 07:51:12 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-05 07:51:12 -0500 |
| commit | 9f976bac2b4a81a13de8124a896a198cbeabb634 (patch) | |
| tree | 30d0db0155174797c61f57d8125988dd8725dd4f /doc/device-tree-bindings | |
| parent | d16e18ca6c4d81ac142acd529b1acb55b0c96dfc (diff) | |
| parent | 2c64d11e3239b5b3cf29c911fd9cdb6ebb3880d6 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Revert "x86: use invd instead of wbinvd in real mode start code"
- Convert toradex boards README to reST
- serial: ns16550: Move PCI access from ofdata_to_platdata() to probe()
- x86: apl: Use cpu_x86_get_count() for cpu_ops.get_count
Diffstat (limited to 'doc/device-tree-bindings')
| -rw-r--r-- | doc/device-tree-bindings/gpio/intel,apl-gpio.txt | 2 | ||||
| -rw-r--r-- | doc/device-tree-bindings/pinctrl/intel,apl-pinctrl.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/device-tree-bindings/gpio/intel,apl-gpio.txt b/doc/device-tree-bindings/gpio/intel,apl-gpio.txt index e27a40b437..cf0659b70e 100644 --- a/doc/device-tree-bindings/gpio/intel,apl-gpio.txt +++ b/doc/device-tree-bindings/gpio/intel,apl-gpio.txt @@ -23,7 +23,7 @@ Example: { p2sb: p2sb@d,0 { reg = <0x02006810 0 0 0 0>; - compatible = "intel,apl-p2sb"; + compatible = "intel,p2sb"; early-regs = <IOMAP_P2SB_BAR 0x100000>; north { diff --git a/doc/device-tree-bindings/pinctrl/intel,apl-pinctrl.txt b/doc/device-tree-bindings/pinctrl/intel,apl-pinctrl.txt index cd7f8a0ca3..12ec846107 100644 --- a/doc/device-tree-bindings/pinctrl/intel,apl-pinctrl.txt +++ b/doc/device-tree-bindings/pinctrl/intel,apl-pinctrl.txt @@ -23,7 +23,7 @@ Example: { p2sb: p2sb@d,0 { reg = <0x02006810 0 0 0 0>; - compatible = "intel,apl-p2sb"; + compatible = "intel,p2sb"; early-regs = <IOMAP_P2SB_BAR 0x100000>; n { |