Unverified Commit 4d4872fe authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ixp4xx-arm-soc-v5.17' of... 

Merge tag 'ixp4xx-arm-soc-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/soc

Some IXP4xx SoC and driver related changes for v5.17:

- Drop unused Kconfig options
- Drop unused platform data header file

* tag 'ixp4xx-arm-soc-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: ixp4xx: remove unused header file pata_ixp4xx_cf.h
  ARM: ixp4xx: remove dead configs CPU_IXP43X and CPU_IXP46X

Link: https://lore.kernel.org/r/CACRpkdZXZBpexMUuwTV-RB7_QAjBQkSbRsaBtgFShcqxuNTUgw@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6eecfd59 019cd8a9

arch/arm/mach-ixp4xx/Kconfig

+0 −13
Original line number Diff line number Diff line
@@ -39,19 +39,6 @@ config ARCH_PRPMC1100 
	  PrPCM1100 Processor Mezanine Module. For more information on

	  this platform, see <file:Documentation/arm/ixp4xx.rst>.



#

# Certain registers and IRQs are only enabled if supporting IXP465 CPUs

#

config CPU_IXP46X

	bool

	depends on MACH_IXDP465

	default y



config CPU_IXP43X

	bool

	depends on MACH_KIXRP435

	default y



comment "IXP4xx Options"



config IXP4XX_PCI_LEGACY

include/linux/platform_data/pata_ixp4xx_cf.h

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __PLATFORM_DATA_PATA_IXP4XX_H

#define __PLATFORM_DATA_PATA_IXP4XX_H



#include <linux/types.h>



/*

 * This structure provide a means for the board setup code

 * to give information to th pata_ixp4xx driver. It is

 * passed as platform_data.

 */

struct ixp4xx_pata_data {

	volatile u32	*cs0_cfg;

	volatile u32	*cs1_cfg;

	unsigned long	cs0_bits;

	unsigned long	cs1_bits;

	void __iomem	*cmd;

	void __iomem	*ctl;

};



#endif