From: Linus Torvalds Date: Sun, 6 Nov 2011 01:18:05 +0000 (-0700) Subject: Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc X-Git-Tag: v3.2-rc1~40 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7abec10c623d9e0416dab6919a0ea22e6283516b;p=~emulex%2Finfiniband.git Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc * 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc: (79 commits) ARM: SAMSUNG: Move fimc plat. device from board files to plat-samsung ARM: SAMSUNG: Cleanup resources by using macro ARM: SAMSUNG: Cleanup plat-samsung/devs.c and devs.h ARM: S5P: To merge devs.c files to one devs.c ARM: S3C64XX: To merge devs.c files to one devs.c ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c ARM: S5P64X0: Add Power Management support ARM: S5P: Make the sleep code common for S5P series SoCs ARM: S5P: Make the common S5P PM code conditionally compile ARM: SAMSUNG: Move S5P header files to plat-samsung ARM: SAMSUNG: Move S3C24XX header files to plat-samsung ARM: SAMSUNG: Moving each SoC support header files ARM: SAMSUNG: Consolidate plat/pll.h ARM: SAMSUNG: Consolidate plat/pwm-clock.h ARM: SAMSUNG: Cleanup mach/clkdev.h ARM: SAMSUNG: remove sdhci default configuration setup platform helper ARM: EXYNOS4: Add FIMC device on SMDKV310 board ARM: EXYNOS4: Add header file protection macros ARM: EXYNOS4: Add usb ehci device to the SMDKV310 ARM: S3C2443: Add hsspi-clock from pclk and rename S3C2443 hsspi sclk ... Fix up conflicts in - arch/arm/mach-exynos4/{Kconfig,clock.c} ARM_CPU_SUSPEND, various random device tables (gah!) - drivers/gpio/Makefile sa1100 gpio added, samsung gpio drivers merged --- 7abec10c623d9e0416dab6919a0ea22e6283516b diff --cc arch/arm/Kconfig index fe6b0526b3a,70b3943a575..e17fe2503bb --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -776,10 -744,8 +776,7 @@@ config ARCH_S3C64X select ARCH_REQUIRE_GPIOLIB select SAMSUNG_CLKSRC select SAMSUNG_IRQ_VIC_TIMER - select SAMSUNG_IRQ_UART select S3C_GPIO_TRACK - select S3C_GPIO_PULL_UPDOWN - select S3C_GPIO_CFG_S3C24XX - select S3C_GPIO_CFG_S3C64XX select S3C_DEV_NAND select USB_ARCH_HAS_OHCI select SAMSUNG_GPIOLIB_4BIT diff --cc arch/arm/mach-exynos4/Kconfig index 44013e0672f,dd660eb2020..59299ea5b2f --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig @@@ -12,12 -12,15 +12,17 @@@ if ARCH_EXYNOS config CPU_EXYNOS4210 bool select SAMSUNG_DMADEV + select ARM_CPU_SUSPEND if PM + select S5P_PM if PM + select S5P_SLEEP if PM help Enable EXYNOS4210 CPU support config SOC_EXYNOS4212 bool ++ select ARM_CPU_SUSPEND if PM + select S5P_PM if PM + select S5P_SLEEP if PM help Enable EXYNOS4212 SoC support diff --cc arch/arm/mach-exynos4/clock.c index a52024e309b,db616916d7a..2894f0adef5 --- a/arch/arm/mach-exynos4/clock.c +++ b/arch/arm/mach-exynos4/clock.c @@@ -507,9 -522,44 +522,39 @@@ static struct clk init_clocks_off[] = .parent = &clk_aclk_133.clk, .enable = exynos4_clk_ip_fsys_ctrl, .ctrlbit = (1 << 9), + }, { + .name = "dac", + .devname = "s5p-sdo", + .enable = exynos4_clk_ip_tv_ctrl, + .ctrlbit = (1 << 2), + }, { + .name = "mixer", + .devname = "s5p-mixer", + .enable = exynos4_clk_ip_tv_ctrl, + .ctrlbit = (1 << 1), + }, { + .name = "vp", + .devname = "s5p-mixer", + .enable = exynos4_clk_ip_tv_ctrl, + .ctrlbit = (1 << 0), + }, { + .name = "hdmi", + .devname = "exynos4-hdmi", + .enable = exynos4_clk_ip_tv_ctrl, + .ctrlbit = (1 << 3), + }, { + .name = "hdmiphy", + .devname = "exynos4-hdmi", + .enable = exynos4_clk_hdmiphy_ctrl, + .ctrlbit = (1 << 0), + }, { + .name = "dacphy", + .devname = "s5p-sdo", + .enable = exynos4_clk_dac_ctrl, + .ctrlbit = (1 << 0), - }, { - .name = "sata", - .parent = &clk_aclk_133.clk, - .enable = exynos4_clk_ip_fsys_ctrl, - .ctrlbit = (1 << 10), }, { .name = "dma", - .devname = "s3c-pl330.0", + .devname = "dma-pl330.0", .enable = exynos4_clk_ip_fsys_ctrl, .ctrlbit = (1 << 0), }, { diff --cc arch/arm/plat-samsung/include/plat/irqs.h index 00000000000,94ecf8c5c85..08d1a7ef97b mode 000000,100644..100644 --- a/arch/arm/plat-samsung/include/plat/irqs.h +++ b/arch/arm/plat-samsung/include/plat/irqs.h @@@ -1,0 -1,115 +1,80 @@@ + /* linux/arch/arm/plat-samsung/include/plat/irqs.h + * + * Copyright (c) 2009 Samsung Electronics Co., Ltd. + * http://www.samsung.com/ + * + * S5P Common IRQ support + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + + #ifndef __PLAT_SAMSUNG_IRQS_H + #define __PLAT_SAMSUNG_IRQS_H __FILE__ + + /* we keep the first set of CPU IRQs out of the range of + * the ISA space, so that the PC104 has them to itself + * and we don't end up having to do horrible things to the + * standard ISA drivers.... + * + * note, since we're using the VICs, our start must be a + * mulitple of 32 to allow the common code to work + */ + + #define S5P_IRQ_OFFSET (32) + + #define S5P_IRQ(x) ((x) + S5P_IRQ_OFFSET) + + #define S5P_VIC0_BASE S5P_IRQ(0) + #define S5P_VIC1_BASE S5P_IRQ(32) + #define S5P_VIC2_BASE S5P_IRQ(64) + #define S5P_VIC3_BASE S5P_IRQ(96) + + #define VIC_BASE(x) (S5P_VIC0_BASE + ((x)*32)) + + #define IRQ_VIC0_BASE S5P_VIC0_BASE + #define IRQ_VIC1_BASE S5P_VIC1_BASE + #define IRQ_VIC2_BASE S5P_VIC2_BASE + -/* UART interrupts, each UART has 4 intterupts per channel so - * use the space between the ISA and S3C main interrupts. Note, these - * are not in the same order as the S3C24XX series! */ - -#define IRQ_S5P_UART_BASE0 (16) -#define IRQ_S5P_UART_BASE1 (20) -#define IRQ_S5P_UART_BASE2 (24) -#define IRQ_S5P_UART_BASE3 (28) - -#define UART_IRQ_RXD (0) -#define UART_IRQ_ERR (1) -#define UART_IRQ_TXD (2) - -#define IRQ_S5P_UART_RX0 (IRQ_S5P_UART_BASE0 + UART_IRQ_RXD) -#define IRQ_S5P_UART_TX0 (IRQ_S5P_UART_BASE0 + UART_IRQ_TXD) -#define IRQ_S5P_UART_ERR0 (IRQ_S5P_UART_BASE0 + UART_IRQ_ERR) - -#define IRQ_S5P_UART_RX1 (IRQ_S5P_UART_BASE1 + UART_IRQ_RXD) -#define IRQ_S5P_UART_TX1 (IRQ_S5P_UART_BASE1 + UART_IRQ_TXD) -#define IRQ_S5P_UART_ERR1 (IRQ_S5P_UART_BASE1 + UART_IRQ_ERR) - -#define IRQ_S5P_UART_RX2 (IRQ_S5P_UART_BASE2 + UART_IRQ_RXD) -#define IRQ_S5P_UART_TX2 (IRQ_S5P_UART_BASE2 + UART_IRQ_TXD) -#define IRQ_S5P_UART_ERR2 (IRQ_S5P_UART_BASE2 + UART_IRQ_ERR) - -#define IRQ_S5P_UART_RX3 (IRQ_S5P_UART_BASE3 + UART_IRQ_RXD) -#define IRQ_S5P_UART_TX3 (IRQ_S5P_UART_BASE3 + UART_IRQ_TXD) -#define IRQ_S5P_UART_ERR3 (IRQ_S5P_UART_BASE3 + UART_IRQ_ERR) - -/* S3C compatibilty defines */ -#define IRQ_S3CUART_RX0 IRQ_S5P_UART_RX0 -#define IRQ_S3CUART_RX1 IRQ_S5P_UART_RX1 -#define IRQ_S3CUART_RX2 IRQ_S5P_UART_RX2 -#define IRQ_S3CUART_RX3 IRQ_S5P_UART_RX3 - + /* VIC based IRQs */ + + #define S5P_IRQ_VIC0(x) (S5P_VIC0_BASE + (x)) + #define S5P_IRQ_VIC1(x) (S5P_VIC1_BASE + (x)) + #define S5P_IRQ_VIC2(x) (S5P_VIC2_BASE + (x)) + #define S5P_IRQ_VIC3(x) (S5P_VIC3_BASE + (x)) + + #define S5P_TIMER_IRQ(x) (11 + (x)) + + #define IRQ_TIMER0 S5P_TIMER_IRQ(0) + #define IRQ_TIMER1 S5P_TIMER_IRQ(1) + #define IRQ_TIMER2 S5P_TIMER_IRQ(2) + #define IRQ_TIMER3 S5P_TIMER_IRQ(3) + #define IRQ_TIMER4 S5P_TIMER_IRQ(4) + + #define IRQ_EINT(x) ((x) < 16 ? ((x) + S5P_EINT_BASE1) \ + : ((x) - 16 + S5P_EINT_BASE2)) + + #define EINT_OFFSET(irq) ((irq) < S5P_EINT_BASE2 ? \ + ((irq) - S5P_EINT_BASE1) : \ + ((irq) + 16 - S5P_EINT_BASE2)) + + #define IRQ_EINT_BIT(x) EINT_OFFSET(x) + + /* Typically only a few gpio chips require gpio interrupt support. + To avoid memory waste irq descriptors are allocated only for + S5P_GPIOINT_GROUP_COUNT chips, each with total number of + S5P_GPIOINT_GROUP_SIZE pins/irqs. Each GPIOINT group can be assiged + to any gpio chip with the s5p_register_gpio_interrupt() function */ + #define S5P_GPIOINT_GROUP_COUNT 4 + #define S5P_GPIOINT_GROUP_SIZE 8 + #define S5P_GPIOINT_COUNT (S5P_GPIOINT_GROUP_COUNT * S5P_GPIOINT_GROUP_SIZE) + + /* IRQ types common for all s5p platforms */ + #define S5P_IRQ_TYPE_LEVEL_LOW (0x00) + #define S5P_IRQ_TYPE_LEVEL_HIGH (0x01) + #define S5P_IRQ_TYPE_EDGE_FALLING (0x02) + #define S5P_IRQ_TYPE_EDGE_RISING (0x03) + #define S5P_IRQ_TYPE_EDGE_BOTH (0x04) + + #endif /* __PLAT_SAMSUNG_IRQS_H */ diff --cc drivers/gpio/Makefile index 19c5d27b6d2,62db458c850..4a9ad2f99ad --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@@ -14,14 -14,10 +14,13 @@@ obj-$(CONFIG_GPIO_ADP5588) += gpio-adp5 obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o obj-$(CONFIG_GPIO_CS5535) += gpio-cs5535.o obj-$(CONFIG_GPIO_DA9052) += gpio-da9052.o +obj-$(CONFIG_ARCH_DAVINCI) += gpio-davinci.o obj-$(CONFIG_GPIO_EP93XX) += gpio-ep93xx.o - obj-$(CONFIG_GPIO_EXYNOS4) += gpio-exynos4.o obj-$(CONFIG_GPIO_IT8761E) += gpio-it8761e.o obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o +obj-$(CONFIG_MACH_KS8695) += gpio-ks8695.o obj-$(CONFIG_GPIO_LANGWELL) += gpio-langwell.o +obj-$(CONFIG_ARCH_LPC32XX) += gpio-lpc32xx.o obj-$(CONFIG_GPIO_MAX730X) += gpio-max730x.o obj-$(CONFIG_GPIO_MAX7300) += gpio-max7300.o obj-$(CONFIG_GPIO_MAX7301) += gpio-max7301.o @@@ -40,13 -36,8 +39,10 @@@ obj-$(CONFIG_GPIO_PCA953X) += gpio-pca9 obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf857x.o obj-$(CONFIG_GPIO_PCH) += gpio-pch.o obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o +obj-$(CONFIG_PLAT_PXA) += gpio-pxa.o obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o - - obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o - obj-$(CONFIG_GPIO_S5PC100) += gpio-s5pc100.o - obj-$(CONFIG_GPIO_S5PV210) += gpio-s5pv210.o + obj-$(CONFIG_PLAT_SAMSUNG) += gpio-samsung.o +obj-$(CONFIG_ARCH_SA1100) += gpio-sa1100.o obj-$(CONFIG_GPIO_SCH) += gpio-sch.o obj-$(CONFIG_GPIO_STMPE) += gpio-stmpe.o obj-$(CONFIG_GPIO_SX150X) += gpio-sx150x.o