Commit 81bc3009 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

arm-soc fixes for 3.3-rc:

AT91 needed reset fixes which resulted in some minor code refactoring,
it also adds a feature-removal for one of their platforms for 3.4.
The USB patches have been acked by Greg K-H.

i.MX and ux500 both have some minor fixes, nothing controversial.

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  arch/arm/mach-imx/mach-mx53_ard.c: add missing iounmap
  ARM: imx: iomux-v1.h: Fix build error due to __init annotation
  ARM: at91: Fix at91sam9g45 and at91cap9 reset
  ARM: at91: make rstc soc independent
  ARM: at91: introduce AT91_SAM9_ALT_RESET to select the at91sam9 alternative reset
  ARM: at91: merge at91cap9_ddrsdr.h in at91sam9_ddrsdr.h
  ARM: at91: fix cap9 ddrsdr register
  ARM/USB: at91/ohci-at91: rename vbus_pin_inverted to vbus_pin_active_low
  USB: at91: fix clk_get error handling
  ARM: at91: removal of CAP9 SoC family
  ARM: at91: fix at91rm9200 soc subtype handling
  mach-ux500: no MMC_CAP_SD_HIGHSPEED on Snowball
  mach-ux500: enable ARM errata 764369
  mach-ux500: do not override outer.inv_all
  mach-ux500: musb: now musb is always in OTG mode
  ARM: imx6: add missing twd_clk for imx6q clock
parents acb42a3b 5e963864

Documentation/feature-removal-schedule.txt

+14 −0
Original line number Diff line number Diff line
@@ -510,3 +510,17 @@ Why: The pci_scan_bus_parented() interface creates a new root bus. The 
	convert to using pci_scan_root_bus() so they can supply a list of

	bus resources when the bus is created.

Who:	Bjorn Helgaas <bhelgaas@google.com>



----------------------------



What:	The CAP9 SoC family will be removed

When:	3.4

Files:	arch/arm/mach-at91/at91cap9.c

	arch/arm/mach-at91/at91cap9_devices.c

	arch/arm/mach-at91/include/mach/at91cap9.h

	arch/arm/mach-at91/include/mach/at91cap9_matrix.h

	arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h

	arch/arm/mach-at91/board-cap9adk.c

Why:	The code is not actively maintained and platforms are now hard to find.

Who:	Nicolas Ferre <nicolas.ferre@atmel.com>

	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

arch/arm/mach-at91/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ config HAVE_AT91_USART4 
config HAVE_AT91_USART5

	bool



config AT91_SAM9_ALT_RESET

	bool



config AT91_SAM9G45_RESET

	bool



menu "Atmel AT91 System-on-Chip"



choice
@@ -39,6 +45,7 @@ config ARCH_AT91SAM9260 
	select HAVE_AT91_USART4

	select HAVE_AT91_USART5

	select HAVE_NET_MACB

	select AT91_SAM9_ALT_RESET



config ARCH_AT91SAM9261

	bool "AT91SAM9261"
@@ -46,6 +53,7 @@ config ARCH_AT91SAM9261 
	select GENERIC_CLOCKEVENTS

	select HAVE_FB_ATMEL

	select HAVE_AT91_DBGU0

	select AT91_SAM9_ALT_RESET



config ARCH_AT91SAM9G10

	bool "AT91SAM9G10"
@@ -53,6 +61,7 @@ config ARCH_AT91SAM9G10 
	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_DBGU0

	select HAVE_FB_ATMEL

	select AT91_SAM9_ALT_RESET



config ARCH_AT91SAM9263

	bool "AT91SAM9263"
@@ -61,6 +70,7 @@ config ARCH_AT91SAM9263 
	select HAVE_FB_ATMEL

	select HAVE_NET_MACB

	select HAVE_AT91_DBGU1

	select AT91_SAM9_ALT_RESET



config ARCH_AT91SAM9RL

	bool "AT91SAM9RL"
@@ -69,6 +79,7 @@ config ARCH_AT91SAM9RL 
	select HAVE_AT91_USART3

	select HAVE_FB_ATMEL

	select HAVE_AT91_DBGU0

	select AT91_SAM9_ALT_RESET



config ARCH_AT91SAM9G20

	bool "AT91SAM9G20"
@@ -79,6 +90,7 @@ config ARCH_AT91SAM9G20 
	select HAVE_AT91_USART4

	select HAVE_AT91_USART5

	select HAVE_NET_MACB

	select AT91_SAM9_ALT_RESET



config ARCH_AT91SAM9G45

	bool "AT91SAM9G45"
@@ -88,6 +100,7 @@ config ARCH_AT91SAM9G45 
	select HAVE_FB_ATMEL

	select HAVE_NET_MACB

	select HAVE_AT91_DBGU1

	select AT91_SAM9G45_RESET



config ARCH_AT91CAP9

	bool "AT91CAP9"
@@ -96,6 +109,7 @@ config ARCH_AT91CAP9 
	select HAVE_FB_ATMEL

	select HAVE_NET_MACB

	select HAVE_AT91_DBGU1

	select AT91_SAM9G45_RESET



config ARCH_AT91X40

	bool "AT91x40"

arch/arm/mach-at91/Makefile

+8 −6
Original line number Diff line number Diff line
@@ -8,15 +8,17 @@ obj-n := 
obj-		:=



obj-$(CONFIG_AT91_PMC_UNIT)	+= clock.o

obj-$(CONFIG_AT91_SAM9_ALT_RESET) += at91sam9_alt_reset.o

obj-$(CONFIG_AT91_SAM9G45_RESET) += at91sam9g45_reset.o



# CPU-specific support

obj-$(CONFIG_ARCH_AT91RM9200)	+= at91rm9200.o at91rm9200_time.o at91rm9200_devices.o

obj-$(CONFIG_ARCH_AT91SAM9260)	+= at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o at91sam9_alt_reset.o

obj-$(CONFIG_ARCH_AT91SAM9261)	+= at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o at91sam9_alt_reset.o

obj-$(CONFIG_ARCH_AT91SAM9G10)	+= at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o at91sam9_alt_reset.o

obj-$(CONFIG_ARCH_AT91SAM9263)	+= at91sam9263.o at91sam926x_time.o at91sam9263_devices.o sam9_smc.o at91sam9_alt_reset.o

obj-$(CONFIG_ARCH_AT91SAM9RL)	+= at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o sam9_smc.o at91sam9_alt_reset.o

obj-$(CONFIG_ARCH_AT91SAM9G20)	+= at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o at91sam9_alt_reset.o

obj-$(CONFIG_ARCH_AT91SAM9260)	+= at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o

obj-$(CONFIG_ARCH_AT91SAM9261)	+= at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o

obj-$(CONFIG_ARCH_AT91SAM9G10)	+= at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o

obj-$(CONFIG_ARCH_AT91SAM9263)	+= at91sam9263.o at91sam926x_time.o at91sam9263_devices.o sam9_smc.o

obj-$(CONFIG_ARCH_AT91SAM9RL)	+= at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o sam9_smc.o

obj-$(CONFIG_ARCH_AT91SAM9G20)	+= at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o

obj-$(CONFIG_ARCH_AT91SAM9G45)	+= at91sam9g45.o at91sam926x_time.o at91sam9g45_devices.o sam9_smc.o

obj-$(CONFIG_ARCH_AT91CAP9)	+= at91cap9.o at91sam926x_time.o at91cap9_devices.o sam9_smc.o

obj-$(CONFIG_ARCH_AT91X40)	+= at91x40.o at91x40_time.o

arch/arm/mach-at91/at91cap9.c

+2 −7
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <mach/cpu.h>

#include <mach/at91cap9.h>

#include <mach/at91_pmc.h>

#include <mach/at91_rstc.h>



#include "soc.h"

#include "generic.h"
@@ -314,11 +313,6 @@ static struct at91_gpio_bank at91cap9_gpio[] __initdata = { 
	}

};



static void at91cap9_restart(char mode, const char *cmd)

{

	at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);

}



/* --------------------------------------------------------------------

 *  AT91CAP9 processor initialization

 * -------------------------------------------------------------------- */
@@ -331,13 +325,14 @@ static void __init at91cap9_map_io(void) 
static void __init at91cap9_ioremap_registers(void)

{

	at91_ioremap_shdwc(AT91CAP9_BASE_SHDWC);

	at91_ioremap_rstc(AT91CAP9_BASE_RSTC);

	at91sam926x_ioremap_pit(AT91CAP9_BASE_PIT);

	at91sam9_ioremap_smc(0, AT91CAP9_BASE_SMC);

}



static void __init at91cap9_initialize(void)

{

	arm_pm_restart = at91cap9_restart;

	arm_pm_restart = at91sam9g45_restart;

	at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1);



	/* Register GPIO subsystem */

arch/arm/mach-at91/at91sam9260.c

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ static void __init at91sam9260_map_io(void) 
static void __init at91sam9260_ioremap_registers(void)

{

	at91_ioremap_shdwc(AT91SAM9260_BASE_SHDWC);

	at91_ioremap_rstc(AT91SAM9260_BASE_RSTC);

	at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT);

	at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE