Merge tag 'soc-arm-7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC board file updates from Arnd Bergmann:
 "These are mostly smaller cleanups for the remaining platform code in
  arch/arm/, the most notable one being the conversion of the
  s3c/crag6410 board to use software nodes for GPIO references in place
  of plain GPIO numbers.

  The earlier plan was to drop the deprecated (since 7.3) board files
  here, which would have been a much larger set of changes, but that is
  now deferred to 7.5"

* tag 'soc-arm-7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  MAINTAINERS: Drop arm64 dts/intel path from ARM/SOCFPGA ARCHITECTURE
  ARM: tegra: Fix Trun -> Turn typo
  ARM: vexpress: fix device_node refcount leak in vexpress_smp_dt_prepare_cpus()
  ARM: vexpress: fix device_node refcount leak in vexpress_flags_set()
  MAINTAINERS: Change ARM Visconti5 architecture maintenance status to Odd Fixes
  ARM: mvebu: fix Cortex-A9 errata selection for Armada 38x
  ARM: OMAP2+: remove unused ctrl_module_wkup_44xx.h header
  ARM: EXYNOS: Replace __ASSEMBLY__ with __ASSEMBLER__
  ARM: s3c: crag6410: use software nodes/properties to set up GPIO keys
  Input: samsung-keypad - remove support for platform data
  ARM: s3c: crag6410: switch keypad device to software properties
  ARM: s3c: register and attach software nodes for Samsung gpio_chips
  Input: samsung-keypad - handle compact binding
  dt-bindings: input: samsung,s3c6410-keypad: introduce compact binding
  ARM: imx6q: remove KSZ9021 PHY fixup
  ARM: imx: Fix suspend/resume crash with Clang CFI
  ARM: OMAP2+: Replace __ASSEMBLY__ with __ASSEMBLER__
  soc: imx: Replace __ASSEMBLY__ with __ASSEMBLER__ in header file
  ARM: imx: Replace __ASSEMBLY__ with __ASSEMBLER__
  MAINTAINERS: Add git tree for TI K3 ARCHITECTURE

2 files changed, 0 insertions, 44 deletions

diff --git a/include/linux/input/samsung-keypad.h b/include/linux/input/samsung-keypad.h
deleted file mode 100644
index ab6b97114c08..000000000000
--- a/include/linux/input/samsung-keypad.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Samsung Keypad platform data definitions
- *
- * Copyright (C) 2010 Samsung Electronics Co.Ltd
- * Author: Joonyoung Shim <jy0922.shim@samsung.com>
- */
-
-#ifndef __SAMSUNG_KEYPAD_H
-#define __SAMSUNG_KEYPAD_H
-
-#include <linux/input/matrix_keypad.h>
-
-#define SAMSUNG_MAX_ROWS	8
-#define SAMSUNG_MAX_COLS	8
-
-/**
- * struct samsung_keypad_platdata - Platform device data for Samsung Keypad.
- * @keymap_data: pointer to &matrix_keymap_data.
- * @rows: number of keypad row supported.
- * @cols: number of keypad col supported.
- * @no_autorepeat: disable key autorepeat.
- * @wakeup: controls whether the device should be set up as wakeup source.
- * @cfg_gpio: configure the GPIO.
- *
- * Initialisation data specific to either the machine or the platform
- * for the device driver to use or call-back when configuring gpio.
- */
-struct samsung_keypad_platdata {
-	const struct matrix_keymap_data	*keymap_data;
-	unsigned int rows;
-	unsigned int cols;
-	bool no_autorepeat;
-	bool wakeup;
-
-	void (*cfg_gpio)(unsigned int rows, unsigned int cols);
-};
-
-#endif /* __SAMSUNG_KEYPAD_H */
diff --git a/include/linux/micrel_phy.h b/include/linux/micrel_phy.h
index 9c6f9817383f..bb71b2510c2c 100644
--- a/include/linux/micrel_phy.h
+++ b/include/linux/micrel_phy.h
@@ -47,11 +47,6 @@
 #define MICREL_PHY_FXEN		BIT(1)
 #define MICREL_KSZ8_P1_ERRATA	BIT(2)
 
-#define MICREL_KSZ9021_EXTREG_CTRL	0xB
-#define MICREL_KSZ9021_EXTREG_DATA_WRITE	0xC
-#define MICREL_KSZ9021_RGMII_CLK_CTRL_PAD_SCEW	0x104
-#define MICREL_KSZ9021_RGMII_RX_DATA_PAD_SCEW	0x105
-
 /* Device specific MII_BMCR (Reg 0) bits */
 /* 1 = HP Auto MDI/MDI-X mode, 0 = Microchip Auto MDI/MDI-X mode */
 #define KSZ886X_BMCR_HP_MDIX			BIT(5)