mbox series

[GIT,PULL] arm64: dts: amlogic updates for v5.11

Message ID 7heek9jgox.fsf@baylibre.com (mailing list archive)
State Queued
Headers show
Series [GIT,PULL] arm64: dts: amlogic updates for v5.11 | expand

Pull-request

https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git tags/amlogic-dt64

Message

Kevin Hilman Dec. 1, 2020, 10:37 p.m. UTC
Arnd, Olof,

Note that this branch pulls in a tag from the clk-meson tree which has
already been queued for clk-next.  This is for a couple new clock IDs.
I also included my amlogic-fixes tag (which you've already pulled) to
fix up potential conflicts.

Kevin


The following changes since commit 3650b228f83adda7e5ee532e2b90429c03f7b9ec:

  Linux 5.10-rc1 (2020-10-25 15:14:11 -0700)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git tags/amlogic-dt64

for you to fetch changes up to b6a1c8a1eaa73b1e2ae251399308e9445d74cef7:

  arm64: dts: meson-sm1: fix typo in opp table (2020-11-30 16:12:46 -0800)

----------------------------------------------------------------
arm64: dts: amlogic updates for v5.11
- AXG SoCs: add/enable PCIe & USB OTG support
- AXG SoCs: add MIPI DSI support
- Khadas VIM: add RTC
- several cleanups & fixups

----------------------------------------------------------------
Anand Moon (1):
      arm64: dts: amlogic: add missing ethernet reset ID

Artem Lapkin (1):
      arm64: dts: meson: fix spi-max-frequency on Khadas VIM2

Christian Hewitt (7):
      arm64: dts: meson: remove empty lines from aml-s905x-cc v2 dts
      arm64: dts: meson: add watchdog to g12-common dtsi
      arm64: dts: meson: enable rtc node on Khadas VIM1/VIM2 boards
      arm64: dts: meson: Add capacity-dmips-mhz attributes to GXM
      arm64: dts: meson: add rtc aliases to meson-khadas-vim3.dtsi
      arm64: dts: meson: update the Khadas VIM3/3L LED bindings
      arm64: dts: meson: add KHAMSIN IR remote node to SML5442TW

Dongjin Kim (1):
      arm64: dts: meson-sm1: fix typo in opp table

Jerome Brunet (1):
      arm64: dts: meson: odroid-n2 plus: fix vddcpu_a pwm

Kevin Hilman (2):
      Merge tag 'amlogic-fixes' into v5.11/dt64
      Merge tag 'clk-meson-v5.11-headers-1' of git://github.com/BayLibre/clk-meson into v5.11/dt64-deps

Martin Blumenstingl (2):
      arm64: dts: amlogic: meson-g12: use the G12A specific dwmac compatible
      ARM: dts: meson8: remove two invalid interrupt lines from the GPU node

Neil Armstrong (8):
      arm64: dts: meson-axg: add USB nodes
      arm64: dts: meson-axg-s400: enable USB OTG
      dt-bindings: clk: axg-clkc: add Video Clocks
      dt-bindings: clk: axg-clkc: add MIPI DSI Host clock binding
      arm64: dts: meson-axg: add PWRC node
      arm64: dts: meson-axg: add MIPI DSI PHY nodes
      arm64: dts: meson-axg: add PCIe nodes
      arm64: dts: meson-axg-s400: enable PCIe M.2 Key E slots

Scott K Logan (1):
      arm64: dts: meson: add missing g12 rng clock

 arch/arm64/boot/dts/amlogic/meson-axg-s400.dts                  |  16 +++
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi                      | 174 +++++++++++++++++++++++++++++++
 arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi               |  12 ++-
 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dts       |   2 +-
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi                       |   3 +
 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts       |   4 +
 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts      |   3 +-
 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts |   4 -
 arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts           |   5 +-
 arch/arm64/boot/dts/amlogic/meson-gxm.dtsi                      |  20 ++++
 arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi              |  15 ++-
 arch/arm64/boot/dts/amlogic/meson-sm1.dtsi                      |   2 +-
 include/dt-bindings/clock/axg-clkc.h                            |  25 +++++
 13 files changed, 268 insertions(+), 17 deletions(-)

Comments

Arnd Bergmann Dec. 8, 2020, 11:09 p.m. UTC | #1
From: Arnd Bergmann <arnd@arndb.de>

On Tue, 01 Dec 2020 14:37:50 -0800, Kevin Hilman wrote:
> Arnd, Olof,
> 
> Note that this branch pulls in a tag from the clk-meson tree which has
> already been queued for clk-next.  This is for a couple new clock IDs.
> I also included my amlogic-fixes tag (which you've already pulled) to
> fix up potential conflicts.
> 
> Kevin
> 
> [...]

Merged into arm/dt, thanks!

merge commit: b03455ae3c8a7e7999f9cc43ad87c63b44a89344

       Arnd