mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 10:01:43 +00:00
f9efbce633
Most of this branch consists of updates, additions and general churn of the device tree source files in the kernel (arch/arm/boot/dts). Besides that, there are a few things to point out: - Lots of platform conversion on OMAP2+, with removal of old board files for various platforms. - Final conversion of a bunch of ux500 (ST-Ericsson) platforms as well - Some updates to pinctrl and other subsystems. Most of these are for DT-enablement of the various platforms and acks have been collected. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJSgB6cAAoJEIwa5zzehBx3uuEP/0n8b7qgmx2e0HPtx3qlqPiR 3bit2/5MzJNufb46qnYhhE+DF+bo1yfGlrIQK7nBXuv1fMKKlVMoUZ7Ql3EBbPzd UWrENl2eiapO7D9uN9EZ5WVYu+tKJewU89xkhM70xlCBUHGgQ4k958E8TH9vmELI Qj1s2UcsYftMF9EH6sbQZ7Jkhrg2M9zVgqUcrqqZT/ZF97174SCEJzAt6n9RGGvr M9sPOPOIO2D5/tu1oOz1dCQQmATj2r5NYAMOu/jVlvB0OpsCrsFwrTWGHWfssR4z 3uIxcaVb4XgtxCtY9o+C9nJiLGqoENWQS7ScuAx6GTHjn4dwL9OZBMjb/vGGFKQp dtikMRCaNAkJ8XNl/s8ND+rLzXuPF2KIqkZZz/Nwm02lZq/0OPu0ysBGpdN4C4pk TRiLxnqE0OZg5cnFQFOMAZF4ABh/0x8cM7a1PPBT5MnTvuH1YrLAuvL5daReU5u1 LlxlFd9rSq8SVn8pBLgKk8RlMkqduDm1HusABnFlzBJMJ0Jy2Ol1X3fPK/8wHq6e 4NedNaQbnx1U5pB2mGIPutkBdVkjK7dKvlDXgYi1sunf5Ake+vej3zJ7u4UfWeIJ lHJgjnPHdGtZ74RU4/ckp5ba+JHXJ15XAxFKk9XRiOjf+9ciQ4dLRF/JfiSRG2Yc 9NZi38w8M3wC2P7U3dh4 =nH67 -----END PGP SIGNATURE----- Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC DT updates from Olof Johansson: "Most of this branch consists of updates, additions and general churn of the device tree source files in the kernel (arch/arm/boot/dts). Besides that, there are a few things to point out: - Lots of platform conversion on OMAP2+, with removal of old board files for various platforms. - Final conversion of a bunch of ux500 (ST-Ericsson) platforms as well - Some updates to pinctrl and other subsystems. Most of these are for DT-enablement of the various platforms and acks have been collected" * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (385 commits) ARM: dts: bcm11351: Use GIC/IRQ defines for sdio interrupts ARM: dts: bcm: Add missing UARTs for bcm11351 (bcm281xx) ARM: dts: bcm281xx: Add card detect GPIO ARM: dts: rename ARCH_BCM to ARCH_BCM_MOBILE (dt) ARM: bcm281xx: Add device node for the GPIO controller ARM: mvebu: Add Netgear ReadyNAS 104 board ARM: tegra: fix Tegra114 IOMMU register address ARM: kirkwood: add support for OpenBlocks A7 platform ARM: dts: omap4-panda: add DPI pinmuxing ARM: dts: AM33xx: Add RNG node ARM: dts: AM33XX: Add hwspinlock node ARM: dts: OMAP5: Add hwspinlock node ARM: dts: OMAP4: Add hwspinlock node ARM: dts: use 'status' property for PCIe nodes ARM: dts: sirf: add missed address-cells and size-cells for prima2 I2C ARM: dts: sirf: add missed cell, cs and dma channel for SPI nodes ARM: dts: sirf: add missed graphics2d iobg in atlas6 dts ARM: dts: sirf: add missed chhifbg node in prima2 and atlas6 dts ARM: dts: sirf: add missed memcontrol-monitor node in prima2 and atlas6 dts ARM: mvebu: Add the core-divider clock to Armada 370/XP ...
506 lines
11 KiB
C
506 lines
11 KiB
C
/*
|
|
* linux/arch/arm/mach-omap2/devices.c
|
|
*
|
|
* OMAP2 platform device setup/initialization
|
|
*
|
|
* 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.
|
|
*/
|
|
#include <linux/gpio.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/io.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/err.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/of.h>
|
|
#include <linux/pinctrl/machine.h>
|
|
#include <linux/platform_data/omap4-keypad.h>
|
|
#include <linux/platform_data/mailbox-omap.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include <linux/omap-dma.h>
|
|
|
|
#include "iomap.h"
|
|
#include "omap_hwmod.h"
|
|
#include "omap_device.h"
|
|
#include "omap4-keypad.h"
|
|
|
|
#include "soc.h"
|
|
#include "common.h"
|
|
#include "mux.h"
|
|
#include "control.h"
|
|
#include "devices.h"
|
|
#include "display.h"
|
|
|
|
#define L3_MODULES_MAX_LEN 12
|
|
#define L3_MODULES 3
|
|
|
|
static int __init omap3_l3_init(void)
|
|
{
|
|
struct omap_hwmod *oh;
|
|
struct platform_device *pdev;
|
|
char oh_name[L3_MODULES_MAX_LEN];
|
|
|
|
/*
|
|
* To avoid code running on other OMAPs in
|
|
* multi-omap builds
|
|
*/
|
|
if (!(cpu_is_omap34xx()))
|
|
return -ENODEV;
|
|
|
|
snprintf(oh_name, L3_MODULES_MAX_LEN, "l3_main");
|
|
|
|
oh = omap_hwmod_lookup(oh_name);
|
|
|
|
if (!oh)
|
|
pr_err("could not look up %s\n", oh_name);
|
|
|
|
pdev = omap_device_build("omap_l3_smx", 0, oh, NULL, 0);
|
|
|
|
WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name);
|
|
|
|
return PTR_RET(pdev);
|
|
}
|
|
omap_postcore_initcall(omap3_l3_init);
|
|
|
|
static int __init omap4_l3_init(void)
|
|
{
|
|
int i;
|
|
struct omap_hwmod *oh[3];
|
|
struct platform_device *pdev;
|
|
char oh_name[L3_MODULES_MAX_LEN];
|
|
|
|
/* If dtb is there, the devices will be created dynamically */
|
|
if (of_have_populated_dt())
|
|
return -ENODEV;
|
|
|
|
/*
|
|
* To avoid code running on other OMAPs in
|
|
* multi-omap builds
|
|
*/
|
|
if (!cpu_is_omap44xx() && !soc_is_omap54xx())
|
|
return -ENODEV;
|
|
|
|
for (i = 0; i < L3_MODULES; i++) {
|
|
snprintf(oh_name, L3_MODULES_MAX_LEN, "l3_main_%d", i+1);
|
|
|
|
oh[i] = omap_hwmod_lookup(oh_name);
|
|
if (!(oh[i]))
|
|
pr_err("could not look up %s\n", oh_name);
|
|
}
|
|
|
|
pdev = omap_device_build_ss("omap_l3_noc", 0, oh, 3, NULL, 0);
|
|
|
|
WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name);
|
|
|
|
return PTR_RET(pdev);
|
|
}
|
|
omap_postcore_initcall(omap4_l3_init);
|
|
|
|
#if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
|
|
|
|
static struct resource omap2cam_resources[] = {
|
|
{
|
|
.start = OMAP24XX_CAMERA_BASE,
|
|
.end = OMAP24XX_CAMERA_BASE + 0xfff,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = 24 + OMAP_INTC_START,
|
|
.flags = IORESOURCE_IRQ,
|
|
}
|
|
};
|
|
|
|
static struct platform_device omap2cam_device = {
|
|
.name = "omap24xxcam",
|
|
.id = -1,
|
|
.num_resources = ARRAY_SIZE(omap2cam_resources),
|
|
.resource = omap2cam_resources,
|
|
};
|
|
#endif
|
|
|
|
#if defined(CONFIG_IOMMU_API)
|
|
|
|
#include <linux/platform_data/iommu-omap.h>
|
|
|
|
static struct resource omap3isp_resources[] = {
|
|
{
|
|
.start = OMAP3430_ISP_BASE,
|
|
.end = OMAP3430_ISP_END,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = OMAP3430_ISP_CCP2_BASE,
|
|
.end = OMAP3430_ISP_CCP2_END,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = OMAP3430_ISP_CCDC_BASE,
|
|
.end = OMAP3430_ISP_CCDC_END,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = OMAP3430_ISP_HIST_BASE,
|
|
.end = OMAP3430_ISP_HIST_END,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = OMAP3430_ISP_H3A_BASE,
|
|
.end = OMAP3430_ISP_H3A_END,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = OMAP3430_ISP_PREV_BASE,
|
|
.end = OMAP3430_ISP_PREV_END,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = OMAP3430_ISP_RESZ_BASE,
|
|
.end = OMAP3430_ISP_RESZ_END,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = OMAP3430_ISP_SBL_BASE,
|
|
.end = OMAP3430_ISP_SBL_END,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = OMAP3430_ISP_CSI2A_REGS1_BASE,
|
|
.end = OMAP3430_ISP_CSI2A_REGS1_END,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = OMAP3430_ISP_CSIPHY2_BASE,
|
|
.end = OMAP3430_ISP_CSIPHY2_END,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = OMAP3630_ISP_CSI2A_REGS2_BASE,
|
|
.end = OMAP3630_ISP_CSI2A_REGS2_END,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = OMAP3630_ISP_CSI2C_REGS1_BASE,
|
|
.end = OMAP3630_ISP_CSI2C_REGS1_END,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = OMAP3630_ISP_CSIPHY1_BASE,
|
|
.end = OMAP3630_ISP_CSIPHY1_END,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = OMAP3630_ISP_CSI2C_REGS2_BASE,
|
|
.end = OMAP3630_ISP_CSI2C_REGS2_END,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = OMAP343X_CTRL_BASE + OMAP343X_CONTROL_CSIRXFE,
|
|
.end = OMAP343X_CTRL_BASE + OMAP343X_CONTROL_CSIRXFE + 3,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = OMAP343X_CTRL_BASE + OMAP3630_CONTROL_CAMERA_PHY_CTRL,
|
|
.end = OMAP343X_CTRL_BASE + OMAP3630_CONTROL_CAMERA_PHY_CTRL + 3,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = 24 + OMAP_INTC_START,
|
|
.flags = IORESOURCE_IRQ,
|
|
}
|
|
};
|
|
|
|
static struct platform_device omap3isp_device = {
|
|
.name = "omap3isp",
|
|
.id = -1,
|
|
.num_resources = ARRAY_SIZE(omap3isp_resources),
|
|
.resource = omap3isp_resources,
|
|
};
|
|
|
|
static struct omap_iommu_arch_data omap3_isp_iommu = {
|
|
.name = "mmu_isp",
|
|
};
|
|
|
|
int omap3_init_camera(struct isp_platform_data *pdata)
|
|
{
|
|
omap3isp_device.dev.platform_data = pdata;
|
|
omap3isp_device.dev.archdata.iommu = &omap3_isp_iommu;
|
|
|
|
return platform_device_register(&omap3isp_device);
|
|
}
|
|
|
|
#else /* !CONFIG_IOMMU_API */
|
|
|
|
int omap3_init_camera(struct isp_platform_data *pdata)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#endif
|
|
|
|
static inline void omap_init_camera(void)
|
|
{
|
|
#if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
|
|
if (cpu_is_omap24xx())
|
|
platform_device_register(&omap2cam_device);
|
|
#endif
|
|
}
|
|
|
|
int __init omap4_keyboard_init(struct omap4_keypad_platform_data
|
|
*sdp4430_keypad_data, struct omap_board_data *bdata)
|
|
{
|
|
struct platform_device *pdev;
|
|
struct omap_hwmod *oh;
|
|
struct omap4_keypad_platform_data *keypad_data;
|
|
unsigned int id = -1;
|
|
char *oh_name = "kbd";
|
|
char *name = "omap4-keypad";
|
|
|
|
oh = omap_hwmod_lookup(oh_name);
|
|
if (!oh) {
|
|
pr_err("Could not look up %s\n", oh_name);
|
|
return -ENODEV;
|
|
}
|
|
|
|
keypad_data = sdp4430_keypad_data;
|
|
|
|
pdev = omap_device_build(name, id, oh, keypad_data,
|
|
sizeof(struct omap4_keypad_platform_data));
|
|
|
|
if (IS_ERR(pdev)) {
|
|
WARN(1, "Can't build omap_device for %s:%s.\n",
|
|
name, oh->name);
|
|
return PTR_ERR(pdev);
|
|
}
|
|
oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#if defined(CONFIG_OMAP2PLUS_MBOX) || defined(CONFIG_OMAP2PLUS_MBOX_MODULE)
|
|
static inline void __init omap_init_mbox(void)
|
|
{
|
|
struct omap_hwmod *oh;
|
|
struct platform_device *pdev;
|
|
struct omap_mbox_pdata *pdata;
|
|
|
|
oh = omap_hwmod_lookup("mailbox");
|
|
if (!oh) {
|
|
pr_err("%s: unable to find hwmod\n", __func__);
|
|
return;
|
|
}
|
|
if (!oh->dev_attr) {
|
|
pr_err("%s: hwmod doesn't have valid attrs\n", __func__);
|
|
return;
|
|
}
|
|
|
|
pdata = (struct omap_mbox_pdata *)oh->dev_attr;
|
|
pdev = omap_device_build("omap-mailbox", -1, oh, pdata, sizeof(*pdata));
|
|
WARN(IS_ERR(pdev), "%s: could not build device, err %ld\n",
|
|
__func__, PTR_ERR(pdev));
|
|
}
|
|
#else
|
|
static inline void omap_init_mbox(void) { }
|
|
#endif /* CONFIG_OMAP2PLUS_MBOX */
|
|
|
|
static inline void omap_init_sti(void) {}
|
|
|
|
#if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)
|
|
|
|
static struct platform_device omap_pcm = {
|
|
.name = "omap-pcm-audio",
|
|
.id = -1,
|
|
};
|
|
|
|
static void omap_init_audio(void)
|
|
{
|
|
platform_device_register(&omap_pcm);
|
|
}
|
|
|
|
#else
|
|
static inline void omap_init_audio(void) {}
|
|
#endif
|
|
|
|
#if defined(CONFIG_SND_OMAP_SOC_OMAP_HDMI) || \
|
|
defined(CONFIG_SND_OMAP_SOC_OMAP_HDMI_MODULE)
|
|
|
|
static struct platform_device omap_hdmi_audio = {
|
|
.name = "omap-hdmi-audio",
|
|
.id = -1,
|
|
};
|
|
|
|
static void __init omap_init_hdmi_audio(void)
|
|
{
|
|
struct omap_hwmod *oh;
|
|
struct platform_device *pdev;
|
|
|
|
oh = omap_hwmod_lookup("dss_hdmi");
|
|
if (!oh)
|
|
return;
|
|
|
|
pdev = omap_device_build("omap-hdmi-audio-dai", -1, oh, NULL, 0);
|
|
WARN(IS_ERR(pdev),
|
|
"Can't build omap_device for omap-hdmi-audio-dai.\n");
|
|
|
|
platform_device_register(&omap_hdmi_audio);
|
|
}
|
|
#else
|
|
static inline void omap_init_hdmi_audio(void) {}
|
|
#endif
|
|
|
|
#if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)
|
|
|
|
#include <linux/platform_data/spi-omap2-mcspi.h>
|
|
|
|
static int __init omap_mcspi_init(struct omap_hwmod *oh, void *unused)
|
|
{
|
|
struct platform_device *pdev;
|
|
char *name = "omap2_mcspi";
|
|
struct omap2_mcspi_platform_config *pdata;
|
|
static int spi_num;
|
|
struct omap2_mcspi_dev_attr *mcspi_attrib = oh->dev_attr;
|
|
|
|
pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
|
|
if (!pdata) {
|
|
pr_err("Memory allocation for McSPI device failed\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
pdata->num_cs = mcspi_attrib->num_chipselect;
|
|
switch (oh->class->rev) {
|
|
case OMAP2_MCSPI_REV:
|
|
case OMAP3_MCSPI_REV:
|
|
pdata->regs_offset = 0;
|
|
break;
|
|
case OMAP4_MCSPI_REV:
|
|
pdata->regs_offset = OMAP4_MCSPI_REG_OFFSET;
|
|
break;
|
|
default:
|
|
pr_err("Invalid McSPI Revision value\n");
|
|
kfree(pdata);
|
|
return -EINVAL;
|
|
}
|
|
|
|
spi_num++;
|
|
pdev = omap_device_build(name, spi_num, oh, pdata, sizeof(*pdata));
|
|
WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s\n",
|
|
name, oh->name);
|
|
kfree(pdata);
|
|
return 0;
|
|
}
|
|
|
|
static void omap_init_mcspi(void)
|
|
{
|
|
omap_hwmod_for_each_by_class("mcspi", omap_mcspi_init, NULL);
|
|
}
|
|
|
|
#else
|
|
static inline void omap_init_mcspi(void) {}
|
|
#endif
|
|
|
|
/**
|
|
* omap_init_rng - bind the RNG hwmod to the RNG omap_device
|
|
*
|
|
* Bind the RNG hwmod to the RNG omap_device. No return value.
|
|
*/
|
|
static void omap_init_rng(void)
|
|
{
|
|
struct omap_hwmod *oh;
|
|
struct platform_device *pdev;
|
|
|
|
oh = omap_hwmod_lookup("rng");
|
|
if (!oh)
|
|
return;
|
|
|
|
pdev = omap_device_build("omap_rng", -1, oh, NULL, 0);
|
|
WARN(IS_ERR(pdev), "Can't build omap_device for omap_rng\n");
|
|
}
|
|
|
|
static void __init omap_init_sham(void)
|
|
{
|
|
struct omap_hwmod *oh;
|
|
struct platform_device *pdev;
|
|
|
|
oh = omap_hwmod_lookup("sham");
|
|
if (!oh)
|
|
return;
|
|
|
|
pdev = omap_device_build("omap-sham", -1, oh, NULL, 0);
|
|
WARN(IS_ERR(pdev), "Can't build omap_device for omap-sham\n");
|
|
}
|
|
|
|
static void __init omap_init_aes(void)
|
|
{
|
|
struct omap_hwmod *oh;
|
|
struct platform_device *pdev;
|
|
|
|
oh = omap_hwmod_lookup("aes");
|
|
if (!oh)
|
|
return;
|
|
|
|
pdev = omap_device_build("omap-aes", -1, oh, NULL, 0);
|
|
WARN(IS_ERR(pdev), "Can't build omap_device for omap-aes\n");
|
|
}
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
#if defined(CONFIG_VIDEO_OMAP2_VOUT) || \
|
|
defined(CONFIG_VIDEO_OMAP2_VOUT_MODULE)
|
|
#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
|
|
static struct resource omap_vout_resource[3 - CONFIG_FB_OMAP2_NUM_FBS] = {
|
|
};
|
|
#else
|
|
static struct resource omap_vout_resource[2] = {
|
|
};
|
|
#endif
|
|
|
|
static struct platform_device omap_vout_device = {
|
|
.name = "omap_vout",
|
|
.num_resources = ARRAY_SIZE(omap_vout_resource),
|
|
.resource = &omap_vout_resource[0],
|
|
.id = -1,
|
|
};
|
|
|
|
int __init omap_init_vout(void)
|
|
{
|
|
return platform_device_register(&omap_vout_device);
|
|
}
|
|
#else
|
|
int __init omap_init_vout(void) { return 0; }
|
|
#endif
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
static int __init omap2_init_devices(void)
|
|
{
|
|
/* Enable dummy states for those platforms without pinctrl support */
|
|
if (!of_have_populated_dt())
|
|
pinctrl_provide_dummies();
|
|
|
|
/*
|
|
* please keep these calls, and their implementations above,
|
|
* in alphabetical order so they're easier to sort through.
|
|
*/
|
|
omap_init_audio();
|
|
omap_init_camera();
|
|
omap_init_hdmi_audio();
|
|
omap_init_mbox();
|
|
/* If dtb is there, the devices will be created dynamically */
|
|
if (!of_have_populated_dt()) {
|
|
omap_init_mcspi();
|
|
omap_init_sham();
|
|
omap_init_aes();
|
|
omap_init_rng();
|
|
}
|
|
omap_init_sti();
|
|
|
|
return 0;
|
|
}
|
|
omap_arch_initcall(omap2_init_devices);
|