Commit 1027b4df authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: mmp: remove old PM support 



Assuming that we don't actually want the old-style pm-mmp2.c
and pm-pxa910.c implementation, all these files can go away
as well.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 77acc85c

arch/arm/mach-mmp/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ config MACH_MMP_DT 
	select PINCTRL_SINGLE

	select ARCH_HAS_RESET_CONTROLLER

	select CPU_MOHAWK

	select CPU_PXA168 if ATAGS

	select CPU_PXA910 if ATAGS

	help

	  Include support for Marvell MMP2 based platforms using

	  the device tree. Needn't select any other machine while
@@ -34,7 +32,6 @@ config MACH_MMP2_DT 
	select PINCTRL_SINGLE

	select ARCH_HAS_RESET_CONTROLLER

	select CPU_PJ4

	select CPU_MMP2 if ATAGS

	select PM_GENERIC_DOMAINS if PM

	select PM_GENERIC_DOMAINS_OF if PM && OF

	help

arch/arm/mach-mmp/Makefile

+0 −9
Original line number Diff line number Diff line
@@ -4,15 +4,6 @@ 
#

obj-y				+= common.o time.o



# SoC support

obj-$(CONFIG_CPU_PXA168)	+= pxa168.o

obj-$(CONFIG_CPU_PXA910)	+= pxa910.o

obj-$(CONFIG_CPU_MMP2)		+= mmp2.o



ifeq ($(CONFIG_PM),y)

obj-$(CONFIG_CPU_PXA910)	+= pm-pxa910.o

obj-$(CONFIG_CPU_MMP2)		+= pm-mmp2.o

endif

ifeq ($(CONFIG_SMP),y)

obj-$(CONFIG_MACH_MMP3_DT)	+= platsmp.o

endif

arch/arm/mach-mmp/irqs.h

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

#ifndef __ASM_MACH_IRQS_H

#define __ASM_MACH_IRQS_H



/*

 * Interrupt numbers for PXA910

 */

#define IRQ_PXA910_NONE			(-1)

#define IRQ_PXA910_AIRQ			0

#define IRQ_PXA910_SSP3			1

#define IRQ_PXA910_SSP2			2

#define IRQ_PXA910_SSP1			3

#define IRQ_PXA910_PMIC_INT		4

#define IRQ_PXA910_RTC_INT		5

#define IRQ_PXA910_RTC_ALARM		6

#define IRQ_PXA910_TWSI0		7

#define IRQ_PXA910_GPU			8

#define IRQ_PXA910_KEYPAD		9

#define IRQ_PXA910_ROTARY		10

#define IRQ_PXA910_TRACKBALL		11

#define IRQ_PXA910_ONEWIRE		12

#define IRQ_PXA910_AP1_TIMER1		13

#define IRQ_PXA910_AP1_TIMER2		14

#define IRQ_PXA910_AP1_TIMER3		15

#define IRQ_PXA910_IPC_AP0		16

#define IRQ_PXA910_IPC_AP1		17

#define IRQ_PXA910_IPC_AP2		18

#define IRQ_PXA910_IPC_AP3		19

#define IRQ_PXA910_IPC_AP4		20

#define IRQ_PXA910_IPC_CP0		21

#define IRQ_PXA910_IPC_CP1		22

#define IRQ_PXA910_IPC_CP2		23

#define IRQ_PXA910_IPC_CP3		24

#define IRQ_PXA910_IPC_CP4		25

#define IRQ_PXA910_L2_DDR		26

#define IRQ_PXA910_UART2		27

#define IRQ_PXA910_UART3		28

#define IRQ_PXA910_AP2_TIMER1		29

#define IRQ_PXA910_AP2_TIMER2		30

#define IRQ_PXA910_CP2_TIMER1		31

#define IRQ_PXA910_CP2_TIMER2		32

#define IRQ_PXA910_CP2_TIMER3		33

#define IRQ_PXA910_GSSP			34

#define IRQ_PXA910_CP2_WDT		35

#define IRQ_PXA910_MAIN_PMU		36

#define IRQ_PXA910_CP_FREQ_CHG		37

#define IRQ_PXA910_AP_FREQ_CHG		38

#define IRQ_PXA910_MMC			39

#define IRQ_PXA910_AEU			40

#define IRQ_PXA910_LCD			41

#define IRQ_PXA910_CCIC			42

#define IRQ_PXA910_IRE			43

#define IRQ_PXA910_USB1			44

#define IRQ_PXA910_NAND			45

#define IRQ_PXA910_HIFI_DMA		46

#define IRQ_PXA910_DMA_INT0		47

#define IRQ_PXA910_DMA_INT1		48

#define IRQ_PXA910_AP_GPIO		49

#define IRQ_PXA910_AP2_TIMER3		50

#define IRQ_PXA910_USB2			51

#define IRQ_PXA910_TWSI1		54

#define IRQ_PXA910_CP_GPIO		55

#define IRQ_PXA910_UART1		59	/* Slow UART */

#define IRQ_PXA910_AP_PMU		60

#define IRQ_PXA910_SM_INT		63	/* from PinMux */



#endif /* __ASM_MACH_IRQS_H */

arch/arm/mach-mmp/mmp2.c

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

/*

 * linux/arch/arm/mach-mmp/mmp2.c

 *

 * code name MMP2

 *

 * Copyright (C) 2009 Marvell International Ltd.

 */

#include <linux/clk/mmp.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/irq.h>

#include <linux/irqchip/mmp.h>

#include <linux/platform_device.h>



#include <asm/hardware/cache-tauros2.h>



#include <asm/mach/time.h>

#include "addr-map.h"

#include <linux/soc/mmp/cputype.h>

#include <linux/soc/pxa/mfp.h>

#include "mmp2.h"

#include "pm-mmp2.h"



#include "common.h"



#define MFPR_VIRT_BASE	(APB_VIRT_BASE + 0x1e000)



static struct mfp_addr_map mmp2_addr_map[] __initdata = {



	MFP_ADDR_X(GPIO0, GPIO58, 0x54),

	MFP_ADDR_X(GPIO59, GPIO73, 0x280),

	MFP_ADDR_X(GPIO74, GPIO101, 0x170),



	MFP_ADDR(GPIO102, 0x0),

	MFP_ADDR(GPIO103, 0x4),

	MFP_ADDR(GPIO104, 0x1fc),

	MFP_ADDR(GPIO105, 0x1f8),

	MFP_ADDR(GPIO106, 0x1f4),

	MFP_ADDR(GPIO107, 0x1f0),

	MFP_ADDR(GPIO108, 0x21c),

	MFP_ADDR(GPIO109, 0x218),

	MFP_ADDR(GPIO110, 0x214),

	MFP_ADDR(GPIO111, 0x200),

	MFP_ADDR(GPIO112, 0x244),

	MFP_ADDR(GPIO113, 0x25c),

	MFP_ADDR(GPIO114, 0x164),

	MFP_ADDR_X(GPIO115, GPIO122, 0x260),



	MFP_ADDR(GPIO123, 0x148),

	MFP_ADDR_X(GPIO124, GPIO141, 0xc),



	MFP_ADDR(GPIO142, 0x8),

	MFP_ADDR_X(GPIO143, GPIO151, 0x220),

	MFP_ADDR_X(GPIO152, GPIO153, 0x248),

	MFP_ADDR_X(GPIO154, GPIO155, 0x254),

	MFP_ADDR_X(GPIO156, GPIO159, 0x14c),



	MFP_ADDR(GPIO160, 0x250),

	MFP_ADDR(GPIO161, 0x210),

	MFP_ADDR(GPIO162, 0x20c),

	MFP_ADDR(GPIO163, 0x208),

	MFP_ADDR(GPIO164, 0x204),

	MFP_ADDR(GPIO165, 0x1ec),

	MFP_ADDR(GPIO166, 0x1e8),

	MFP_ADDR(GPIO167, 0x1e4),

	MFP_ADDR(GPIO168, 0x1e0),



	MFP_ADDR_X(TWSI1_SCL, TWSI1_SDA, 0x140),

	MFP_ADDR_X(TWSI4_SCL, TWSI4_SDA, 0x2bc),



	MFP_ADDR(PMIC_INT, 0x2c4),

	MFP_ADDR(CLK_REQ, 0x160),



	MFP_ADDR_END,

};



void mmp2_clear_pmic_int(void)

{

	void __iomem *mfpr_pmic;

	unsigned long data;



	mfpr_pmic = APB_VIRT_BASE + 0x1e000 + 0x2c4;

	data = __raw_readl(mfpr_pmic);

	__raw_writel(data | (1 << 6), mfpr_pmic);

	__raw_writel(data, mfpr_pmic);

}



static int __init mmp2_init(void)

{

	if (cpu_is_mmp2()) {

#ifdef CONFIG_CACHE_TAUROS2

		tauros2_init(0);

#endif

		mfp_init_base(MFPR_VIRT_BASE);

		mfp_init_addr(mmp2_addr_map);

		mmp2_clk_init(APB_PHYS_BASE + 0x50000,

			      AXI_PHYS_BASE + 0x82800,

			      APB_PHYS_BASE + 0x15000);

	}



	return 0;

}

postcore_initcall(mmp2_init);

arch/arm/mach-mmp/mmp2.h

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

#ifndef __ASM_MACH_MMP2_H

#define __ASM_MACH_MMP2_H



extern void mmp2_clear_pmic_int(void);



#endif /* __ASM_MACH_MMP2_H */