Commit Graph

5 Commits

Author SHA1 Message Date
Tom Rini
5d401bfbdf Subtree merge tag 'v7.0-dts' of dts repo [1] into dts/upstream
[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git

- Remove netc_timerX nodes from arch/arm/dts/imx943-u-boot.dtsi as they
  are now upstream
- Move dts/upstream/include/dt-bindings/reset/bcm6318-reset.h to
  include/dt-bindings/reset/bcm6318-reset.h as upstream has removed this
  file as unused (but we use it).

Signed-off-by: Tom Rini <trini@konsulko.com>
2026-04-20 11:43:11 -06:00
Tom Rini
6a042f830f Subtree merge tag 'v6.12-dts' of dts repo [1] into dts/upstream
[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git

Based on what "git diff" suggests, rename a device tree for
imx8mm_venice_defconfig and imx8mp_venice_defconfig

Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Tim Harvey <tharvey@gateworks.com>
2024-12-24 13:33:03 -06:00
Tom Rini
136b7b6d2e Subtree merge tag 'v6.11-dts' of dts repo [1] into dts/upstream
[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git
2024-10-01 12:24:21 -06:00
Tom Rini
5024a96db8 Subtree merge tag 'v6.10-dts' of devicetree-rebasing repo [1] into dts/upstream
[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/
2024-07-20 11:15:22 -06:00
Tom Rini
dbe9334e51 Merge commit '53633a893a06bd5a0c807287d9cc29337806eaf7' as 'dts/upstream' 2024-02-29 12:33:36 -05:00