mirror of
https://github.com/torvalds/linux.git
synced 2024-12-12 14:12:51 +00:00
903a9f77d1
This branch is reducing in size for every release since most board-related
changes have started happening in devicetrees now. Still, we have some things
going on here.
* Renesas platforms are still adding a bit more legacy device support, something
that should trail off shortly as they move to full DT.
* We group most defconfig updates into this branch out of old habits
* Removal of legacy OMAP2 platforms over to DT continues, and a handful of old
code is being removed here.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJS4VhpAAoJEIwa5zzehBx3dgMP/2qc+pY4Sx13x5gWMyj29kQd
LF6JeGLbj3+F+brPh8nXg6feOcsqVN9lpQ7v4+u1tLv6XfYe5kzBTDwF9MFbZi4I
lV9o4cehcZWjCEx+JIbg1MvuNUCU2k1H7HmDIiOQIuoL9j58f2ZywlH/HmLuo2iZ
j5Aly006x0s1lUIDhw2w9PJZzzSRBfPr8hW8q+JdLZinlA5Nd4jSxDX0QoSZE+2t
2GJMb//Ej1KbLO7fcM6BImNtB0kz4xRkPvINJwh1xGHYKY0BzMCYS3K2zBgoeyut
/olOK2xpnSjzcp1ToVQSAa7Mr1zbiyxQTKkqRHMnKyD/BTMzgoSVHxCA7yGYsCjz
mc6AW4v1ucfvXrz0qPXd9fHCIYMyvn6PPv3DmRFU/tR3zJaakI2RvYZFaeyK3RIn
0NGwMQBe3gGIHFAK5Q9hrPyZtbtGicKHjd6eNrNIVeSyTi1njbviTFRHA5yMqWBL
eHRM5KxCnp7+6ES61J0YCSF121/V3GT1rJyJnABl3B2UYj/qKXUBAJ2aPqCspWOG
pcbI7fdeyV67YJvgrV5s8eO7HtPJs9KtOw7Fng4P4Kgjy2XLNfVhQRkaAwe4P914
HCtZfKCVe4xOWLFHDWApaRpfeOFXZgd0hLOG5jiAEhBRZbRALS044Ta9mAFKqQxx
v0mqo85bCHixiFWz1UVc
=wLdE
-----END PGP SIGNATURE-----
Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC board updates from Olof Johansson:
"This branch is reducing in size for every release since most
board-related changes have started happening in devicetrees now.
Still, we have some things going on here.
* Renesas platforms are still adding a bit more legacy device
support, something that should trail off shortly as they move to
full DT
* We group most defconfig updates into this branch out of old habits
* Removal of legacy OMAP2 platforms over to DT continues, and a
handful of old code is being removed here"
* tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
ARM: dts: OMAP2: fix interrupt number for rng
ARM: dts: Split omap3 pinmux core device
ARM: dts: Add omap specific pinctrl defines to use padconf addresses
ARM: bcm2835: bcm2835_defconfig updates
ARM: msm_defconfig: Enable restart driver
defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
ARM: msm: Add support for APQ8074 Dragonboard
ARM: exynos_defconfig: Enable S2MPS11 voltage regulator
ARM: tegra: Enable DRM panel support
ARM: shmobile: mackerel: Fix USBHS pinconf entry
ARM: shmobile: Let Koelsch multiplatform boot with Koelsch DTB
ARM: shmobile: Let Lager multiplatform boot with Lager DTB
ARM: shmobile: Remove non-multiplatform Koelsch reference support
ARM: shmobile: Remove non-multiplatform Lager reference support
ARM: shmobile: koelsch-reference: Instantiate clkdevs for SCIF and CMT
ARM: shmobile: lager-reference: Instantiate clkdevs for SCIF and CMT
ARM: shmobile: koelsch-reference: Remove duplicate CCF initialization
ARM: shmobile: lager-reference: Enable multiplaform kernel support
ARM: shmobile: armadillo: Set backlight enable GPIO
ARM: shmobile: Koelsch: add Ether support
...
Conflicts:
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
86 lines
2.1 KiB
C
86 lines
2.1 KiB
C
/*
|
|
* Bock-W board support
|
|
*
|
|
* Copyright (C) 2013 Renesas Solutions Corp.
|
|
* Copyright (C) 2013 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
|
|
*
|
|
* 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/of_platform.h>
|
|
#include <mach/common.h>
|
|
#include <mach/r8a7778.h>
|
|
#include <asm/mach/arch.h>
|
|
|
|
/*
|
|
* see board-bock.c for checking detail of dip-switch
|
|
*/
|
|
|
|
#define FPGA 0x18200000
|
|
#define IRQ0MR 0x30
|
|
#define COMCTLR 0x101c
|
|
|
|
#define PFC 0xfffc0000
|
|
#define PUPR4 0x110
|
|
static void __init bockw_init(void)
|
|
{
|
|
void __iomem *fpga;
|
|
void __iomem *pfc;
|
|
|
|
r8a7778_clock_init();
|
|
r8a7778_init_irq_extpin_dt(1);
|
|
r8a7778_add_dt_devices();
|
|
|
|
fpga = ioremap_nocache(FPGA, SZ_1M);
|
|
if (fpga) {
|
|
/*
|
|
* CAUTION
|
|
*
|
|
* IRQ0/1 is cascaded interrupt from FPGA.
|
|
* it should be cared in the future
|
|
* Now, it is assuming IRQ0 was used only from SMSC.
|
|
*/
|
|
u16 val = ioread16(fpga + IRQ0MR);
|
|
val &= ~(1 << 4); /* enable SMSC911x */
|
|
iowrite16(val, fpga + IRQ0MR);
|
|
|
|
iounmap(fpga);
|
|
}
|
|
|
|
pfc = ioremap_nocache(PFC, 0x200);
|
|
if (pfc) {
|
|
/*
|
|
* FIXME
|
|
*
|
|
* SDHI CD/WP pin needs pull-up
|
|
*/
|
|
iowrite32(ioread32(pfc + PUPR4) | (3 << 26), pfc + PUPR4);
|
|
iounmap(pfc);
|
|
}
|
|
|
|
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
|
}
|
|
|
|
static const char *bockw_boards_compat_dt[] __initdata = {
|
|
"renesas,bockw-reference",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(BOCKW_DT, "bockw")
|
|
.init_early = r8a7778_init_delay,
|
|
.init_irq = r8a7778_init_irq_dt,
|
|
.init_machine = bockw_init,
|
|
.dt_compat = bockw_boards_compat_dt,
|
|
MACHINE_END
|