forked from Minki/linux
fa91515cbf
Lots of cleanup and refactoring and some SMP additions for Renesas platforms. Due to some inter-dependencies with other arm-soc branches, this Renesas stuff was separated out for sending after the other branches were merged. Highlights: - remove unused board support and cleanup of unused headers - refactoring of init and device registration - simplify IRQ initialization Conflicts: Too many. Most of these are because Simon chose to send some board updates through the V4L tree that ends up colliding with the main platform changes. We'll work with him on sorting out his workflow: - arch/arm/boot/dts/r8a7740.dtsi: - Add/add conflict in a devicetree file (keep both) - arch/arm/mach-shmobile/Makefile: - Splitting out of clock files collides with intc move to DT. Keep HEAD version but remove intc-* files for R8A7740 and R8A7779. - arch/arm/mach-shmobile/board-bockw.c: - Keep HEAD but remove i2c, hspi and mmc device init calls - arch/arm/mach-shmobile/board-marzen.c - Remove mach/hardware.h include and r8a7779_add_usb_phy_device() call, everything else stays. - arch/arm/mach-shmobile/include/mach/r8a7778.h: - From HEAD, Keep camera-rcar.h include and r8a7778_add_vin_device() - From branch, keep everything - arch/arm/mach-shmobile/include/mach/r8a7779.h: - From HEAD, Keep only camera-rcar.h include and r8a7779_add_vin_device() - arch/arm/mach-shmobile/setup-r8a7778.c - Keep HEAD, but drop the MMC section (struct resource + add_mmc_device()) - take the new function name from our side (r8a7778_add_dt_devices()) - arch/arm/mach-shmobile/setup-r8a7779.c - Keep HEAD, but drop r8a7779_add_usb_phy_device() I've also pushed a test-merge2 branch where you can see how I resolved them. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJSLkaWAAoJEFk3GJrT+8Zl5l8P/3oJ83VJHcjD2fMpAb8Dz5b6 pdRLxFLJrLxN+WTC1LylPom3EsSAJuuaG3Z8Cr9Xa6yoWuUYLy/A6MwsyLXBOGLC 3tVWa96xt1cHhd3p/NAOQwvRz/CFdMLM7MStd0mgSihj/pq3jtc2V697+dRtmJih J0mIc8+jnig+uwVl1DMCmBqdEmasccaDZeX30PcjaPL9ZDyZBeSXI8brdDx8A21e 5RiAsqn9HCxrLZjedL9TWA23BJ7NccsI3aVGpQVtCa9N/MHKp8gZft3v8FrWzFjk cOeaZY55Xq8hbbbmkF1LoezLrlQDF5aJcj6tl85lyuSJfR5d5BXmLswI7bglw8Qy ZU7/aF28pbhUT3oozNuRx5yl8oqpxmUoCwfP5hfnFf590OJ3noIELbOoIZQkJQUy LsCf3GMUQaWzrvs0IenM1lMJmw5zfDXbrUWUti95OAd5bbTdBE30z7EouejoKRVh 1/Wg4keBdtem4CpU+C4fUVtLL4XJhe/uadbjKteA7DRpTRMvrLYNutQgyOAuQjRM RiLvDPnsIZEGV+YMsj+IemN0hanae4kR3v8At+HwvVK1hROWEQWyL6cGxXH9n9jB VToxoYoyiAOk01X2BnPVMVTXEl5XMAVgZ1IgZNhnhaIUxi3HKrUfNG4oXE5Jx8Lw XruUAUKHknTUJ2Q/3y4D =Fagt -----END PGP SIGNATURE----- Merge tag 'renesas-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM Renesas SoC cleanup, refactoring and more SMP support from Kevin Hilman: "Lots of cleanup and refactoring and some SMP additions for Renesas platforms. Due to some inter-dependencies with other arm-soc branches, this Renesas stuff was separated out for sending after the other branches were merged. Highlights: - remove unused board support and cleanup of unused headers - refactoring of init and device registration - simplify IRQ initialization" * tag 'renesas-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (68 commits) ARM: shmobile: Per-CPU SMP boot / sleep code for SCU SoCs ARM: shmobile: Introduce per-CPU SMP boot / sleep code ARM: shmobile: Use shared SCU CPU Hotplug code on r8a7779 ARM: shmobile: Use shared SCU CPU Hotplug code on sh73a0 ARM: shmobile: Add shared SCU CPU Hotplug code ARM: shmobile: Use shared SCU SMP boot code on emev2 ARM: shmobile: Use shared SCU SMP boot code on r8a7779 ARM: shmobile: Use shared SCU SMP boot code on sh73a0 ARM: shmobile: Introduce shared SCU SMP boot code ARM: shmobile: sh73a0: Remove global GPIO_NR definition ARM: shmobile: kzm9d: remove nfsroot settings from bootargs ARM: shmobile: armadillo800eva: remove nfsroot settings from bootargs ARM: shmobile: r8a7779: move r8a7779_init_irq_xxx() to setup ARM: shmobile: r8a7740: move r8a7740_init_irq_of() to setup ARM: shmobile: bockw: add missing __initdata ARM: shmobile: r8a7790: add missing __initdata ARM: shmobile: r8a7779: add missing __initdata ARM: shmobile: Remove unused shmobile_init_time() ARM: shmobile: Use clocksource_of_init() on r8a7790 ARM: shmobile: Use default ->init_time() on KZM9G DT ref ...
325 lines
8.9 KiB
C
325 lines
8.9 KiB
C
/*
|
|
* Bock-W board support
|
|
*
|
|
* Copyright (C) 2013 Renesas Solutions Corp.
|
|
* Copyright (C) 2013 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
|
|
* Copyright (C) 2013 Cogent Embedded, Inc.
|
|
*
|
|
* 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/mfd/tmio.h>
|
|
#include <linux/mmc/host.h>
|
|
#include <linux/mmc/sh_mobile_sdhi.h>
|
|
#include <linux/mmc/sh_mmcif.h>
|
|
#include <linux/mtd/partitions.h>
|
|
#include <linux/pinctrl/machine.h>
|
|
#include <linux/platform_data/usb-rcar-phy.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/regulator/fixed.h>
|
|
#include <linux/regulator/machine.h>
|
|
#include <linux/smsc911x.h>
|
|
#include <linux/spi/spi.h>
|
|
#include <linux/spi/flash.h>
|
|
#include <media/soc_camera.h>
|
|
#include <mach/common.h>
|
|
#include <mach/irqs.h>
|
|
#include <mach/r8a7778.h>
|
|
#include <asm/mach/arch.h>
|
|
|
|
/*
|
|
* CN9(Upper side) SCIF/RCAN selection
|
|
*
|
|
* 1,4 3,6
|
|
* SW40 SCIF RCAN
|
|
* SW41 SCIF RCAN
|
|
*/
|
|
|
|
/*
|
|
* MMC (CN26) pin
|
|
*
|
|
* SW6 (D2) 3 pin
|
|
* SW7 (D5) ON
|
|
* SW8 (D3) 3 pin
|
|
* SW10 (D4) 1 pin
|
|
* SW12 (CLK) 1 pin
|
|
* SW13 (D6) 3 pin
|
|
* SW14 (CMD) ON
|
|
* SW15 (D6) 1 pin
|
|
* SW16 (D0) ON
|
|
* SW17 (D1) ON
|
|
* SW18 (D7) 3 pin
|
|
* SW19 (MMC) 1 pin
|
|
*/
|
|
|
|
/* Dummy supplies, where voltage doesn't matter */
|
|
static struct regulator_consumer_supply dummy_supplies[] = {
|
|
REGULATOR_SUPPLY("vddvario", "smsc911x"),
|
|
REGULATOR_SUPPLY("vdd33a", "smsc911x"),
|
|
};
|
|
|
|
static struct smsc911x_platform_config smsc911x_data __initdata = {
|
|
.irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
|
|
.irq_type = SMSC911X_IRQ_TYPE_PUSH_PULL,
|
|
.flags = SMSC911X_USE_32BIT,
|
|
.phy_interface = PHY_INTERFACE_MODE_MII,
|
|
};
|
|
|
|
static struct resource smsc911x_resources[] __initdata = {
|
|
DEFINE_RES_MEM(0x18300000, 0x1000),
|
|
DEFINE_RES_IRQ(irq_pin(0)), /* IRQ 0 */
|
|
};
|
|
|
|
/* USB */
|
|
static struct resource usb_phy_resources[] __initdata = {
|
|
DEFINE_RES_MEM(0xffe70800, 0x100),
|
|
DEFINE_RES_MEM(0xffe76000, 0x100),
|
|
};
|
|
|
|
static struct rcar_phy_platform_data usb_phy_platform_data __initdata;
|
|
|
|
/* SDHI */
|
|
static struct sh_mobile_sdhi_info sdhi0_info __initdata = {
|
|
.tmio_caps = MMC_CAP_SD_HIGHSPEED,
|
|
.tmio_ocr_mask = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
|
|
.tmio_flags = TMIO_MMC_HAS_IDLE_WAIT,
|
|
};
|
|
|
|
static struct resource sdhi0_resources[] __initdata = {
|
|
DEFINE_RES_MEM(0xFFE4C000, 0x100),
|
|
DEFINE_RES_IRQ(gic_iid(0x77)),
|
|
};
|
|
|
|
static struct sh_eth_plat_data ether_platform_data __initdata = {
|
|
.phy = 0x01,
|
|
.edmac_endian = EDMAC_LITTLE_ENDIAN,
|
|
.phy_interface = PHY_INTERFACE_MODE_RMII,
|
|
/*
|
|
* Although the LINK signal is available on the board, it's connected to
|
|
* the link/activity LED output of the PHY, thus the link disappears and
|
|
* reappears after each packet. We'd be better off ignoring such signal
|
|
* and getting the link state from the PHY indirectly.
|
|
*/
|
|
.no_ether_link = 1,
|
|
};
|
|
|
|
/* I2C */
|
|
static struct i2c_board_info i2c0_devices[] = {
|
|
{
|
|
I2C_BOARD_INFO("rx8581", 0x51),
|
|
},
|
|
};
|
|
|
|
/* HSPI*/
|
|
static struct mtd_partition m25p80_spi_flash_partitions[] = {
|
|
{
|
|
.name = "data(spi)",
|
|
.size = 0x0100000,
|
|
.offset = 0,
|
|
},
|
|
};
|
|
|
|
static struct flash_platform_data spi_flash_data = {
|
|
.name = "m25p80",
|
|
.type = "s25fl008k",
|
|
.parts = m25p80_spi_flash_partitions,
|
|
.nr_parts = ARRAY_SIZE(m25p80_spi_flash_partitions),
|
|
};
|
|
|
|
static struct spi_board_info spi_board_info[] __initdata = {
|
|
{
|
|
.modalias = "m25p80",
|
|
.max_speed_hz = 104000000,
|
|
.chip_select = 0,
|
|
.bus_num = 0,
|
|
.mode = SPI_MODE_0,
|
|
.platform_data = &spi_flash_data,
|
|
},
|
|
};
|
|
|
|
/* MMC */
|
|
static struct resource mmc_resources[] __initdata = {
|
|
DEFINE_RES_MEM(0xffe4e000, 0x100),
|
|
DEFINE_RES_IRQ(gic_iid(0x5d)),
|
|
};
|
|
|
|
static struct sh_mmcif_plat_data sh_mmcif_plat __initdata = {
|
|
.sup_pclk = 0,
|
|
.ocr = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
|
|
.caps = MMC_CAP_4_BIT_DATA |
|
|
MMC_CAP_8_BIT_DATA |
|
|
MMC_CAP_NEEDS_POLL,
|
|
};
|
|
|
|
static struct rcar_vin_platform_data vin_platform_data __initdata = {
|
|
.flags = RCAR_VIN_BT656,
|
|
};
|
|
|
|
/* In the default configuration both decoders reside on I2C bus 0 */
|
|
#define BOCKW_CAMERA(idx) \
|
|
static struct i2c_board_info camera##idx##_info = { \
|
|
I2C_BOARD_INFO("ml86v7667", 0x41 + 2 * (idx)), \
|
|
}; \
|
|
\
|
|
static struct soc_camera_link iclink##idx##_ml86v7667 __initdata = { \
|
|
.bus_id = idx, \
|
|
.i2c_adapter_id = 0, \
|
|
.board_info = &camera##idx##_info, \
|
|
}
|
|
|
|
BOCKW_CAMERA(0);
|
|
BOCKW_CAMERA(1);
|
|
|
|
static const struct pinctrl_map bockw_pinctrl_map[] = {
|
|
/* Ether */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("r8a777x-ether", "pfc-r8a7778",
|
|
"ether_rmii", "ether"),
|
|
/* HSPI0 */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh-hspi.0", "pfc-r8a7778",
|
|
"hspi0_a", "hspi0"),
|
|
/* MMC */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif", "pfc-r8a7778",
|
|
"mmc_data8", "mmc"),
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif", "pfc-r8a7778",
|
|
"mmc_ctrl", "mmc"),
|
|
/* SCIF0 */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778",
|
|
"scif0_data_a", "scif0"),
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778",
|
|
"scif0_ctrl", "scif0"),
|
|
/* USB */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform", "pfc-r8a7778",
|
|
"usb0", "usb0"),
|
|
PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform", "pfc-r8a7778",
|
|
"usb1", "usb1"),
|
|
/* SDHI0 */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
|
|
"sdhi0_data4", "sdhi0"),
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
|
|
"sdhi0_ctrl", "sdhi0"),
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
|
|
"sdhi0_cd", "sdhi0"),
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
|
|
"sdhi0_wp", "sdhi0"),
|
|
/* VIN0 */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.0", "pfc-r8a7778",
|
|
"vin0_clk", "vin0"),
|
|
PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.0", "pfc-r8a7778",
|
|
"vin0_data8", "vin0"),
|
|
/* VIN1 */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.1", "pfc-r8a7778",
|
|
"vin1_clk", "vin1"),
|
|
PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.1", "pfc-r8a7778",
|
|
"vin1_data8", "vin1"),
|
|
};
|
|
|
|
#define FPGA 0x18200000
|
|
#define IRQ0MR 0x30
|
|
#define PFC 0xfffc0000
|
|
#define PUPR4 0x110
|
|
static void __init bockw_init(void)
|
|
{
|
|
void __iomem *base;
|
|
|
|
r8a7778_clock_init();
|
|
r8a7778_init_irq_extpin(1);
|
|
r8a7778_add_standard_devices();
|
|
r8a7778_add_ether_device(ðer_platform_data);
|
|
r8a7778_add_vin_device(0, &vin_platform_data);
|
|
/* VIN1 has a pin conflict with Ether */
|
|
if (!IS_ENABLED(CONFIG_SH_ETH))
|
|
r8a7778_add_vin_device(1, &vin_platform_data);
|
|
platform_device_register_data(&platform_bus, "soc-camera-pdrv", 0,
|
|
&iclink0_ml86v7667,
|
|
sizeof(iclink0_ml86v7667));
|
|
platform_device_register_data(&platform_bus, "soc-camera-pdrv", 1,
|
|
&iclink1_ml86v7667,
|
|
sizeof(iclink1_ml86v7667));
|
|
|
|
i2c_register_board_info(0, i2c0_devices,
|
|
ARRAY_SIZE(i2c0_devices));
|
|
spi_register_board_info(spi_board_info,
|
|
ARRAY_SIZE(spi_board_info));
|
|
pinctrl_register_mappings(bockw_pinctrl_map,
|
|
ARRAY_SIZE(bockw_pinctrl_map));
|
|
r8a7778_pinmux_init();
|
|
|
|
platform_device_register_resndata(
|
|
&platform_bus, "sh_mmcif", -1,
|
|
mmc_resources, ARRAY_SIZE(mmc_resources),
|
|
&sh_mmcif_plat, sizeof(struct sh_mmcif_plat_data));
|
|
|
|
platform_device_register_resndata(
|
|
&platform_bus, "rcar_usb_phy", -1,
|
|
usb_phy_resources,
|
|
ARRAY_SIZE(usb_phy_resources),
|
|
&usb_phy_platform_data,
|
|
sizeof(struct rcar_phy_platform_data));
|
|
|
|
|
|
/* for SMSC */
|
|
base = ioremap_nocache(FPGA, SZ_1M);
|
|
if (base) {
|
|
/*
|
|
* 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(base + IRQ0MR);
|
|
val &= ~(1 << 4); /* enable SMSC911x */
|
|
iowrite16(val, base + IRQ0MR);
|
|
iounmap(base);
|
|
|
|
regulator_register_fixed(0, dummy_supplies,
|
|
ARRAY_SIZE(dummy_supplies));
|
|
|
|
platform_device_register_resndata(
|
|
&platform_bus, "smsc911x", -1,
|
|
smsc911x_resources, ARRAY_SIZE(smsc911x_resources),
|
|
&smsc911x_data, sizeof(smsc911x_data));
|
|
}
|
|
|
|
/* for SDHI */
|
|
base = ioremap_nocache(PFC, 0x200);
|
|
if (base) {
|
|
/*
|
|
* FIXME
|
|
*
|
|
* SDHI CD/WP pin needs pull-up
|
|
*/
|
|
iowrite32(ioread32(base + PUPR4) | (3 << 26), base + PUPR4);
|
|
iounmap(base);
|
|
|
|
platform_device_register_resndata(
|
|
&platform_bus, "sh_mobile_sdhi", 0,
|
|
sdhi0_resources, ARRAY_SIZE(sdhi0_resources),
|
|
&sdhi0_info, sizeof(struct sh_mobile_sdhi_info));
|
|
}
|
|
}
|
|
|
|
static const char *bockw_boards_compat_dt[] __initdata = {
|
|
"renesas,bockw",
|
|
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,
|
|
.init_late = r8a7778_init_late,
|
|
MACHINE_END
|