mirror of
https://github.com/torvalds/linux.git
synced 2024-11-19 02:21:47 +00:00
b4b50fd78b
This branch contains mostly additions and changes to platform enablement and SoC-level drivers. Since there's sometimes a dependency on device-tree changes, there's also a fair amount of those in this branch. Pieces worth mentioning are: - Mbus driver for Marvell platforms, allowing kernel configuration and resource allocation of on-chip peripherals. - Enablement of the mbus infrastructure from Marvell PCI-e drivers. - Preparation of MSI support for Marvell platforms. - Addition of new PCI-e host controller driver for Tegra platforms - Some churn caused by sharing of macro names between i.MX 6Q and 6DL platforms in the device tree sources and header files. - Various suspend/PM updates for Tegra, including LP1 support. - Versatile Express support for MCPM, part of big little support. - Allwinner platform support for A20 and A31 SoCs (dual and quad Cortex-A7) - OMAP2+ support for DRA7, a new Cortex-A15-based SoC. The code that touches other architectures are patches moving MSI arch-specific functions over to weak symbols and removal of ARCH_SUPPORTS_MSI, acked by PCI maintainers. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJSKhYmAAoJEIwa5zzehBx322AP/1ONYs8o8f7/Gzq6lZvTN6T3 0pBTApg6Jfioi3lwKvUAEIcsW82YKQ+UZkbW66GQH6+Ri4aZJKZHuz0+JPU67OJ4 LtSLuzVWrymy2VOOUvAnS/SXkOZw/pHhU4cLNHn1dMndhUL1Uqp9/XwuiHEQyFsP uOkpcBtIu0EWElov0PKKZ5SWBg8JJs2vy5ydiViGelWHCrZvDDZkWzIsDcBQxJLQ juzT4+JE+KOu7vKmfw78o6iHoCS2TBRAN9YUCajRb8Wl+out1hrTahHnDWaZ5Mce EskcQNkJROqFbjD4k3ABN4XGTv2VDmrztIwFe0SEQ7Dz/9ypCrBGT69uI9xIqTXr GwVRIwAUFTpMupK0gy93z1ajV3N0CXV79out9+jQNUQybYE+czp8QOyhmuc1tZx0 8fn9jlBQe9Vy6yrs39gEcE7nUwrayeyQ+6UvqqwsE2pWZabNAnCMSPX5+QIu+T/3 tQ7+jYmfFeserp1sIDOHOnxfhtW9EI6U9d1h/DUCwrsuFdkL9ha4M/vh9Pwgye98 tBdz0T4yE39AJQwwFWRkv1jcQKcGu6WqJanmvS4KRBksGwuLWxy+ewOnkz2ifS25 ZYSyxAryZRBvQRqlOK11rXPfRcbGcY0MG9lkKX96rGcyWEizgE1DdjxXD8HoIleN R8heV6GX5OzlFLGX2tKK =fJ5x -----END PGP SIGNATURE----- Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC platform changes from Olof Johansson: "This branch contains mostly additions and changes to platform enablement and SoC-level drivers. Since there's sometimes a dependency on device-tree changes, there's also a fair amount of those in this branch. Pieces worth mentioning are: - Mbus driver for Marvell platforms, allowing kernel configuration and resource allocation of on-chip peripherals. - Enablement of the mbus infrastructure from Marvell PCI-e drivers. - Preparation of MSI support for Marvell platforms. - Addition of new PCI-e host controller driver for Tegra platforms - Some churn caused by sharing of macro names between i.MX 6Q and 6DL platforms in the device tree sources and header files. - Various suspend/PM updates for Tegra, including LP1 support. - Versatile Express support for MCPM, part of big little support. - Allwinner platform support for A20 and A31 SoCs (dual and quad Cortex-A7) - OMAP2+ support for DRA7, a new Cortex-A15-based SoC. The code that touches other architectures are patches moving MSI arch-specific functions over to weak symbols and removal of ARCH_SUPPORTS_MSI, acked by PCI maintainers" * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (266 commits) tegra-cpuidle: provide stub when !CONFIG_CPU_IDLE PCI: tegra: replace devm_request_and_ioremap by devm_ioremap_resource ARM: tegra: Drop ARCH_SUPPORTS_MSI and sort list ARM: dts: vf610-twr: enable i2c0 device ARM: dts: i.MX51: Add one more I2C2 pinmux entry ARM: dts: i.MX51: Move pins configuration under "iomuxc" label ARM: dtsi: imx6qdl-sabresd: Add USB OTG vbus pin to pinctrl_hog ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator ARM: dts: imx27-phytec-phycore-som: Enable AUDMUX ARM: dts: i.MX27: Disable AUDMUX in the template ARM: dts: wandboard: Add support for SDIO bcm4329 ARM: i.MX5 clocks: Remove optional clock setup (CKIH1) from i.MX51 template ARM: dts: imx53-qsb: Make USBH1 functional ARM i.MX6Q: dts: Enable I2C1 with EEPROM and PMIC on Phytec phyFLEX-i.MX6 Ouad module ARM i.MX6Q: dts: Enable SPI NOR flash on Phytec phyFLEX-i.MX6 Ouad module ARM: dts: imx6qdl-sabresd: Add touchscreen support ARM: imx: add ocram clock for imx53 ARM: dts: imx: ocram size is different between imx6q and imx6dl ARM: dts: imx27-phytec-phycore-som: Fix regulator settings ARM: dts: i.MX27: Remove clock name from CPU node ...
315 lines
6.9 KiB
C
315 lines
6.9 KiB
C
/*
|
|
* Copyright 2011-2013 Freescale Semiconductor, Inc.
|
|
* Copyright 2011 Linaro Ltd.
|
|
*
|
|
* The code contained herein is licensed under the GNU General Public
|
|
* License. You may obtain a copy of the GNU General Public License
|
|
* Version 2 or later at the following locations:
|
|
*
|
|
* http://www.opensource.org/licenses/gpl-license.html
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
*/
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/clkdev.h>
|
|
#include <linux/clocksource.h>
|
|
#include <linux/cpu.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/export.h>
|
|
#include <linux/init.h>
|
|
#include <linux/io.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/irqchip.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/opp.h>
|
|
#include <linux/phy.h>
|
|
#include <linux/reboot.h>
|
|
#include <linux/regmap.h>
|
|
#include <linux/micrel_phy.h>
|
|
#include <linux/mfd/syscon.h>
|
|
#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/system_misc.h>
|
|
|
|
#include "common.h"
|
|
#include "cpuidle.h"
|
|
#include "hardware.h"
|
|
|
|
static u32 chip_revision;
|
|
|
|
int imx6q_revision(void)
|
|
{
|
|
return chip_revision;
|
|
}
|
|
|
|
static void __init imx6q_init_revision(void)
|
|
{
|
|
u32 rev = imx_anatop_get_digprog();
|
|
|
|
switch (rev & 0xff) {
|
|
case 0:
|
|
chip_revision = IMX_CHIP_REVISION_1_0;
|
|
break;
|
|
case 1:
|
|
chip_revision = IMX_CHIP_REVISION_1_1;
|
|
break;
|
|
case 2:
|
|
chip_revision = IMX_CHIP_REVISION_1_2;
|
|
break;
|
|
default:
|
|
chip_revision = IMX_CHIP_REVISION_UNKNOWN;
|
|
}
|
|
|
|
mxc_set_cpu_type(rev >> 16 & 0xff);
|
|
}
|
|
|
|
static void imx6q_restart(enum reboot_mode mode, const char *cmd)
|
|
{
|
|
struct device_node *np;
|
|
void __iomem *wdog_base;
|
|
|
|
np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-wdt");
|
|
wdog_base = of_iomap(np, 0);
|
|
if (!wdog_base)
|
|
goto soft;
|
|
|
|
imx_src_prepare_restart();
|
|
|
|
/* enable wdog */
|
|
writew_relaxed(1 << 2, wdog_base);
|
|
/* write twice to ensure the request will not get ignored */
|
|
writew_relaxed(1 << 2, wdog_base);
|
|
|
|
/* wait for reset to assert ... */
|
|
mdelay(500);
|
|
|
|
pr_err("Watchdog reset failed to assert reset\n");
|
|
|
|
/* delay to allow the serial port to show the message */
|
|
mdelay(50);
|
|
|
|
soft:
|
|
/* we'll take a jump through zero as a poor second */
|
|
soft_restart(0);
|
|
}
|
|
|
|
/* For imx6q sabrelite board: set KSZ9021RN RGMII pad skew */
|
|
static int ksz9021rn_phy_fixup(struct phy_device *phydev)
|
|
{
|
|
if (IS_BUILTIN(CONFIG_PHYLIB)) {
|
|
/* min rx data delay */
|
|
phy_write(phydev, MICREL_KSZ9021_EXTREG_CTRL,
|
|
0x8000 | MICREL_KSZ9021_RGMII_RX_DATA_PAD_SCEW);
|
|
phy_write(phydev, MICREL_KSZ9021_EXTREG_DATA_WRITE, 0x0000);
|
|
|
|
/* max rx/tx clock delay, min rx/tx control delay */
|
|
phy_write(phydev, MICREL_KSZ9021_EXTREG_CTRL,
|
|
0x8000 | MICREL_KSZ9021_RGMII_CLK_CTRL_PAD_SCEW);
|
|
phy_write(phydev, MICREL_KSZ9021_EXTREG_DATA_WRITE, 0xf0f0);
|
|
phy_write(phydev, MICREL_KSZ9021_EXTREG_CTRL,
|
|
MICREL_KSZ9021_RGMII_CLK_CTRL_PAD_SCEW);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void mmd_write_reg(struct phy_device *dev, int device, int reg, int val)
|
|
{
|
|
phy_write(dev, 0x0d, device);
|
|
phy_write(dev, 0x0e, reg);
|
|
phy_write(dev, 0x0d, (1 << 14) | device);
|
|
phy_write(dev, 0x0e, val);
|
|
}
|
|
|
|
static int ksz9031rn_phy_fixup(struct phy_device *dev)
|
|
{
|
|
/*
|
|
* min rx data delay, max rx/tx clock delay,
|
|
* min rx/tx control delay
|
|
*/
|
|
mmd_write_reg(dev, 2, 4, 0);
|
|
mmd_write_reg(dev, 2, 5, 0);
|
|
mmd_write_reg(dev, 2, 8, 0x003ff);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ar8031_phy_fixup(struct phy_device *dev)
|
|
{
|
|
u16 val;
|
|
|
|
/* To enable AR8031 output a 125MHz clk from CLK_25M */
|
|
phy_write(dev, 0xd, 0x7);
|
|
phy_write(dev, 0xe, 0x8016);
|
|
phy_write(dev, 0xd, 0x4007);
|
|
|
|
val = phy_read(dev, 0xe);
|
|
val &= 0xffe3;
|
|
val |= 0x18;
|
|
phy_write(dev, 0xe, val);
|
|
|
|
/* introduce tx clock delay */
|
|
phy_write(dev, 0x1d, 0x5);
|
|
val = phy_read(dev, 0x1e);
|
|
val |= 0x0100;
|
|
phy_write(dev, 0x1e, val);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#define PHY_ID_AR8031 0x004dd074
|
|
|
|
static void __init imx6q_enet_phy_init(void)
|
|
{
|
|
if (IS_BUILTIN(CONFIG_PHYLIB)) {
|
|
phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,
|
|
ksz9021rn_phy_fixup);
|
|
phy_register_fixup_for_uid(PHY_ID_KSZ9031, MICREL_PHY_ID_MASK,
|
|
ksz9031rn_phy_fixup);
|
|
phy_register_fixup_for_uid(PHY_ID_AR8031, 0xffffffff,
|
|
ar8031_phy_fixup);
|
|
}
|
|
}
|
|
|
|
static void __init imx6q_1588_init(void)
|
|
{
|
|
struct regmap *gpr;
|
|
|
|
gpr = syscon_regmap_lookup_by_compatible("fsl,imx6q-iomuxc-gpr");
|
|
if (!IS_ERR(gpr))
|
|
regmap_update_bits(gpr, IOMUXC_GPR1,
|
|
IMX6Q_GPR1_ENET_CLK_SEL_MASK,
|
|
IMX6Q_GPR1_ENET_CLK_SEL_ANATOP);
|
|
else
|
|
pr_err("failed to find fsl,imx6q-iomux-gpr regmap\n");
|
|
|
|
}
|
|
|
|
static void __init imx6q_init_machine(void)
|
|
{
|
|
imx6q_enet_phy_init();
|
|
|
|
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
|
|
|
imx_anatop_init();
|
|
imx6q_pm_init();
|
|
imx6q_1588_init();
|
|
}
|
|
|
|
#define OCOTP_CFG3 0x440
|
|
#define OCOTP_CFG3_SPEED_SHIFT 16
|
|
#define OCOTP_CFG3_SPEED_1P2GHZ 0x3
|
|
|
|
static void __init imx6q_opp_check_1p2ghz(struct device *cpu_dev)
|
|
{
|
|
struct device_node *np;
|
|
void __iomem *base;
|
|
u32 val;
|
|
|
|
np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-ocotp");
|
|
if (!np) {
|
|
pr_warn("failed to find ocotp node\n");
|
|
return;
|
|
}
|
|
|
|
base = of_iomap(np, 0);
|
|
if (!base) {
|
|
pr_warn("failed to map ocotp\n");
|
|
goto put_node;
|
|
}
|
|
|
|
val = readl_relaxed(base + OCOTP_CFG3);
|
|
val >>= OCOTP_CFG3_SPEED_SHIFT;
|
|
if ((val & 0x3) != OCOTP_CFG3_SPEED_1P2GHZ)
|
|
if (opp_disable(cpu_dev, 1200000000))
|
|
pr_warn("failed to disable 1.2 GHz OPP\n");
|
|
|
|
put_node:
|
|
of_node_put(np);
|
|
}
|
|
|
|
static void __init imx6q_opp_init(struct device *cpu_dev)
|
|
{
|
|
struct device_node *np;
|
|
|
|
np = of_node_get(cpu_dev->of_node);
|
|
if (!np) {
|
|
pr_warn("failed to find cpu0 node\n");
|
|
return;
|
|
}
|
|
|
|
if (of_init_opp_table(cpu_dev)) {
|
|
pr_warn("failed to init OPP table\n");
|
|
goto put_node;
|
|
}
|
|
|
|
imx6q_opp_check_1p2ghz(cpu_dev);
|
|
|
|
put_node:
|
|
of_node_put(np);
|
|
}
|
|
|
|
static struct platform_device imx6q_cpufreq_pdev = {
|
|
.name = "imx6q-cpufreq",
|
|
};
|
|
|
|
static void __init imx6q_init_late(void)
|
|
{
|
|
/*
|
|
* WAIT mode is broken on TO 1.0 and 1.1, so there is no point
|
|
* to run cpuidle on them.
|
|
*/
|
|
if (imx6q_revision() > IMX_CHIP_REVISION_1_1)
|
|
imx6q_cpuidle_init();
|
|
|
|
if (IS_ENABLED(CONFIG_ARM_IMX6Q_CPUFREQ)) {
|
|
imx6q_opp_init(&imx6q_cpufreq_pdev.dev);
|
|
platform_device_register(&imx6q_cpufreq_pdev);
|
|
}
|
|
}
|
|
|
|
static void __init imx6q_map_io(void)
|
|
{
|
|
debug_ll_io_init();
|
|
imx_scu_map_io();
|
|
}
|
|
|
|
static void __init imx6q_init_irq(void)
|
|
{
|
|
imx6q_init_revision();
|
|
imx_init_l2cache();
|
|
imx_src_init();
|
|
imx_gpc_init();
|
|
irqchip_init();
|
|
}
|
|
|
|
static void __init imx6q_timer_init(void)
|
|
{
|
|
of_clk_init(NULL);
|
|
clocksource_of_init();
|
|
imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q",
|
|
imx6q_revision());
|
|
}
|
|
|
|
static const char *imx6q_dt_compat[] __initdata = {
|
|
"fsl,imx6dl",
|
|
"fsl,imx6q",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(IMX6Q, "Freescale i.MX6 Quad/DualLite (Device Tree)")
|
|
.smp = smp_ops(imx_smp_ops),
|
|
.map_io = imx6q_map_io,
|
|
.init_irq = imx6q_init_irq,
|
|
.init_time = imx6q_timer_init,
|
|
.init_machine = imx6q_init_machine,
|
|
.init_late = imx6q_init_late,
|
|
.dt_compat = imx6q_dt_compat,
|
|
.restart = imx6q_restart,
|
|
MACHINE_END
|