mirror of
https://github.com/torvalds/linux.git
synced 2024-11-01 09:41:44 +00:00
ee1a8d402e
These changes from 30 individual branches for the most part update device tree files, but there are also a few source code changes that have crept in this time, usually in order to atomically move over a driver from using hardcoded data to DT probing. A number of platforms change their DT files to use the C preprocessor, which is causing a bit of churn, but that is hopefully only this once. There are a few conflicts with the other branches unfortunately: * in exynos5440.dtsi and kirkwood-6281.dtsi, device nodes are added from multiple branches. Need to be careful to have the right set of closing braces as git gets this one wrong. * In kirkwood.dtsi, one 'ranges' line got split into two lines, while another line got added. Order of the lines does not matter. * in sama5d3.dtsi, some cleanup was merged the wrong way, causing a bogus conflict. We want the 'dmas' and 'dma-names' properties to get added here. * Two lines got removed independently in arch/arm/mach-mxs/mach-mxs.c * Contents get added independently in arch/arm/mach-omap2/cclock33xx_data.c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUdLnpGCrR//JCVInAQI50RAAsXbH1SGvjKJemXhRkFloPDYpCbgdDUFr ChUbjNV1xsY/jaNCfMa5/Qo7lgz/Ot7BpJef9fZn7ret+dc7nchqe/4iIkAokAUh E4ao9D1dP5aAA0ihdbSQHCZtR/0SUR81h6BoOVuo/1mvEiBaFbWAeYe8/6LJd9II OU1w9bDmjfZWYFUXs+j2VF76ueZQ+kz69XDKZUGtkqN76m1AL8lGDurj5jxvyllF VJns8d9q2nr2q9PferfajK6rkOIPaTpwKblxZHUgobCyOitZaiZM0NgF733TsNM6 HXmhDhkcn7T81+SiHVfigJ/nxo9UgU4zNJCODF3WZIwGIj3FbxvCOpdCYi2NhCO8 oLcgDk57tpoKpB3gvAmYVQHP9FIepFa/WAWyPIADA7PkpYrwgc4v+cLEHXpd8SRv viLLIa5QuNdMeaK+Md9OKmKZFd7uFD9jiMtmdm6IpEVDDjMgoteb2XSoEtNebmtY MfbW4okn118a2dFKKaPTKcXVW/a5FRp2JGfB0A58RQHaJWj3JsY1bFn/xWPEpTOA IWB/HHMln0LYTL2AXN9HcaL1jnGI1Wq5eWBurX+cXQ/ij1A6jfoRKYglx7AQqOHj iWcGYtKLLJCgiWFnLSwcljZhfoYr0/z7rhns6yo7/vhN0riy+M84OgN4HbAmUzc1 Bgy9PnJTNo8= =8PtJ -----END PGP SIGNATURE----- Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC device tree changes from Arnd Bergmann: "These changes from 30 individual branches for the most part update device tree files, but there are also a few source code changes that have crept in this time, usually in order to atomically move over a driver from using hardcoded data to DT probing. A number of platforms change their DT files to use the C preprocessor, which is causing a bit of churn, but that is hopefully only this once" * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (372 commits) ARM: at91: dt: rm9200ek: add spi support ARM: at91: dt: rm9200: add spi support ARM: at91/DT: at91sam9n12: add SPI DMA client infos ARM: at91/DT: sama5d3: add SPI DMA client infos ARM: at91/DT: fix SPI compatibility string ARM: Kirkwood: Fix the internal register ranges translation ARM: dts: bcm281xx: change comment to C89 style ARM: mmc: bcm281xx SDHCI driver (dt mods) ARM: nomadik: add the new clocks to the device tree clk: nomadik: implement the Nomadik clocks properly ARM: dts: omap5-uevm: Provide USB Host PHY clock frequency ARM: dts: omap4-panda: Fix DVI EDID reads ARM: dts: omap4-panda: Add USB Host support arm: mvebu: enable mini-PCIe connectors on Armada 370 RD ARM: shmobile: irqpin: add a DT property to enable masking on parent ARM: dts: AM43x EPOS EVM support ARM: dts: OMAP5: Add bandgap DT entry ARM: dts: AM33XX: Add pinmux configuration for CPSW to am335x EVM ARM: dts: AM33XX: Add pinmux configuration for CPSW to EVMsk ARM: dts: AM33XX: Add pinmux configuration for CPSW to beaglebone ...
267 lines
8.1 KiB
C
267 lines
8.1 KiB
C
/*
|
|
* Copyright STMicroelectronics, 2007.
|
|
*
|
|
* 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.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/init.h>
|
|
#include <linux/device.h>
|
|
#include <linux/amba/bus.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/io.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/platform_data/clk-nomadik.h>
|
|
#include <linux/clocksource.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/of_gpio.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/mtd/fsmc.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/amba/mmci.h>
|
|
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/time.h>
|
|
#include <asm/mach-types.h>
|
|
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/hardware/cache-l2x0.h>
|
|
|
|
/*
|
|
* These are the only hard-coded address offsets we still have to use.
|
|
*/
|
|
#define NOMADIK_FSMC_BASE 0x10100000 /* FSMC registers */
|
|
#define NOMADIK_SDRAMC_BASE 0x10110000 /* SDRAM Controller */
|
|
#define NOMADIK_CLCDC_BASE 0x10120000 /* CLCD Controller */
|
|
#define NOMADIK_MDIF_BASE 0x10120000 /* MDIF */
|
|
#define NOMADIK_DMA0_BASE 0x10130000 /* DMA0 Controller */
|
|
#define NOMADIK_IC_BASE 0x10140000 /* Vectored Irq Controller */
|
|
#define NOMADIK_DMA1_BASE 0x10150000 /* DMA1 Controller */
|
|
#define NOMADIK_USB_BASE 0x10170000 /* USB-OTG conf reg base */
|
|
#define NOMADIK_CRYP_BASE 0x10180000 /* Crypto processor */
|
|
#define NOMADIK_SHA1_BASE 0x10190000 /* SHA-1 Processor */
|
|
#define NOMADIK_XTI_BASE 0x101A0000 /* XTI */
|
|
#define NOMADIK_RNG_BASE 0x101B0000 /* Random number generator */
|
|
#define NOMADIK_SRC_BASE 0x101E0000 /* SRC base */
|
|
#define NOMADIK_WDOG_BASE 0x101E1000 /* Watchdog */
|
|
#define NOMADIK_MTU0_BASE 0x101E2000 /* Multiple Timer 0 */
|
|
#define NOMADIK_MTU1_BASE 0x101E3000 /* Multiple Timer 1 */
|
|
#define NOMADIK_GPIO0_BASE 0x101E4000 /* GPIO0 */
|
|
#define NOMADIK_GPIO1_BASE 0x101E5000 /* GPIO1 */
|
|
#define NOMADIK_GPIO2_BASE 0x101E6000 /* GPIO2 */
|
|
#define NOMADIK_GPIO3_BASE 0x101E7000 /* GPIO3 */
|
|
#define NOMADIK_RTC_BASE 0x101E8000 /* Real Time Clock base */
|
|
#define NOMADIK_PMU_BASE 0x101E9000 /* Power Management Unit */
|
|
#define NOMADIK_OWM_BASE 0x101EA000 /* One wire master */
|
|
#define NOMADIK_SCR_BASE 0x101EF000 /* Secure Control registers */
|
|
#define NOMADIK_MSP2_BASE 0x101F0000 /* MSP 2 interface */
|
|
#define NOMADIK_MSP1_BASE 0x101F1000 /* MSP 1 interface */
|
|
#define NOMADIK_UART2_BASE 0x101F2000 /* UART 2 interface */
|
|
#define NOMADIK_SSIRx_BASE 0x101F3000 /* SSI 8-ch rx interface */
|
|
#define NOMADIK_SSITx_BASE 0x101F4000 /* SSI 8-ch tx interface */
|
|
#define NOMADIK_MSHC_BASE 0x101F5000 /* Memory Stick(Pro) Host */
|
|
#define NOMADIK_SDI_BASE 0x101F6000 /* SD-card/MM-Card */
|
|
#define NOMADIK_I2C1_BASE 0x101F7000 /* I2C1 interface */
|
|
#define NOMADIK_I2C0_BASE 0x101F8000 /* I2C0 interface */
|
|
#define NOMADIK_MSP0_BASE 0x101F9000 /* MSP 0 interface */
|
|
#define NOMADIK_FIRDA_BASE 0x101FA000 /* FIrDA interface */
|
|
#define NOMADIK_UART1_BASE 0x101FB000 /* UART 1 interface */
|
|
#define NOMADIK_SSP_BASE 0x101FC000 /* SSP interface */
|
|
#define NOMADIK_UART0_BASE 0x101FD000 /* UART 0 interface */
|
|
#define NOMADIK_SGA_BASE 0x101FE000 /* SGA interface */
|
|
#define NOMADIK_L2CC_BASE 0x10210000 /* L2 Cache controller */
|
|
#define NOMADIK_UART1_VBASE 0xF01FB000
|
|
|
|
/* This is needed for LL-debug/earlyprintk/debug-macro.S */
|
|
static struct map_desc cpu8815_io_desc[] __initdata = {
|
|
{
|
|
.virtual = NOMADIK_UART1_VBASE,
|
|
.pfn = __phys_to_pfn(NOMADIK_UART1_BASE),
|
|
.length = SZ_4K,
|
|
.type = MT_DEVICE,
|
|
},
|
|
};
|
|
|
|
static void __init cpu8815_map_io(void)
|
|
{
|
|
iotable_init(cpu8815_io_desc, ARRAY_SIZE(cpu8815_io_desc));
|
|
}
|
|
|
|
static void cpu8815_restart(char mode, const char *cmd)
|
|
{
|
|
void __iomem *srcbase = ioremap(NOMADIK_SRC_BASE, SZ_4K);
|
|
|
|
/* FIXME: use egpio when implemented */
|
|
|
|
/* Write anything to Reset status register */
|
|
writel(1, srcbase + 0x18);
|
|
}
|
|
|
|
/* Initial value for SRC control register: all timers use MXTAL/8 source */
|
|
#define SRC_CR_INIT_MASK 0x00007fff
|
|
#define SRC_CR_INIT_VAL 0x2aaa8000
|
|
|
|
static void __init cpu8815_timer_init_of(void)
|
|
{
|
|
struct device_node *mtu;
|
|
void __iomem *base;
|
|
int irq;
|
|
u32 src_cr;
|
|
|
|
/* We need this to be up now */
|
|
nomadik_clk_init();
|
|
|
|
mtu = of_find_node_by_path("/mtu@101e2000");
|
|
if (!mtu)
|
|
return;
|
|
base = of_iomap(mtu, 0);
|
|
if (WARN_ON(!base))
|
|
return;
|
|
irq = irq_of_parse_and_map(mtu, 0);
|
|
|
|
pr_info("Remapped MTU @ %p, irq: %d\n", base, irq);
|
|
|
|
/* Configure timer sources in "system reset controller" ctrl reg */
|
|
src_cr = readl(base);
|
|
src_cr &= SRC_CR_INIT_MASK;
|
|
src_cr |= SRC_CR_INIT_VAL;
|
|
writel(src_cr, base);
|
|
|
|
clocksource_of_init();
|
|
}
|
|
|
|
static struct fsmc_nand_timings cpu8815_nand_timings = {
|
|
.thiz = 0,
|
|
.thold = 0x10,
|
|
.twait = 0x0A,
|
|
.tset = 0,
|
|
};
|
|
|
|
static struct fsmc_nand_platform_data cpu8815_nand_data = {
|
|
.nand_timings = &cpu8815_nand_timings,
|
|
};
|
|
|
|
/*
|
|
* The SMSC911x IRQ is connected to a GPIO pin, but the driver expects
|
|
* to simply request an IRQ passed as a resource. So the GPIO pin needs
|
|
* to be requested by this hog and set as input.
|
|
*/
|
|
static int __init cpu8815_eth_init(void)
|
|
{
|
|
struct device_node *eth;
|
|
int gpio, irq, err;
|
|
|
|
eth = of_find_node_by_path("/usb-s8815/ethernet-gpio");
|
|
if (!eth) {
|
|
pr_info("could not find any ethernet GPIO\n");
|
|
return 0;
|
|
}
|
|
gpio = of_get_gpio(eth, 0);
|
|
err = gpio_request(gpio, "eth_irq");
|
|
if (err) {
|
|
pr_info("failed to request ethernet GPIO\n");
|
|
return -ENODEV;
|
|
}
|
|
err = gpio_direction_input(gpio);
|
|
if (err) {
|
|
pr_info("failed to set ethernet GPIO as input\n");
|
|
return -ENODEV;
|
|
}
|
|
irq = gpio_to_irq(gpio);
|
|
pr_info("enabled USB-S8815 ethernet GPIO %d, IRQ %d\n", gpio, irq);
|
|
return 0;
|
|
}
|
|
device_initcall(cpu8815_eth_init);
|
|
|
|
/*
|
|
* TODO:
|
|
* cannot be set from device tree, convert to a proper DT
|
|
* binding.
|
|
*/
|
|
static struct mmci_platform_data mmcsd_plat_data = {
|
|
.ocr_mask = MMC_VDD_29_30,
|
|
};
|
|
|
|
/*
|
|
* This GPIO pin turns on a line that is used to detect card insertion
|
|
* on this board.
|
|
*/
|
|
static int __init cpu8815_mmcsd_init(void)
|
|
{
|
|
struct device_node *cdbias;
|
|
int gpio, err;
|
|
|
|
cdbias = of_find_node_by_path("/usb-s8815/mmcsd-gpio");
|
|
if (!cdbias) {
|
|
pr_info("could not find MMC/SD card detect bias node\n");
|
|
return 0;
|
|
}
|
|
gpio = of_get_gpio(cdbias, 0);
|
|
if (gpio < 0) {
|
|
pr_info("could not obtain MMC/SD card detect bias GPIO\n");
|
|
return 0;
|
|
}
|
|
err = gpio_request(gpio, "card detect bias");
|
|
if (err) {
|
|
pr_info("failed to request card detect bias GPIO %d\n", gpio);
|
|
return -ENODEV;
|
|
}
|
|
err = gpio_direction_output(gpio, 0);
|
|
if (err){
|
|
pr_info("failed to set GPIO %d as output, low\n", gpio);
|
|
return err;
|
|
}
|
|
pr_info("enabled USB-S8815 CD bias GPIO %d, low\n", gpio);
|
|
return 0;
|
|
}
|
|
device_initcall(cpu8815_mmcsd_init);
|
|
|
|
|
|
/* These are mostly to get the right device names for the clock lookups */
|
|
static struct of_dev_auxdata cpu8815_auxdata_lookup[] __initdata = {
|
|
OF_DEV_AUXDATA("stericsson,fsmc-nand", NOMADIK_FSMC_BASE,
|
|
NULL, &cpu8815_nand_data),
|
|
OF_DEV_AUXDATA("arm,primecell", NOMADIK_SDI_BASE,
|
|
NULL, &mmcsd_plat_data),
|
|
{ /* sentinel */ },
|
|
};
|
|
|
|
static void __init cpu8815_init_of(void)
|
|
{
|
|
#ifdef CONFIG_CACHE_L2X0
|
|
/* At full speed latency must be >=2, so 0x249 in low bits */
|
|
l2x0_of_init(0x00730249, 0xfe000fff);
|
|
#endif
|
|
of_platform_populate(NULL, of_default_bus_match_table,
|
|
cpu8815_auxdata_lookup, NULL);
|
|
}
|
|
|
|
static const char * cpu8815_board_compat[] = {
|
|
"calaosystems,usb-s8815",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(NOMADIK_DT, "Nomadik STn8815")
|
|
.map_io = cpu8815_map_io,
|
|
.init_time = cpu8815_timer_init_of,
|
|
.init_machine = cpu8815_init_of,
|
|
.restart = cpu8815_restart,
|
|
.dt_compat = cpu8815_board_compat,
|
|
MACHINE_END
|