pá 4. 2. 2022 v 8:40 odesílatel Michal Simek michal.simek@xilinx.com napsal:

Platform specific headers are empty that's why there is no need to include them. That's why remove them for Zynq/ZynqMP and Versal.

Signed-off-by: Michal Simek michal.simek@xilinx.com

arch/arm/Kconfig | 4 ---- arch/arm/mach-versal/include/mach/gpio.h | 6 ------ arch/arm/mach-zynq/include/mach/gpio.h | 10 ---------- arch/arm/mach-zynqmp/include/mach/gpio.h | 11 ----------- 4 files changed, 31 deletions(-) delete mode 100644 arch/arm/mach-versal/include/mach/gpio.h delete mode 100644 arch/arm/mach-zynq/include/mach/gpio.h delete mode 100644 arch/arm/mach-zynqmp/include/mach/gpio.h

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6b11c3a50d91..ae5002c9e4d1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1138,7 +1138,6 @@ config ARCH_VERSAL select DM_MMC if MMC select DM_SERIAL select GICV3

•   select GPIO_EXTRA_HEADER
    select OF_CONTROL
    select SOC_DEVICE
    imply BOARD_LATE_INIT
  

@@ -1164,7 +1163,6 @@ config ARCH_ZYNQ select DM_SERIAL select DM_SPI select DM_SPI_FLASH

•   select GPIO_EXTRA_HEADER
    select OF_CONTROL
    select SPI
    select SPL_BOARD_INIT if SPL
  

@@ -1191,7 +1189,6 @@ config ARCH_ZYNQMP_R5 select DM_ETH if NET select DM_MMC if MMC select DM_SERIAL

•   select GPIO_EXTRA_HEADER
    select OF_CONTROL
    imply CMD_DM
    imply DM_USB_GADGET
  

@@ -1209,7 +1206,6 @@ config ARCH_ZYNQMP select DM_SPI_FLASH if DM_SPI imply FIRMWARE select GICV2

•   select GPIO_EXTRA_HEADER
    select OF_CONTROL
    select SPL_BOARD_INIT if SPL
    select SPL_CLK if SPL
  

diff --git a/arch/arm/mach-versal/include/mach/gpio.h b/arch/arm/mach-versal/include/mach/gpio.h deleted file mode 100644 index 677facba5efe..000000000000 --- a/arch/arm/mach-versal/include/mach/gpio.h +++ /dev/null @@ -1,6 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/*

• • Copyright 2016 - 2018 Xilinx, Inc.
• */

-/* Empty file - for compilation */ diff --git a/arch/arm/mach-zynq/include/mach/gpio.h b/arch/arm/mach-zynq/include/mach/gpio.h deleted file mode 100644 index 6143e24563bc..000000000000 --- a/arch/arm/mach-zynq/include/mach/gpio.h +++ /dev/null @@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/*

• • Copyright (c) 2013 Xilinx, Inc.
• • Copyright (c) 2015 DAVE Embedded Systems
• */

-#ifndef _ZYNQ_GPIO_H -#define _ZYNQ_GPIO_H

-#endif /* _ZYNQ_GPIO_H */ diff --git a/arch/arm/mach-zynqmp/include/mach/gpio.h b/arch/arm/mach-zynqmp/include/mach/gpio.h deleted file mode 100644 index 542a5fc3e944..000000000000 --- a/arch/arm/mach-zynqmp/include/mach/gpio.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/*

• • Copyright 2015 Xilinx, Inc.
• */

-#ifndef __ARCH_ZYNQMP_GPIO_H -#define __ARCH_ZYNQMP_GPIO_H

-/* Empty file - sdhci requires this. */

-#endif

2.35.0

Applied. M