mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-17 07:54:54 +08:00
6e207b8821
A few SoC (code) changes have queued up this cycle, mostly for minor changes and some refactoring and cleanup of legacy platforms. This branch also contains a few of the fixes that weren't sent in by the end of the release (all fairly minor). - Adding an additional maintainer for the TEE subsystem (Sumit Garg) - Quite a significant modernization of the IXP4xx platforms by Linus Walleij, revisiting with a new PCI host driver/binding, removing legacy mach/* include dependencies and moving platform detection/config to drivers/soc. Also some updates/cleanup of platform data. - Core power domain support for Tegra platforms, and some improvements in build test coverage by adding stubs for compile test targets. - A handful of updates to i.MX platforms, adding legacy (non-PSCI) SMP support on i.MX7D, SoC ID setup for i.MX50, removal of platform data and board fixups for iMX6/7. ... and a few smaller changes and fixes for Samsung, OMAP, Allwinner, Rockchip. -----BEGIN PGP SIGNATURE----- iQJDBAABCgAtFiEElf+HevZ4QCAJmMQ+jBrnPN6EHHcFAmDojiQPHG9sb2ZAbGl4 b20ubmV0AAoJEIwa5zzehBx3Z+kQAJofM2XXE3eHoIGINp+XuYZHCAdTxpIJfhsQ KPt4dzaxq0eBhrD8PICelJ2ymWz4c3sO2z+v79zQfOJdutnFKWTCRstqW8qdq9cE vzYh5pDJy0VmLkYSX/PzvfTLUQDM+Cx0sH/8e2gRwCC/F5tXolLA8lcqWQg9LnlC 5joLOm2WL2uHDgPFZLR6Y1m0KabvUMMpYx6ji9EUx4qtc0VgRMRTSZkRZK4E1PU+ ls175pPZxQfmTyFuHGc1L6KrfnHry8+YX/61sMlBfi96itMnBi05PcxljH8hMkQ8 IVfqPYVnI2vX37f8MhcX4Wec8pKQ9SZqT9mbADGEG23XfZppT5cp7pJUACoZ/wJ5 MMXn99hsEI0NO/gswKr2ZCCskydWrwOqhzubxZrYQtyFt38Sgs+mMLYxyQJKztbZ Laz+JBYKsvIlRctt+fArLp79EJx+CpSUpcha5Q0dQUmz3GWApPpS/6nMiNkq1Myv aByG9HXjOpRI5IiaOi7Fv/m/i+TsO43boNFerUIqPYi2AxmM9D8M2sJcyWHVwQRK glSAjISbp0GHAzVPM5JzhGIrCu4xC5Hf09Q+0OP6c3YVylwKNMurJCjCCql+ft8I Z41WVglS4xO5Y/qiWi+5pzg7/+VESBcsFn6PA5AJAAsDGgU5WHHXhI5kO7eUFAK9 nuIbtqUS =b6Jo -----END PGP SIGNATURE----- Merge tag 'arm-soc-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc Pull ARM SoC updates from Olof Johansson: "A few SoC (code) changes have queued up this cycle, mostly for minor changes and some refactoring and cleanup of legacy platforms. This branch also contains a few of the fixes that weren't sent in by the end of the release (all fairly minor). - Adding an additional maintainer for the TEE subsystem (Sumit Garg) - Quite a significant modernization of the IXP4xx platforms by Linus Walleij, revisiting with a new PCI host driver/binding, removing legacy mach/* include dependencies and moving platform detection/config to drivers/soc. Also some updates/cleanup of platform data. - Core power domain support for Tegra platforms, and some improvements in build test coverage by adding stubs for compile test targets. - A handful of updates to i.MX platforms, adding legacy (non-PSCI) SMP support on i.MX7D, SoC ID setup for i.MX50, removal of platform data and board fixups for iMX6/7. ... and a few smaller changes and fixes for Samsung, OMAP, Allwinner, Rockchip" * tag 'arm-soc-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (53 commits) MAINTAINERS: Add myself as TEE subsystem reviewer ixp4xx: fix spelling mistake in Kconfig "Devce" -> "Device" hw_random: ixp4xx: Add OF support hw_random: ixp4xx: Add DT bindings hw_random: ixp4xx: Turn into a module hw_random: ixp4xx: Use SPDX license tag hw_random: ixp4xx: enable compile-testing pata: ixp4xx: split platform data to its own header soc: ixp4xx: move cpu detection to linux/soc/ixp4xx/cpu.h PCI: ixp4xx: Add a new driver for IXP4xx PCI: ixp4xx: Add device tree bindings for IXP4xx ARM/ixp4xx: Make NEED_MACH_IO_H optional ARM/ixp4xx: Move the virtual IObases MAINTAINERS: ARM/MStar/Sigmastar SoCs: Add a link to the MStar tree ARM: debug: add UART early console support for MSTAR SoCs ARM: dts: ux500: Fix LED probing ARM: imx: add smp support for imx7d ARM: imx6q: drop of_platform_default_populate() from init_machine arm64: dts: rockchip: Update RK3399 PCI host bridge window to 32-bit address memory soc/tegra: fuse: Fix Tegra234-only builds ...
435 lines
10 KiB
C
435 lines
10 KiB
C
/*
|
|
* arch/arm/mach-ixp4xx/common.c
|
|
*
|
|
* Generic code shared across all IXP4XX platforms
|
|
*
|
|
* Maintainer: Deepak Saxena <dsaxena@plexity.net>
|
|
*
|
|
* Copyright 2002 (c) Intel Corporation
|
|
* Copyright 2003-2004 (c) MontaVista, Software, Inc.
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/init.h>
|
|
#include <linux/serial.h>
|
|
#include <linux/tty.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/serial_core.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/io.h>
|
|
#include <linux/export.h>
|
|
#include <linux/cpu.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/sched_clock.h>
|
|
#include <linux/soc/ixp4xx/cpu.h>
|
|
#include <linux/irqchip/irq-ixp4xx.h>
|
|
#include <linux/platform_data/timer-ixp4xx.h>
|
|
#include <linux/dma-map-ops.h>
|
|
#include <mach/udc.h>
|
|
#include <mach/hardware.h>
|
|
#include <linux/uaccess.h>
|
|
#include <asm/page.h>
|
|
#include <asm/exception.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/system_misc.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/irq.h>
|
|
#include <asm/mach/time.h>
|
|
|
|
#include "irqs.h"
|
|
|
|
u32 ixp4xx_read_feature_bits(void)
|
|
{
|
|
u32 val = ~__raw_readl(IXP4XX_EXP_CFG2);
|
|
|
|
if (cpu_is_ixp42x_rev_a0())
|
|
return IXP42X_FEATURE_MASK & ~(IXP4XX_FEATURE_RCOMP |
|
|
IXP4XX_FEATURE_AES);
|
|
if (cpu_is_ixp42x())
|
|
return val & IXP42X_FEATURE_MASK;
|
|
if (cpu_is_ixp43x())
|
|
return val & IXP43X_FEATURE_MASK;
|
|
return val & IXP46X_FEATURE_MASK;
|
|
}
|
|
EXPORT_SYMBOL(ixp4xx_read_feature_bits);
|
|
|
|
void ixp4xx_write_feature_bits(u32 value)
|
|
{
|
|
__raw_writel(~value, IXP4XX_EXP_CFG2);
|
|
}
|
|
EXPORT_SYMBOL(ixp4xx_write_feature_bits);
|
|
|
|
#define IXP4XX_TIMER_FREQ 66666000
|
|
|
|
/*************************************************************************
|
|
* IXP4xx chipset I/O mapping
|
|
*************************************************************************/
|
|
static struct map_desc ixp4xx_io_desc[] __initdata = {
|
|
{ /* UART, Interrupt ctrl, GPIO, timers, NPEs, MACs, USB .... */
|
|
.virtual = (unsigned long)IXP4XX_PERIPHERAL_BASE_VIRT,
|
|
.pfn = __phys_to_pfn(IXP4XX_PERIPHERAL_BASE_PHYS),
|
|
.length = IXP4XX_PERIPHERAL_REGION_SIZE,
|
|
.type = MT_DEVICE
|
|
}, { /* Expansion Bus Config Registers */
|
|
.virtual = (unsigned long)IXP4XX_EXP_CFG_BASE_VIRT,
|
|
.pfn = __phys_to_pfn(IXP4XX_EXP_CFG_BASE_PHYS),
|
|
.length = IXP4XX_EXP_CFG_REGION_SIZE,
|
|
.type = MT_DEVICE
|
|
}, { /* PCI Registers */
|
|
.virtual = (unsigned long)IXP4XX_PCI_CFG_BASE_VIRT,
|
|
.pfn = __phys_to_pfn(IXP4XX_PCI_CFG_BASE_PHYS),
|
|
.length = IXP4XX_PCI_CFG_REGION_SIZE,
|
|
.type = MT_DEVICE
|
|
},
|
|
};
|
|
|
|
void __init ixp4xx_map_io(void)
|
|
{
|
|
iotable_init(ixp4xx_io_desc, ARRAY_SIZE(ixp4xx_io_desc));
|
|
}
|
|
|
|
void __init ixp4xx_init_irq(void)
|
|
{
|
|
/*
|
|
* ixp4xx does not implement the XScale PWRMODE register
|
|
* so it must not call cpu_do_idle().
|
|
*/
|
|
cpu_idle_poll_ctrl(true);
|
|
|
|
ixp4xx_irq_init(IXP4XX_INTC_BASE_PHYS,
|
|
(cpu_is_ixp46x() || cpu_is_ixp43x()));
|
|
}
|
|
|
|
void __init ixp4xx_timer_init(void)
|
|
{
|
|
return ixp4xx_timer_setup(IXP4XX_TIMER_BASE_PHYS,
|
|
IRQ_IXP4XX_TIMER1,
|
|
IXP4XX_TIMER_FREQ);
|
|
}
|
|
|
|
static struct pxa2xx_udc_mach_info ixp4xx_udc_info;
|
|
|
|
void __init ixp4xx_set_udc_info(struct pxa2xx_udc_mach_info *info)
|
|
{
|
|
memcpy(&ixp4xx_udc_info, info, sizeof *info);
|
|
}
|
|
|
|
static struct resource ixp4xx_udc_resources[] = {
|
|
[0] = {
|
|
.start = 0xc800b000,
|
|
.end = 0xc800bfff,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
[1] = {
|
|
.start = IRQ_IXP4XX_USB,
|
|
.end = IRQ_IXP4XX_USB,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct resource ixp4xx_gpio_resource[] = {
|
|
{
|
|
.start = IXP4XX_GPIO_BASE_PHYS,
|
|
.end = IXP4XX_GPIO_BASE_PHYS + 0xfff,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
};
|
|
|
|
static struct platform_device ixp4xx_gpio_device = {
|
|
.name = "ixp4xx-gpio",
|
|
.id = -1,
|
|
.dev = {
|
|
.coherent_dma_mask = DMA_BIT_MASK(32),
|
|
},
|
|
.resource = ixp4xx_gpio_resource,
|
|
.num_resources = ARRAY_SIZE(ixp4xx_gpio_resource),
|
|
};
|
|
|
|
/*
|
|
* USB device controller. The IXP4xx uses the same controller as PXA25X,
|
|
* so we just use the same device.
|
|
*/
|
|
static struct platform_device ixp4xx_udc_device = {
|
|
.name = "pxa25x-udc",
|
|
.id = -1,
|
|
.num_resources = 2,
|
|
.resource = ixp4xx_udc_resources,
|
|
.dev = {
|
|
.platform_data = &ixp4xx_udc_info,
|
|
},
|
|
};
|
|
|
|
static struct resource ixp4xx_npe_resources[] = {
|
|
{
|
|
.start = IXP4XX_NPEA_BASE_PHYS,
|
|
.end = IXP4XX_NPEA_BASE_PHYS + 0xfff,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = IXP4XX_NPEB_BASE_PHYS,
|
|
.end = IXP4XX_NPEB_BASE_PHYS + 0xfff,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = IXP4XX_NPEC_BASE_PHYS,
|
|
.end = IXP4XX_NPEC_BASE_PHYS + 0xfff,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
|
|
};
|
|
|
|
static struct platform_device ixp4xx_npe_device = {
|
|
.name = "ixp4xx-npe",
|
|
.id = -1,
|
|
.num_resources = ARRAY_SIZE(ixp4xx_npe_resources),
|
|
.resource = ixp4xx_npe_resources,
|
|
};
|
|
|
|
static struct resource ixp4xx_qmgr_resources[] = {
|
|
{
|
|
.start = IXP4XX_QMGR_BASE_PHYS,
|
|
.end = IXP4XX_QMGR_BASE_PHYS + 0x3fff,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = IRQ_IXP4XX_QM1,
|
|
.end = IRQ_IXP4XX_QM1,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
{
|
|
.start = IRQ_IXP4XX_QM2,
|
|
.end = IRQ_IXP4XX_QM2,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct platform_device ixp4xx_qmgr_device = {
|
|
.name = "ixp4xx-qmgr",
|
|
.id = -1,
|
|
.num_resources = ARRAY_SIZE(ixp4xx_qmgr_resources),
|
|
.resource = ixp4xx_qmgr_resources,
|
|
};
|
|
|
|
static struct platform_device *ixp4xx_devices[] __initdata = {
|
|
&ixp4xx_npe_device,
|
|
&ixp4xx_qmgr_device,
|
|
&ixp4xx_gpio_device,
|
|
&ixp4xx_udc_device,
|
|
};
|
|
|
|
static struct resource ixp46x_i2c_resources[] = {
|
|
[0] = {
|
|
.start = 0xc8011000,
|
|
.end = 0xc801101c,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
[1] = {
|
|
.start = IRQ_IXP4XX_I2C,
|
|
.end = IRQ_IXP4XX_I2C,
|
|
.flags = IORESOURCE_IRQ
|
|
}
|
|
};
|
|
|
|
/* A single 32-bit register on IXP46x */
|
|
#define IXP4XX_HWRANDOM_BASE_PHYS 0x70002100
|
|
|
|
static struct resource ixp46x_hwrandom_resource[] = {
|
|
{
|
|
.start = IXP4XX_HWRANDOM_BASE_PHYS,
|
|
.end = IXP4XX_HWRANDOM_BASE_PHYS + 0x3,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
};
|
|
|
|
static struct platform_device ixp46x_hwrandom_device = {
|
|
.name = "ixp4xx-hwrandom",
|
|
.id = -1,
|
|
.dev = {
|
|
.coherent_dma_mask = DMA_BIT_MASK(32),
|
|
},
|
|
.resource = ixp46x_hwrandom_resource,
|
|
.num_resources = ARRAY_SIZE(ixp46x_hwrandom_resource),
|
|
};
|
|
|
|
/*
|
|
* I2C controller. The IXP46x uses the same block as the IOP3xx, so
|
|
* we just use the same device name.
|
|
*/
|
|
static struct platform_device ixp46x_i2c_controller = {
|
|
.name = "IOP3xx-I2C",
|
|
.id = 0,
|
|
.num_resources = 2,
|
|
.resource = ixp46x_i2c_resources
|
|
};
|
|
|
|
static struct platform_device *ixp46x_devices[] __initdata = {
|
|
&ixp46x_hwrandom_device,
|
|
&ixp46x_i2c_controller,
|
|
};
|
|
|
|
unsigned long ixp4xx_exp_bus_size;
|
|
EXPORT_SYMBOL(ixp4xx_exp_bus_size);
|
|
|
|
static struct platform_device_info ixp_dev_info __initdata = {
|
|
.name = "ixp4xx_crypto",
|
|
.id = 0,
|
|
.dma_mask = DMA_BIT_MASK(32),
|
|
};
|
|
|
|
static int __init ixp_crypto_register(void)
|
|
{
|
|
struct platform_device *pdev;
|
|
|
|
if (!(~(*IXP4XX_EXP_CFG2) & (IXP4XX_FEATURE_HASH |
|
|
IXP4XX_FEATURE_AES | IXP4XX_FEATURE_DES))) {
|
|
printk(KERN_ERR "ixp_crypto: No HW crypto available\n");
|
|
return -ENODEV;
|
|
}
|
|
|
|
pdev = platform_device_register_full(&ixp_dev_info);
|
|
if (IS_ERR(pdev))
|
|
return PTR_ERR(pdev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
void __init ixp4xx_sys_init(void)
|
|
{
|
|
ixp4xx_exp_bus_size = SZ_16M;
|
|
|
|
platform_add_devices(ixp4xx_devices, ARRAY_SIZE(ixp4xx_devices));
|
|
|
|
if (IS_ENABLED(CONFIG_CRYPTO_DEV_IXP4XX))
|
|
ixp_crypto_register();
|
|
|
|
if (cpu_is_ixp46x()) {
|
|
int region;
|
|
|
|
platform_add_devices(ixp46x_devices,
|
|
ARRAY_SIZE(ixp46x_devices));
|
|
|
|
for (region = 0; region < 7; region++) {
|
|
if((*(IXP4XX_EXP_REG(0x4 * region)) & 0x200)) {
|
|
ixp4xx_exp_bus_size = SZ_32M;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
printk("IXP4xx: Using %luMiB expansion bus window size\n",
|
|
ixp4xx_exp_bus_size >> 20);
|
|
}
|
|
|
|
unsigned long ixp4xx_timer_freq = IXP4XX_TIMER_FREQ;
|
|
EXPORT_SYMBOL(ixp4xx_timer_freq);
|
|
|
|
void ixp4xx_restart(enum reboot_mode mode, const char *cmd)
|
|
{
|
|
if (mode == REBOOT_SOFT) {
|
|
/* Jump into ROM at address 0 */
|
|
soft_restart(0);
|
|
} else {
|
|
/* Use on-chip reset capability */
|
|
|
|
/* set the "key" register to enable access to
|
|
* "timer" and "enable" registers
|
|
*/
|
|
*IXP4XX_OSWK = IXP4XX_WDT_KEY;
|
|
|
|
/* write 0 to the timer register for an immediate reset */
|
|
*IXP4XX_OSWT = 0;
|
|
|
|
*IXP4XX_OSWE = IXP4XX_WDT_RESET_ENABLE | IXP4XX_WDT_COUNT_ENABLE;
|
|
}
|
|
}
|
|
|
|
#ifdef CONFIG_PCI
|
|
static int ixp4xx_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)
|
|
{
|
|
return (dma_addr + size) > SZ_64M;
|
|
}
|
|
|
|
static int ixp4xx_platform_notify_remove(struct device *dev)
|
|
{
|
|
if (dev_is_pci(dev))
|
|
dmabounce_unregister_dev(dev);
|
|
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* Setup DMA mask to 64MB on PCI devices and 4 GB on all other things.
|
|
*/
|
|
static int ixp4xx_platform_notify(struct device *dev)
|
|
{
|
|
dev->dma_mask = &dev->coherent_dma_mask;
|
|
|
|
#ifdef CONFIG_PCI
|
|
if (dev_is_pci(dev)) {
|
|
dev->coherent_dma_mask = DMA_BIT_MASK(28); /* 64 MB */
|
|
dmabounce_register_dev(dev, 2048, 4096, ixp4xx_needs_bounce);
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
dev->coherent_dma_mask = DMA_BIT_MASK(32);
|
|
return 0;
|
|
}
|
|
|
|
int dma_set_coherent_mask(struct device *dev, u64 mask)
|
|
{
|
|
if (dev_is_pci(dev))
|
|
mask &= DMA_BIT_MASK(28); /* 64 MB */
|
|
|
|
if ((mask & DMA_BIT_MASK(28)) == DMA_BIT_MASK(28)) {
|
|
dev->coherent_dma_mask = mask;
|
|
return 0;
|
|
}
|
|
|
|
return -EIO; /* device wanted sub-64MB mask */
|
|
}
|
|
EXPORT_SYMBOL(dma_set_coherent_mask);
|
|
|
|
#ifdef CONFIG_IXP4XX_INDIRECT_PCI
|
|
/*
|
|
* In the case of using indirect PCI, we simply return the actual PCI
|
|
* address and our read/write implementation use that to drive the
|
|
* access registers. If something outside of PCI is ioremap'd, we
|
|
* fallback to the default.
|
|
*/
|
|
|
|
static void __iomem *ixp4xx_ioremap_caller(phys_addr_t addr, size_t size,
|
|
unsigned int mtype, void *caller)
|
|
{
|
|
if (!is_pci_memory(addr))
|
|
return __arm_ioremap_caller(addr, size, mtype, caller);
|
|
|
|
return (void __iomem *)addr;
|
|
}
|
|
|
|
static void ixp4xx_iounmap(volatile void __iomem *addr)
|
|
{
|
|
if (!is_pci_memory((__force u32)addr))
|
|
__iounmap(addr);
|
|
}
|
|
#endif
|
|
|
|
void __init ixp4xx_init_early(void)
|
|
{
|
|
platform_notify = ixp4xx_platform_notify;
|
|
#ifdef CONFIG_PCI
|
|
platform_notify_remove = ixp4xx_platform_notify_remove;
|
|
#endif
|
|
#ifdef CONFIG_IXP4XX_INDIRECT_PCI
|
|
arch_ioremap_caller = ixp4xx_ioremap_caller;
|
|
arch_iounmap = ixp4xx_iounmap;
|
|
#endif
|
|
}
|