mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 23:24:50 +00:00
825f4e0271
A quite large set of SoC updates this cycle. In no particular order:
- Multi-cluster power management for Samsung Exynos, adding support for
big.LITTLE CPU switching on EXYNOS5
- SMP support for Marvell Armada 375 and 38x
- SMP rework on Allwinner A31
- Xilinx Zynq support for SOC_BUS, big endian
- Marvell orion5x platform cleanup, modernizing the implementation and
moving to DT.
- _Finally_ moving Samsung Exynos over to support MULTIPLATFORM, so
that their platform can be enabled in the same kernel binary as most
of the other v7 platforms in the tree. \o/ The work isn't quite complete,
there's some driver fixes still needed, but the basics now work.
New SoC support added:
- Freescale i.MX6SX
- LSI Axxia AXM55xx SoCs
- Samsung EXYNOS 3250, 5260, 5410, 5420 and 5800
- STi STIH407
Plus a large set of various smaller updates for different platforms. I'm
probably missing some important one here.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)
iQIcBAABAgAGBQJTjOKWAAoJEIwa5zzehBx36aEP/2vTD7x9FC59FACNHJ8iO7aw
0ebTgBBjI1Np6X18O+M7URbxV5TaBgwpUm/NDN86p03MpQ2eOXr8r47qVxe/HhZs
AdlTvzgE6QwxcVL/HeCKKUEN3BPH74+TZgFl9I5aSzNjpR39xETeK1aWP/ZiAl/q
/lGRZAQ59+c7Ung00Hg0g2YDxH9WFpK50Nj90ROnyjKSFkhIYngXYVpZB3maOypq
Pgib/U8IraKZ52oGJw3yinSoORr7FdcUdAGWGTz/lQdNL/jYDfQ6GkRW2oblWXdt
3Xvj9UW6NmkbMICucMvFuuW1nXAgutZuTp9w7mBxsiUlYepxPv/DXM6yiI1WGlEb
BeVOmOreNeN2nT6avv/uUhk3Osq63Jn9x8cz5y+7/lgWQwllh3/c+G01RotvgJEQ
vpQq5ps9fMxIAMaNP6N/YqMJI1IOrBj0iXxaZEDw3VYM/k4lSvtb3VXP9c/rqApu
U4i6hpSIGzrraU4NrjndYPndcLeNOVZbByETQKosZXuCo6G1sb7FstNSkzI9vSo8
O/pujIVUfYyBW82GzZGDw+aa7DWA29FPeUQ3p+sj5MSCg051xXT8h6QwqMo2K/zY
5ATs/qo6w7zH/Ou9rtHTRynCIb0GQJThDSlWtuXFedUF9quEltS+TDz/2o+dWtGJ
yBFGKDRuBB20D36w9xqg
=6LYI
-----END PGP SIGNATURE-----
Merge tag 'soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next
Pull part one of ARM SoC updates from Olof Johansson:
"A quite large set of SoC updates this cycle. In no particular order:
- Multi-cluster power management for Samsung Exynos, adding support
for big.LITTLE CPU switching on EXYNOS5
- SMP support for Marvell Armada 375 and 38x
- SMP rework on Allwinner A31
- Xilinx Zynq support for SOC_BUS, big endian
- Marvell orion5x platform cleanup, modernizing the implementation
and moving to DT.
- _Finally_ moving Samsung Exynos over to support MULTIPLATFORM, so
that their platform can be enabled in the same kernel binary as
most of the other v7 platforms in the tree. \o/
The work isn't quite complete, there's some driver fixes still
needed, but the basics now work.
New SoC support added:
- Freescale i.MX6SX
- LSI Axxia AXM55xx SoCs
- Samsung EXYNOS 3250, 5260, 5410, 5420 and 5800
- STi STIH407
plus a large set of various smaller updates for different platforms.
I'm probably missing some important one here"
* tag 'soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (281 commits)
ARM: exynos: don't run exynos4 l2x0 setup on other platforms
ARM: exynos: Fix "allmodconfig" build errors in mcpm and hotplug
ARM: EXYNOS: mcpm rename the power_down_finish
ARM: EXYNOS: Enable mcpm for dual-cluster exynos5800 SoC
ARM: EXYNOS: Enable multi-platform build support
ARM: EXYNOS: Consolidate Kconfig entries
ARM: EXYNOS: Add support for EXYNOS5410 SoC
ARM: EXYNOS: Support secondary CPU boot of Exynos3250
ARM: EXYNOS: Add Exynos3250 SoC ID
ARM: EXYNOS: Add 5800 SoC support
ARM: EXYNOS: initial board support for exynos5260 SoC
clk: exynos5410: register clocks using common clock framework
ARM: debug: qcom: add UART addresses to Kconfig help for APQ8084
ARM: sunxi: allow building without reset controller
Documentation: devicetree: arm: sort enable-method entries
ARM: rockchip: convert smp bringup to CPU_METHOD_OF_DECLARE
clk: exynos5250: Add missing sysmmu clocks for DISP and ISP blocks
ARM: dts: axxia: Add reset controller
power: reset: Add Axxia system reset driver
ARM: axxia: Adding defconfig for AXM55xx
...
87 lines
2.7 KiB
C
87 lines
2.7 KiB
C
#ifndef __ARCH_ORION5X_COMMON_H
|
|
#define __ARCH_ORION5X_COMMON_H
|
|
|
|
#include <linux/reboot.h>
|
|
|
|
struct dsa_platform_data;
|
|
struct mv643xx_eth_platform_data;
|
|
struct mv_sata_platform_data;
|
|
|
|
#define ORION_MBUS_PCIE_MEM_TARGET 0x04
|
|
#define ORION_MBUS_PCIE_MEM_ATTR 0x59
|
|
#define ORION_MBUS_PCIE_IO_TARGET 0x04
|
|
#define ORION_MBUS_PCIE_IO_ATTR 0x51
|
|
#define ORION_MBUS_PCIE_WA_TARGET 0x04
|
|
#define ORION_MBUS_PCIE_WA_ATTR 0x79
|
|
#define ORION_MBUS_PCI_MEM_TARGET 0x03
|
|
#define ORION_MBUS_PCI_MEM_ATTR 0x59
|
|
#define ORION_MBUS_PCI_IO_TARGET 0x03
|
|
#define ORION_MBUS_PCI_IO_ATTR 0x51
|
|
#define ORION_MBUS_DEVBUS_BOOT_TARGET 0x01
|
|
#define ORION_MBUS_DEVBUS_BOOT_ATTR 0x0f
|
|
#define ORION_MBUS_DEVBUS_TARGET(cs) 0x01
|
|
#define ORION_MBUS_DEVBUS_ATTR(cs) (~(1 << cs))
|
|
#define ORION_MBUS_SRAM_TARGET 0x09
|
|
#define ORION_MBUS_SRAM_ATTR 0x00
|
|
|
|
/*
|
|
* Basic Orion init functions used early by machine-setup.
|
|
*/
|
|
void orion5x_map_io(void);
|
|
void orion5x_init_early(void);
|
|
void orion5x_init_irq(void);
|
|
void orion5x_init(void);
|
|
void orion5x_id(u32 *dev, u32 *rev, char **dev_name);
|
|
void clk_init(void);
|
|
extern int orion5x_tclk;
|
|
extern void orion5x_timer_init(void);
|
|
|
|
void orion5x_setup_wins(void);
|
|
|
|
void orion5x_ehci0_init(void);
|
|
void orion5x_ehci1_init(void);
|
|
void orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data);
|
|
void orion5x_eth_switch_init(struct dsa_platform_data *d, int irq);
|
|
void orion5x_i2c_init(void);
|
|
void orion5x_sata_init(struct mv_sata_platform_data *sata_data);
|
|
void orion5x_spi_init(void);
|
|
void orion5x_uart0_init(void);
|
|
void orion5x_uart1_init(void);
|
|
void orion5x_xor_init(void);
|
|
void orion5x_restart(enum reboot_mode, const char *);
|
|
|
|
/*
|
|
* PCIe/PCI functions.
|
|
*/
|
|
struct pci_bus;
|
|
struct pci_sys_data;
|
|
struct pci_dev;
|
|
|
|
void orion5x_pcie_id(u32 *dev, u32 *rev);
|
|
void orion5x_pci_disable(void);
|
|
void orion5x_pci_set_cardbus_mode(void);
|
|
int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys);
|
|
struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys);
|
|
int orion5x_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin);
|
|
|
|
struct meminfo;
|
|
struct tag;
|
|
extern void __init tag_fixup_mem32(struct tag *, char **, struct meminfo *);
|
|
|
|
#ifdef CONFIG_MACH_MSS2_DT
|
|
extern void mss2_init(void);
|
|
#else
|
|
static inline void mss2_init(void) {}
|
|
#endif
|
|
|
|
/*****************************************************************************
|
|
* Helpers to access Orion registers
|
|
****************************************************************************/
|
|
/*
|
|
* These are not preempt-safe. Locks, if needed, must be taken
|
|
* care of by the caller.
|
|
*/
|
|
#define orion5x_setbits(r, mask) writel(readl(r) | (mask), (r))
|
|
#define orion5x_clrbits(r, mask) writel(readl(r) & ~(mask), (r))
|
|
|
|
#endif
|