![Linus Torvalds](/assets/img/avatar_default.png)
Unlike the board branch, this keeps having large sets of changes for every release, but that's quite expected and is so far working well. Most of this is plumbing for various device bindings and new platforms, but there's also a bit of cleanup and code removal for things that are moved from platform code to DT contents (some OMAP clock code in particular). There's also a pinctrl driver for tegra here (appropriately acked), that's introduced this way to make it more bisectable. I'm happy to say that there were no conflicts at all with this branch this release, which means that changes are flowing through our tree as expected instead of merged through driver maintainers (or at least not done with conflicts). There are several new boards added, and a couple of SoCs. In no particular order: * Rockchip RK3288 SoC support, including DTS for a dev board that they have seeded with some community developers. * Better support for Hardkernel Exynos4-based ODROID boards. * CCF conversions (and dtsi contents) for several Renesas platforms. * Gumstix Pepper (TI AM335x) board support * TI eval board support for AM437x * Allwinner A23 SoC, very similar to existing ones which mostly has resulted in DT changes for support. Also includes support for an Ippo tablet with the chipset. * Allwinner A31 Hummingbird board support, not to be confused with the SolidRun i.MX-based Hummingboard. * Tegra30 Apalis board support -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJT5DqvAAoJEIwa5zzehBx3tm0QAJk8zFyZuMhUPz6SoZTtO9ti zojZ2218oqLRDfLSYdJx/3QE7gb2ef0e2S6FrthecdAY8sqZzDddL7M/cCf1WSgy +D4dD1UEq+W/hOeEwIWyo3GR/71exgo/LMTIw8HOJh5c9fanQ2wNChNetCgh8b4u sVOEMmP1UTO2W7mH9cCRhWXFifBNi0yNl1QBYnLPzM2CbSEa4qQRarTn/94NSEiY U9XgzysklvYEW/30wcEkz8ZonKbJrtP+zEjODU4wN/muhHECeTehDrkJq0WEK/3C 3ptko2xQGURNaLM6HVvQS9qkXxyhCeZxqkELpjkjjM+YPFN8wdHu7gDctGZlDr39 LQ2pZF6K8vaFvxp3UM2wzdDeoNi3rxguzpFoBmfRP5NWguDrOvjT3w8W4hO9q04J 8SqMGca0av9myHmeSjtRRg5rmcC3kBbOgSN6siVJ8W80rHT7tnFjl6eCawDreQzn szFzGaOOUnf/kJ/00vzm1dCuluowFPdSYgW3aamZhfkqu2qYJ8Ztuooz5eZGKtex zlUfKtpL26gnamoUT42K7E8J968AjHjUc/zimwYzIgHCzTTApYGJQcbD/Y28b8QH gTvhRxP+0kFb+NNq4IHStVMvJrFOPvzOHXcL8x07HqTxrl7W4XoW+KJxCJOk433W 5NJ9s4tEmiTRMtFL1kv6 =xxlY -----END PGP SIGNATURE----- Merge tag 'dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC device-tree changes from Olof Johansson: "Unlike the board branch, this keeps having large sets of changes for every release, but that's quite expected and is so far working well. Most of this is plumbing for various device bindings and new platforms, but there's also a bit of cleanup and code removal for things that are moved from platform code to DT contents (some OMAP clock code in particular). There's also a pinctrl driver for tegra here (appropriately acked), that's introduced this way to make it more bisectable. I'm happy to say that there were no conflicts at all with this branch this release, which means that changes are flowing through our tree as expected instead of merged through driver maintainers (or at least not done with conflicts). There are several new boards added, and a couple of SoCs. In no particular order: - Rockchip RK3288 SoC support, including DTS for a dev board that they have seeded with some community developers. - Better support for Hardkernel Exynos4-based ODROID boards. - CCF conversions (and dtsi contents) for several Renesas platforms. - Gumstix Pepper (TI AM335x) board support - TI eval board support for AM437x - Allwinner A23 SoC, very similar to existing ones which mostly has resulted in DT changes for support. Also includes support for an Ippo tablet with the chipset. - Allwinner A31 Hummingbird board support, not to be confused with the SolidRun i.MX-based Hummingboard. - Tegra30 Apalis board support" * tag 'dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (334 commits) ARM: dts: Enable USB host0 (EHCI) on rk3288-evb ARM: dts: add rk3288 ehci usb devices ARM: dts: Turn on USB host vbus on rk3288-evb ARM: tegra: apalis t30: fix device tree compatible node ARM: tegra: paz00: Fix some indentation inconsistencies ARM: zynq: DT: Clarify Xilinx Zynq platform ARM: dts: rockchip: add watchdog node ARM: dts: rockchip: remove pinctrl setting from radxarock uart2 ARM: dts: Add missing pinctrl for uart0/1 for exynos3250 ARM: dts: Remove duplicate 'interrput-parent' property for exynos3250 ARM: dts: Add TMU dt node to monitor the temperature for exynos3250 ARM: dts: Specify MAX77686 pmic interrupt for exynos5250-smdk5250 ARM: dts: cypress,cyapa trackpad is exynos5250-Snow only ARM: dts: max77686 is exynos5250-snow only ARM: zynq: DT: Remove DMA from board DTs ARM: zynq: DT: Add CAN node ARM: EXYNOS: Add exynos5260 PMU compatible string to DT match table ARM: dts: Add PMU DT node for exynos5260 SoC ARM: EXYNOS: Add support for Exynos5410 PMU ARM: dts: Add PMU to exynos5410 ...
317 lines
9.5 KiB
C
317 lines
9.5 KiB
C
/*
|
|
* r8a73a4 processor support
|
|
*
|
|
* Copyright (C) 2013 Renesas Solutions Corp.
|
|
* Copyright (C) 2013 Magnus Damm
|
|
*
|
|
* 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; version 2 of the License.
|
|
*
|
|
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
#include <linux/irq.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/platform_data/irq-renesas-irqc.h>
|
|
#include <linux/serial_sci.h>
|
|
#include <linux/sh_dma.h>
|
|
#include <linux/sh_timer.h>
|
|
|
|
#include <asm/mach/arch.h>
|
|
|
|
#include "common.h"
|
|
#include "dma-register.h"
|
|
#include "irqs.h"
|
|
#include "r8a73a4.h"
|
|
|
|
static const struct resource pfc_resources[] = {
|
|
DEFINE_RES_MEM(0xe6050000, 0x9000),
|
|
};
|
|
|
|
void __init r8a73a4_pinmux_init(void)
|
|
{
|
|
platform_device_register_simple("pfc-r8a73a4", -1, pfc_resources,
|
|
ARRAY_SIZE(pfc_resources));
|
|
}
|
|
|
|
#define R8A73A4_SCIF(scif_type, _scscr, index, baseaddr, irq) \
|
|
static struct plat_sci_port scif##index##_platform_data = { \
|
|
.type = scif_type, \
|
|
.flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP, \
|
|
.scscr = _scscr, \
|
|
}; \
|
|
\
|
|
static struct resource scif##index##_resources[] = { \
|
|
DEFINE_RES_MEM(baseaddr, 0x100), \
|
|
DEFINE_RES_IRQ(irq), \
|
|
}
|
|
|
|
#define R8A73A4_SCIFA(index, baseaddr, irq) \
|
|
R8A73A4_SCIF(PORT_SCIFA, SCSCR_RE | SCSCR_TE | SCSCR_CKE0, \
|
|
index, baseaddr, irq)
|
|
|
|
#define R8A73A4_SCIFB(index, baseaddr, irq) \
|
|
R8A73A4_SCIF(PORT_SCIFB, SCSCR_RE | SCSCR_TE, \
|
|
index, baseaddr, irq)
|
|
|
|
R8A73A4_SCIFA(0, 0xe6c40000, gic_spi(144)); /* SCIFA0 */
|
|
R8A73A4_SCIFA(1, 0xe6c50000, gic_spi(145)); /* SCIFA1 */
|
|
R8A73A4_SCIFB(2, 0xe6c20000, gic_spi(148)); /* SCIFB0 */
|
|
R8A73A4_SCIFB(3, 0xe6c30000, gic_spi(149)); /* SCIFB1 */
|
|
R8A73A4_SCIFB(4, 0xe6ce0000, gic_spi(150)); /* SCIFB2 */
|
|
R8A73A4_SCIFB(5, 0xe6cf0000, gic_spi(151)); /* SCIFB3 */
|
|
|
|
#define r8a73a4_register_scif(index) \
|
|
platform_device_register_resndata(NULL, "sh-sci", index, \
|
|
scif##index##_resources, \
|
|
ARRAY_SIZE(scif##index##_resources), \
|
|
&scif##index##_platform_data, \
|
|
sizeof(scif##index##_platform_data))
|
|
|
|
static const struct renesas_irqc_config irqc0_data = {
|
|
.irq_base = irq_pin(0), /* IRQ0 -> IRQ31 */
|
|
};
|
|
|
|
static const struct resource irqc0_resources[] = {
|
|
DEFINE_RES_MEM(0xe61c0000, 0x200), /* IRQC Event Detector Block_0 */
|
|
DEFINE_RES_IRQ(gic_spi(0)), /* IRQ0 */
|
|
DEFINE_RES_IRQ(gic_spi(1)), /* IRQ1 */
|
|
DEFINE_RES_IRQ(gic_spi(2)), /* IRQ2 */
|
|
DEFINE_RES_IRQ(gic_spi(3)), /* IRQ3 */
|
|
DEFINE_RES_IRQ(gic_spi(4)), /* IRQ4 */
|
|
DEFINE_RES_IRQ(gic_spi(5)), /* IRQ5 */
|
|
DEFINE_RES_IRQ(gic_spi(6)), /* IRQ6 */
|
|
DEFINE_RES_IRQ(gic_spi(7)), /* IRQ7 */
|
|
DEFINE_RES_IRQ(gic_spi(8)), /* IRQ8 */
|
|
DEFINE_RES_IRQ(gic_spi(9)), /* IRQ9 */
|
|
DEFINE_RES_IRQ(gic_spi(10)), /* IRQ10 */
|
|
DEFINE_RES_IRQ(gic_spi(11)), /* IRQ11 */
|
|
DEFINE_RES_IRQ(gic_spi(12)), /* IRQ12 */
|
|
DEFINE_RES_IRQ(gic_spi(13)), /* IRQ13 */
|
|
DEFINE_RES_IRQ(gic_spi(14)), /* IRQ14 */
|
|
DEFINE_RES_IRQ(gic_spi(15)), /* IRQ15 */
|
|
DEFINE_RES_IRQ(gic_spi(16)), /* IRQ16 */
|
|
DEFINE_RES_IRQ(gic_spi(17)), /* IRQ17 */
|
|
DEFINE_RES_IRQ(gic_spi(18)), /* IRQ18 */
|
|
DEFINE_RES_IRQ(gic_spi(19)), /* IRQ19 */
|
|
DEFINE_RES_IRQ(gic_spi(20)), /* IRQ20 */
|
|
DEFINE_RES_IRQ(gic_spi(21)), /* IRQ21 */
|
|
DEFINE_RES_IRQ(gic_spi(22)), /* IRQ22 */
|
|
DEFINE_RES_IRQ(gic_spi(23)), /* IRQ23 */
|
|
DEFINE_RES_IRQ(gic_spi(24)), /* IRQ24 */
|
|
DEFINE_RES_IRQ(gic_spi(25)), /* IRQ25 */
|
|
DEFINE_RES_IRQ(gic_spi(26)), /* IRQ26 */
|
|
DEFINE_RES_IRQ(gic_spi(27)), /* IRQ27 */
|
|
DEFINE_RES_IRQ(gic_spi(28)), /* IRQ28 */
|
|
DEFINE_RES_IRQ(gic_spi(29)), /* IRQ29 */
|
|
DEFINE_RES_IRQ(gic_spi(30)), /* IRQ30 */
|
|
DEFINE_RES_IRQ(gic_spi(31)), /* IRQ31 */
|
|
};
|
|
|
|
static const struct renesas_irqc_config irqc1_data = {
|
|
.irq_base = irq_pin(32), /* IRQ32 -> IRQ57 */
|
|
};
|
|
|
|
static const struct resource irqc1_resources[] = {
|
|
DEFINE_RES_MEM(0xe61c0200, 0x200), /* IRQC Event Detector Block_1 */
|
|
DEFINE_RES_IRQ(gic_spi(32)), /* IRQ32 */
|
|
DEFINE_RES_IRQ(gic_spi(33)), /* IRQ33 */
|
|
DEFINE_RES_IRQ(gic_spi(34)), /* IRQ34 */
|
|
DEFINE_RES_IRQ(gic_spi(35)), /* IRQ35 */
|
|
DEFINE_RES_IRQ(gic_spi(36)), /* IRQ36 */
|
|
DEFINE_RES_IRQ(gic_spi(37)), /* IRQ37 */
|
|
DEFINE_RES_IRQ(gic_spi(38)), /* IRQ38 */
|
|
DEFINE_RES_IRQ(gic_spi(39)), /* IRQ39 */
|
|
DEFINE_RES_IRQ(gic_spi(40)), /* IRQ40 */
|
|
DEFINE_RES_IRQ(gic_spi(41)), /* IRQ41 */
|
|
DEFINE_RES_IRQ(gic_spi(42)), /* IRQ42 */
|
|
DEFINE_RES_IRQ(gic_spi(43)), /* IRQ43 */
|
|
DEFINE_RES_IRQ(gic_spi(44)), /* IRQ44 */
|
|
DEFINE_RES_IRQ(gic_spi(45)), /* IRQ45 */
|
|
DEFINE_RES_IRQ(gic_spi(46)), /* IRQ46 */
|
|
DEFINE_RES_IRQ(gic_spi(47)), /* IRQ47 */
|
|
DEFINE_RES_IRQ(gic_spi(48)), /* IRQ48 */
|
|
DEFINE_RES_IRQ(gic_spi(49)), /* IRQ49 */
|
|
DEFINE_RES_IRQ(gic_spi(50)), /* IRQ50 */
|
|
DEFINE_RES_IRQ(gic_spi(51)), /* IRQ51 */
|
|
DEFINE_RES_IRQ(gic_spi(52)), /* IRQ52 */
|
|
DEFINE_RES_IRQ(gic_spi(53)), /* IRQ53 */
|
|
DEFINE_RES_IRQ(gic_spi(54)), /* IRQ54 */
|
|
DEFINE_RES_IRQ(gic_spi(55)), /* IRQ55 */
|
|
DEFINE_RES_IRQ(gic_spi(56)), /* IRQ56 */
|
|
DEFINE_RES_IRQ(gic_spi(57)), /* IRQ57 */
|
|
};
|
|
|
|
#define r8a73a4_register_irqc(idx) \
|
|
platform_device_register_resndata(NULL, "renesas_irqc", \
|
|
idx, irqc##idx##_resources, \
|
|
ARRAY_SIZE(irqc##idx##_resources), \
|
|
&irqc##idx##_data, \
|
|
sizeof(struct renesas_irqc_config))
|
|
|
|
/* Thermal0 -> Thermal2 */
|
|
static const struct resource thermal0_resources[] = {
|
|
DEFINE_RES_MEM(0xe61f0000, 0x14),
|
|
DEFINE_RES_MEM(0xe61f0100, 0x38),
|
|
DEFINE_RES_MEM(0xe61f0200, 0x38),
|
|
DEFINE_RES_MEM(0xe61f0300, 0x38),
|
|
DEFINE_RES_IRQ(gic_spi(69)),
|
|
};
|
|
|
|
#define r8a73a4_register_thermal() \
|
|
platform_device_register_simple("rcar_thermal", -1, \
|
|
thermal0_resources, \
|
|
ARRAY_SIZE(thermal0_resources))
|
|
|
|
static struct sh_timer_config cmt1_platform_data = {
|
|
.channels_mask = 0xff,
|
|
};
|
|
|
|
static struct resource cmt1_resources[] = {
|
|
DEFINE_RES_MEM(0xe6130000, 0x1004),
|
|
DEFINE_RES_IRQ(gic_spi(120)),
|
|
};
|
|
|
|
#define r8a7790_register_cmt(idx) \
|
|
platform_device_register_resndata(NULL, "sh-cmt-48-gen2", \
|
|
idx, cmt##idx##_resources, \
|
|
ARRAY_SIZE(cmt##idx##_resources), \
|
|
&cmt##idx##_platform_data, \
|
|
sizeof(struct sh_timer_config))
|
|
|
|
void __init r8a73a4_add_dt_devices(void)
|
|
{
|
|
r8a7790_register_cmt(1);
|
|
}
|
|
|
|
/* DMA */
|
|
static const struct sh_dmae_slave_config dma_slaves[] = {
|
|
{
|
|
.slave_id = SHDMA_SLAVE_MMCIF0_TX,
|
|
.addr = 0xee200034,
|
|
.chcr = CHCR_TX(XMIT_SZ_32BIT),
|
|
.mid_rid = 0xd1,
|
|
}, {
|
|
.slave_id = SHDMA_SLAVE_MMCIF0_RX,
|
|
.addr = 0xee200034,
|
|
.chcr = CHCR_RX(XMIT_SZ_32BIT),
|
|
.mid_rid = 0xd2,
|
|
}, {
|
|
.slave_id = SHDMA_SLAVE_MMCIF1_TX,
|
|
.addr = 0xee220034,
|
|
.chcr = CHCR_TX(XMIT_SZ_32BIT),
|
|
.mid_rid = 0xe1,
|
|
}, {
|
|
.slave_id = SHDMA_SLAVE_MMCIF1_RX,
|
|
.addr = 0xee220034,
|
|
.chcr = CHCR_RX(XMIT_SZ_32BIT),
|
|
.mid_rid = 0xe2,
|
|
},
|
|
};
|
|
|
|
#define DMAE_CHANNEL(a, b) \
|
|
{ \
|
|
.offset = (a) - 0x20, \
|
|
.dmars = (a) - 0x20 + 0x40, \
|
|
.chclr_bit = (b), \
|
|
.chclr_offset = 0x80 - 0x20, \
|
|
}
|
|
|
|
static const struct sh_dmae_channel dma_channels[] = {
|
|
DMAE_CHANNEL(0x8000, 0),
|
|
DMAE_CHANNEL(0x8080, 1),
|
|
DMAE_CHANNEL(0x8100, 2),
|
|
DMAE_CHANNEL(0x8180, 3),
|
|
DMAE_CHANNEL(0x8200, 4),
|
|
DMAE_CHANNEL(0x8280, 5),
|
|
DMAE_CHANNEL(0x8300, 6),
|
|
DMAE_CHANNEL(0x8380, 7),
|
|
DMAE_CHANNEL(0x8400, 8),
|
|
DMAE_CHANNEL(0x8480, 9),
|
|
DMAE_CHANNEL(0x8500, 10),
|
|
DMAE_CHANNEL(0x8580, 11),
|
|
DMAE_CHANNEL(0x8600, 12),
|
|
DMAE_CHANNEL(0x8680, 13),
|
|
DMAE_CHANNEL(0x8700, 14),
|
|
DMAE_CHANNEL(0x8780, 15),
|
|
DMAE_CHANNEL(0x8800, 16),
|
|
DMAE_CHANNEL(0x8880, 17),
|
|
DMAE_CHANNEL(0x8900, 18),
|
|
DMAE_CHANNEL(0x8980, 19),
|
|
};
|
|
|
|
static const struct sh_dmae_pdata dma_pdata = {
|
|
.slave = dma_slaves,
|
|
.slave_num = ARRAY_SIZE(dma_slaves),
|
|
.channel = dma_channels,
|
|
.channel_num = ARRAY_SIZE(dma_channels),
|
|
.ts_low_shift = TS_LOW_SHIFT,
|
|
.ts_low_mask = TS_LOW_BIT << TS_LOW_SHIFT,
|
|
.ts_high_shift = TS_HI_SHIFT,
|
|
.ts_high_mask = TS_HI_BIT << TS_HI_SHIFT,
|
|
.ts_shift = dma_ts_shift,
|
|
.ts_shift_num = ARRAY_SIZE(dma_ts_shift),
|
|
.dmaor_init = DMAOR_DME,
|
|
.chclr_present = 1,
|
|
.chclr_bitwise = 1,
|
|
};
|
|
|
|
static struct resource dma_resources[] = {
|
|
DEFINE_RES_MEM(0xe6700020, 0x89e0),
|
|
DEFINE_RES_IRQ(gic_spi(220)),
|
|
{
|
|
/* IRQ for channels 0-19 */
|
|
.start = gic_spi(200),
|
|
.end = gic_spi(219),
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
#define r8a73a4_register_dmac() \
|
|
platform_device_register_resndata(NULL, "sh-dma-engine", 0, \
|
|
dma_resources, ARRAY_SIZE(dma_resources), \
|
|
&dma_pdata, sizeof(dma_pdata))
|
|
|
|
void __init r8a73a4_add_standard_devices(void)
|
|
{
|
|
r8a73a4_add_dt_devices();
|
|
r8a73a4_register_scif(0);
|
|
r8a73a4_register_scif(1);
|
|
r8a73a4_register_scif(2);
|
|
r8a73a4_register_scif(3);
|
|
r8a73a4_register_scif(4);
|
|
r8a73a4_register_scif(5);
|
|
r8a73a4_register_irqc(0);
|
|
r8a73a4_register_irqc(1);
|
|
r8a73a4_register_thermal();
|
|
r8a73a4_register_dmac();
|
|
}
|
|
|
|
void __init r8a73a4_init_early(void)
|
|
{
|
|
#ifndef CONFIG_ARM_ARCH_TIMER
|
|
shmobile_setup_delay(1500, 2, 4); /* Cortex-A15 @ 1500MHz */
|
|
#endif
|
|
}
|
|
|
|
#ifdef CONFIG_USE_OF
|
|
|
|
static const char *r8a73a4_boards_compat_dt[] __initdata = {
|
|
"renesas,r8a73a4",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")
|
|
.init_early = r8a73a4_init_early,
|
|
.dt_compat = r8a73a4_boards_compat_dt,
|
|
MACHINE_END
|
|
#endif /* CONFIG_USE_OF */
|