From d678a59d2d719da9e807495b4b021501f2836ca5 Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
Date: Sat, 18 May 2024 20:20:43 -0600
Subject: Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay
 Ethernet""

When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay
Ethernet"' I failed to notice that b4 noticed it was based on next and
so took that as the base commit and merged that part of next to master.

This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing
changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35.

Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/input/apple_spi_kbd.c   | 1 +
 drivers/input/button_kbd.c      | 1 +
 drivers/input/cros_ec_keyb.c    | 1 +
 drivers/input/i8042.c           | 1 +
 drivers/input/input.c           | 2 +-
 drivers/input/key_matrix.c      | 1 +
 drivers/input/keyboard-uclass.c | 1 +
 drivers/input/tegra-kbc.c       | 2 +-
 8 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'drivers/input')

diff --git a/drivers/input/apple_spi_kbd.c b/drivers/input/apple_spi_kbd.c
index 5b30cec2dcb..7cf12f453a3 100644
--- a/drivers/input/apple_spi_kbd.c
+++ b/drivers/input/apple_spi_kbd.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2021 Mark Kettenis <kettenis@openbsd.org>
  */
 
+#include <common.h>
 #include <dm.h>
 #include <keyboard.h>
 #include <spi.h>
diff --git a/drivers/input/button_kbd.c b/drivers/input/button_kbd.c
index 0a917ac8b99..c73d3b18be9 100644
--- a/drivers/input/button_kbd.c
+++ b/drivers/input/button_kbd.c
@@ -4,6 +4,7 @@
  */
 
 #include <stdlib.h>
+#include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <input.h>
diff --git a/drivers/input/cros_ec_keyb.c b/drivers/input/cros_ec_keyb.c
index 0917ee20fed..c4853463739 100644
--- a/drivers/input/cros_ec_keyb.c
+++ b/drivers/input/cros_ec_keyb.c
@@ -5,6 +5,7 @@
  * Copyright (c) 2012 The Chromium OS Authors.
  */
 
+#include <common.h>
 #include <cros_ec.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c
index 9bf21053cf0..e6070ca0152 100644
--- a/drivers/input/i8042.c
+++ b/drivers/input/i8042.c
@@ -8,6 +8,7 @@
 
 #define LOG_CATEGORY UCLASS_KEYBOARD
 
+#include <common.h>
 #include <dm.h>
 #include <env.h>
 #include <errno.h>
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 3f146fb07e6..8a6506e7c6f 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -6,13 +6,13 @@
  * (C) Copyright 2004 DENX Software Engineering, Wolfgang Denk, wd@denx.de
  */
 
+#include <common.h>
 #include <console.h>
 #include <dm.h>
 #include <env.h>
 #include <errno.h>
 #include <log.h>
 #include <stdio_dev.h>
-#include <time.h>
 #include <input.h>
 #ifdef CONFIG_DM_KEYBOARD
 #include <keyboard.h>
diff --git a/drivers/input/key_matrix.c b/drivers/input/key_matrix.c
index 2e631660c88..e2fb2e17078 100644
--- a/drivers/input/key_matrix.c
+++ b/drivers/input/key_matrix.c
@@ -6,6 +6,7 @@
  * (C) Copyright 2004 DENX Software Engineering, Wolfgang Denk, wd@denx.de
  */
 
+#include <common.h>
 #include <dm.h>
 #include <key_matrix.h>
 #include <log.h>
diff --git a/drivers/input/keyboard-uclass.c b/drivers/input/keyboard-uclass.c
index df9ee8f7d65..aefc8e825e2 100644
--- a/drivers/input/keyboard-uclass.c
+++ b/drivers/input/keyboard-uclass.c
@@ -5,6 +5,7 @@
 
 #define LOG_CATEGORY UCLASS_KEYBOARD
 
+#include <common.h>
 #include <dm.h>
 #include <keyboard.h>
 #include <log.h>
diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c
index fc13975d4f0..d4741a76663 100644
--- a/drivers/input/tegra-kbc.c
+++ b/drivers/input/tegra-kbc.c
@@ -4,6 +4,7 @@
  *  NVIDIA Corporation <www.nvidia.com>
  */
 
+#include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <input.h>
@@ -12,7 +13,6 @@
 #include <log.h>
 #include <stdio_dev.h>
 #include <tegra-kbc.h>
-#include <time.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>
-- 
cgit v1.2.3