Commit ef1dfa73 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-cleanup5' of... 

Merge tag 'at91-cleanup5' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/cleanup

Pull "Fifth batch of cleanup/SoC for 3.19" from Nicolas Ferre:

- removal of now dead code and AT91-specific driver
- removal of !DT initialization in some core AT91 drivers
- simplification of Kconfig DT board file selection: now automatic

* tag 'at91-cleanup5' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91

:
  ARM: at91: remove unused board.h file
  ARM: at91: remove unneeded header files
  ARM: at91/clocksource: remove !DT PIT initializations
  ARM: at91: at91rm9200 ST initialization is now DT only
  ARM: at91: remove old AT91-specific drivers
  ARM: at91: cleanup initilisation code by removing dead code
  ARM: at91/Kconfig: select board files automatically

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3d266069 ba62a859

arch/arm/mach-at91/Kconfig

+2 −12
Original line number Diff line number Diff line
@@ -174,21 +174,11 @@ config SOC_AT91SAM9N12 
# ----------------------------------------------------------

endif # SOC_SAM_V4_V5



comment "Generic Board Type"



config MACH_AT91RM9200_DT

	bool "Atmel AT91RM9200 Evaluation Kits with device-tree support"

	depends on SOC_AT91RM9200

	help

	  Select this if you want to experiment device-tree with

	  an Atmel RM9200 Evaluation Kit.

	def_bool SOC_AT91RM9200



config MACH_AT91SAM9_DT

	bool "Atmel AT91SAM Evaluation Kits with device-tree support"

	depends on SOC_AT91SAM9

	help

	  Select this if you want to experiment device-tree with

	  an Atmel Evaluation Kit.

	def_bool SOC_AT91SAM9



# ----------------------------------------------------------

arch/arm/mach-at91/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for the linux kernel.

#



obj-y		:= gpio.o setup.o sysirq_mask.o

obj-y		:= setup.o sysirq_mask.o



obj-$(CONFIG_SOC_AT91SAM9)	+= sam9_smc.o
@@ -25,9 +25,6 @@ obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o 
# SAMA5 board with device-tree

obj-$(CONFIG_SOC_SAMA5)		+= board-dt-sama5.o



# Drivers

obj-y				+= leds.o



# Power Management

obj-$(CONFIG_PM)		+= pm.o

obj-$(CONFIG_AT91_SLOW_CLOCK)	+= pm_slowclock.o

arch/arm/mach-at91/at91_tc.h

deleted100644 → 0
+0 −146
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-at91/include/mach/at91_tc.h

 *

 * Copyright (C) SAN People

 *

 * Timer/Counter Unit (TC) registers.

 * Based on AT91RM9200 datasheet revision E.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */



#ifndef AT91_TC_H

#define AT91_TC_H



#define AT91_TC_BCR		0xc0		/* TC Block Control Register */

#define		AT91_TC_SYNC		(1 << 0)	/* Synchro Command */



#define AT91_TC_BMR		0xc4		/* TC Block Mode Register */

#define		AT91_TC_TC0XC0S		(3 << 0)	/* External Clock Signal 0 Selection */

#define			AT91_TC_TC0XC0S_TCLK0		(0 << 0)

#define			AT91_TC_TC0XC0S_NONE		(1 << 0)

#define			AT91_TC_TC0XC0S_TIOA1		(2 << 0)

#define			AT91_TC_TC0XC0S_TIOA2		(3 << 0)

#define		AT91_TC_TC1XC1S		(3 << 2)	/* External Clock Signal 1 Selection */

#define			AT91_TC_TC1XC1S_TCLK1		(0 << 2)

#define			AT91_TC_TC1XC1S_NONE		(1 << 2)

#define			AT91_TC_TC1XC1S_TIOA0		(2 << 2)

#define			AT91_TC_TC1XC1S_TIOA2		(3 << 2)

#define		AT91_TC_TC2XC2S		(3 << 4)	/* External Clock Signal 2 Selection */

#define			AT91_TC_TC2XC2S_TCLK2		(0 << 4)

#define			AT91_TC_TC2XC2S_NONE		(1 << 4)

#define			AT91_TC_TC2XC2S_TIOA0		(2 << 4)

#define			AT91_TC_TC2XC2S_TIOA1		(3 << 4)





#define AT91_TC_CCR		0x00		/* Channel Control Register */

#define		AT91_TC_CLKEN		(1 << 0)	/* Counter Clock Enable Command */

#define		AT91_TC_CLKDIS		(1 << 1)	/* Counter CLock Disable Command */

#define		AT91_TC_SWTRG		(1 << 2)	/* Software Trigger Command */



#define AT91_TC_CMR		0x04		/* Channel Mode Register */

#define		AT91_TC_TCCLKS		(7 << 0)	/* Capture/Waveform Mode: Clock Selection */

#define			AT91_TC_TIMER_CLOCK1		(0 << 0)

#define			AT91_TC_TIMER_CLOCK2		(1 << 0)

#define			AT91_TC_TIMER_CLOCK3		(2 << 0)

#define			AT91_TC_TIMER_CLOCK4		(3 << 0)

#define			AT91_TC_TIMER_CLOCK5		(4 << 0)

#define			AT91_TC_XC0			(5 << 0)

#define			AT91_TC_XC1			(6 << 0)

#define			AT91_TC_XC2			(7 << 0)

#define		AT91_TC_CLKI		(1 << 3)	/* Capture/Waveform Mode: Clock Invert */

#define		AT91_TC_BURST		(3 << 4)	/* Capture/Waveform Mode: Burst Signal Selection */

#define		AT91_TC_LDBSTOP		(1 << 6)	/* Capture Mode: Counter Clock Stopped with TB Loading */

#define		AT91_TC_LDBDIS		(1 << 7)	/* Capture Mode: Counter Clock Disable with RB Loading */

#define		AT91_TC_ETRGEDG		(3 << 8)	/* Capture Mode: External Trigger Edge Selection */

#define		AT91_TC_ABETRG		(1 << 10)	/* Capture Mode: TIOA or TIOB External Trigger Selection */

#define		AT91_TC_CPCTRG		(1 << 14)	/* Capture Mode: RC Compare Trigger Enable */

#define		AT91_TC_WAVE		(1 << 15)	/* Capture/Waveform mode */

#define		AT91_TC_LDRA		(3 << 16)	/* Capture Mode: RA Loading Selection */

#define		AT91_TC_LDRB		(3 << 18)	/* Capture Mode: RB Loading Selection */



#define		AT91_TC_CPCSTOP		(1 <<  6)	/* Waveform Mode: Counter Clock Stopped with RC Compare */

#define		AT91_TC_CPCDIS		(1 <<  7)	/* Waveform Mode: Counter Clock Disable with RC Compare */

#define		AT91_TC_EEVTEDG		(3 <<  8)	/* Waveform Mode: External Event Edge Selection */

#define			AT91_TC_EEVTEDG_NONE		(0 << 8)

#define			AT91_TC_EEVTEDG_RISING		(1 << 8)

#define			AT91_TC_EEVTEDG_FALLING		(2 << 8)

#define			AT91_TC_EEVTEDG_BOTH		(3 << 8)

#define		AT91_TC_EEVT		(3 << 10)	/* Waveform Mode: External Event Selection */

#define			AT91_TC_EEVT_TIOB		(0 << 10)

#define			AT91_TC_EEVT_XC0		(1 << 10)

#define			AT91_TC_EEVT_XC1		(2 << 10)

#define			AT91_TC_EEVT_XC2		(3 << 10)

#define		AT91_TC_ENETRG		(1 << 12)	/* Waveform Mode: External Event Trigger Enable */

#define		AT91_TC_WAVESEL		(3 << 13)	/* Waveform Mode: Waveform Selection */

#define			AT91_TC_WAVESEL_UP		(0 << 13)

#define			AT91_TC_WAVESEL_UP_AUTO		(2 << 13)

#define			AT91_TC_WAVESEL_UPDOWN		(1 << 13)

#define			AT91_TC_WAVESEL_UPDOWN_AUTO	(3 << 13)

#define		AT91_TC_ACPA		(3 << 16)	/* Waveform Mode: RA Compare Effect on TIOA */

#define			AT91_TC_ACPA_NONE		(0 << 16)

#define			AT91_TC_ACPA_SET		(1 << 16)

#define			AT91_TC_ACPA_CLEAR		(2 << 16)

#define			AT91_TC_ACPA_TOGGLE		(3 << 16)

#define		AT91_TC_ACPC		(3 << 18)	/* Waveform Mode: RC Compre Effect on TIOA */

#define			AT91_TC_ACPC_NONE		(0 << 18)

#define			AT91_TC_ACPC_SET		(1 << 18)

#define			AT91_TC_ACPC_CLEAR		(2 << 18)

#define			AT91_TC_ACPC_TOGGLE		(3 << 18)

#define		AT91_TC_AEEVT		(3 << 20)	/* Waveform Mode: External Event Effect on TIOA */

#define			AT91_TC_AEEVT_NONE		(0 << 20)

#define			AT91_TC_AEEVT_SET		(1 << 20)

#define			AT91_TC_AEEVT_CLEAR		(2 << 20)

#define			AT91_TC_AEEVT_TOGGLE		(3 << 20)

#define		AT91_TC_ASWTRG		(3 << 22)	/* Waveform Mode: Software Trigger Effect on TIOA */

#define			AT91_TC_ASWTRG_NONE		(0 << 22)

#define			AT91_TC_ASWTRG_SET		(1 << 22)

#define			AT91_TC_ASWTRG_CLEAR		(2 << 22)

#define			AT91_TC_ASWTRG_TOGGLE		(3 << 22)

#define		AT91_TC_BCPB		(3 << 24)	/* Waveform Mode: RB Compare Effect on TIOB */

#define			AT91_TC_BCPB_NONE		(0 << 24)

#define			AT91_TC_BCPB_SET		(1 << 24)

#define			AT91_TC_BCPB_CLEAR		(2 << 24)

#define			AT91_TC_BCPB_TOGGLE		(3 << 24)

#define		AT91_TC_BCPC		(3 << 26)	/* Waveform Mode: RC Compare Effect on TIOB */

#define			AT91_TC_BCPC_NONE		(0 << 26)

#define			AT91_TC_BCPC_SET		(1 << 26)

#define			AT91_TC_BCPC_CLEAR		(2 << 26)

#define			AT91_TC_BCPC_TOGGLE		(3 << 26)

#define		AT91_TC_BEEVT		(3 << 28)	/* Waveform Mode: External Event Effect on TIOB */

#define			AT91_TC_BEEVT_NONE		(0 << 28)

#define			AT91_TC_BEEVT_SET		(1 << 28)

#define			AT91_TC_BEEVT_CLEAR		(2 << 28)

#define			AT91_TC_BEEVT_TOGGLE		(3 << 28)

#define		AT91_TC_BSWTRG		(3 << 30)	/* Waveform Mode: Software Trigger Effect on TIOB */

#define			AT91_TC_BSWTRG_NONE		(0 << 30)

#define			AT91_TC_BSWTRG_SET		(1 << 30)

#define			AT91_TC_BSWTRG_CLEAR		(2 << 30)

#define			AT91_TC_BSWTRG_TOGGLE		(3 << 30)



#define AT91_TC_CV		0x10		/* Counter Value */

#define AT91_TC_RA		0x14		/* Register A */

#define AT91_TC_RB		0x18		/* Register B */

#define AT91_TC_RC		0x1c		/* Register C */



#define AT91_TC_SR		0x20		/* Status Register */

#define		AT91_TC_COVFS		(1 <<  0)	/* Counter Overflow Status */

#define		AT91_TC_LOVRS		(1 <<  1)	/* Load Overrun Status */

#define		AT91_TC_CPAS		(1 <<  2)	/* RA Compare Status */

#define		AT91_TC_CPBS		(1 <<  3)	/* RB Compare Status */

#define		AT91_TC_CPCS		(1 <<  4)	/* RC Compare Status */

#define		AT91_TC_LDRAS		(1 <<  5)	/* RA Loading Status */

#define		AT91_TC_LDRBS		(1 <<  6)	/* RB Loading Status */

#define		AT91_TC_ETRGS		(1 <<  7)	/* External Trigger Status */

#define		AT91_TC_CLKSTA		(1 << 16)	/* Clock Enabling Status */

#define		AT91_TC_MTIOA		(1 << 17)	/* TIOA Mirror */

#define		AT91_TC_MTIOB		(1 << 18)	/* TIOB Mirror */



#define AT91_TC_IER		0x24		/* Interrupt Enable Register */

#define AT91_TC_IDR		0x28		/* Interrupt Disable Register */

#define AT91_TC_IMR		0x2c		/* Interrupt Mask Register */



#endif

arch/arm/mach-at91/at91rm9200_time.c

+0 −23
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ static struct clock_event_device clkevt = { 
void __iomem *at91_st_base;

EXPORT_SYMBOL_GPL(at91_st_base);



#ifdef CONFIG_OF

static struct of_device_id at91rm9200_st_timer_ids[] = {

	{ .compatible = "atmel,at91rm9200-st" },

	{ /* sentinel */ }
@@ -219,28 +218,6 @@ node_err: 
err:

	return -EINVAL;

}

#else

static int __init of_at91rm9200_st_init(void)

{

	return -EINVAL;

}

#endif



void __init at91rm9200_ioremap_st(u32 addr)

{

#ifdef CONFIG_OF

	struct device_node *np;



	np = of_find_matching_node(NULL, at91rm9200_st_timer_ids);

	if (np) {

		of_node_put(np);

		return;

	}

#endif

	at91_st_base = ioremap(addr, 256);

	if (!at91_st_base)

		panic("Impossible to ioremap ST\n");

}



/*

 * ST (system timer) module supports both clockevents and clocksource.

arch/arm/mach-at91/board-dt-rm9200.c

+0 −2
Original line number Diff line number Diff line
@@ -26,9 +26,7 @@ 


static void __init at91rm9200_dt_timer_init(void)

{

#if defined(CONFIG_COMMON_CLK)

	of_clk_init(NULL);

#endif

	at91rm9200_timer_init();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE