mirror of
https://github.com/torvalds/linux
synced 2024-10-23 11:46:42 +00:00
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
...
317 lines
8.4 KiB
C
317 lines
8.4 KiB
C
/*
|
|
* marzen board support
|
|
*
|
|
* Copyright (C) 2011, 2013 Renesas Solutions Corp.
|
|
* Copyright (C) 2011 Magnus Damm
|
|
* 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/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/io.h>
|
|
#include <linux/leds.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/pinctrl/machine.h>
|
|
#include <linux/platform_data/gpio-rcar.h>
|
|
#include <linux/platform_data/usb-rcar-phy.h>
|
|
#include <linux/regulator/fixed.h>
|
|
#include <linux/regulator/machine.h>
|
|
#include <linux/smsc911x.h>
|
|
#include <linux/spi/spi.h>
|
|
#include <linux/spi/sh_hspi.h>
|
|
#include <linux/mmc/host.h>
|
|
#include <linux/mmc/sh_mobile_sdhi.h>
|
|
#include <linux/mfd/tmio.h>
|
|
#include <media/soc_camera.h>
|
|
#include <mach/r8a7779.h>
|
|
#include <mach/common.h>
|
|
#include <mach/irqs.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/traps.h>
|
|
|
|
/* Fixed 3.3V regulator to be used by SDHI0 */
|
|
static struct regulator_consumer_supply fixed3v3_power_consumers[] = {
|
|
REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
|
|
REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),
|
|
};
|
|
|
|
/* Dummy supplies, where voltage doesn't matter */
|
|
static struct regulator_consumer_supply dummy_supplies[] = {
|
|
REGULATOR_SUPPLY("vddvario", "smsc911x"),
|
|
REGULATOR_SUPPLY("vdd33a", "smsc911x"),
|
|
};
|
|
|
|
/* USB PHY */
|
|
static struct resource usb_phy_resources[] = {
|
|
[0] = {
|
|
.start = 0xffe70800,
|
|
.end = 0xffe70900 - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
};
|
|
|
|
static struct rcar_phy_platform_data usb_phy_platform_data;
|
|
|
|
static struct platform_device usb_phy = {
|
|
.name = "rcar_usb_phy",
|
|
.id = -1,
|
|
.dev = {
|
|
.platform_data = &usb_phy_platform_data,
|
|
},
|
|
.resource = usb_phy_resources,
|
|
.num_resources = ARRAY_SIZE(usb_phy_resources),
|
|
};
|
|
|
|
/* SMSC LAN89218 */
|
|
static struct resource smsc911x_resources[] = {
|
|
[0] = {
|
|
.start = 0x18000000, /* ExCS0 */
|
|
.end = 0x180000ff, /* A1->A7 */
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
[1] = {
|
|
.start = irq_pin(1), /* IRQ 1 */
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct smsc911x_platform_config smsc911x_platdata = {
|
|
.flags = SMSC911X_USE_32BIT, /* 32-bit SW on 16-bit HW bus */
|
|
.phy_interface = PHY_INTERFACE_MODE_MII,
|
|
.irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
|
|
.irq_type = SMSC911X_IRQ_TYPE_PUSH_PULL,
|
|
};
|
|
|
|
static struct platform_device eth_device = {
|
|
.name = "smsc911x",
|
|
.id = -1,
|
|
.dev = {
|
|
.platform_data = &smsc911x_platdata,
|
|
},
|
|
.resource = smsc911x_resources,
|
|
.num_resources = ARRAY_SIZE(smsc911x_resources),
|
|
};
|
|
|
|
static struct resource sdhi0_resources[] = {
|
|
[0] = {
|
|
.name = "sdhi0",
|
|
.start = 0xffe4c000,
|
|
.end = 0xffe4c0ff,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
[1] = {
|
|
.start = gic_iid(0x88),
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct sh_mobile_sdhi_info sdhi0_platform_data = {
|
|
.tmio_flags = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HAS_IDLE_WAIT,
|
|
.tmio_caps = MMC_CAP_SD_HIGHSPEED,
|
|
};
|
|
|
|
static struct platform_device sdhi0_device = {
|
|
.name = "sh_mobile_sdhi",
|
|
.num_resources = ARRAY_SIZE(sdhi0_resources),
|
|
.resource = sdhi0_resources,
|
|
.id = 0,
|
|
.dev = {
|
|
.platform_data = &sdhi0_platform_data,
|
|
}
|
|
};
|
|
|
|
/* Thermal */
|
|
static struct resource thermal_resources[] = {
|
|
[0] = {
|
|
.start = 0xFFC48000,
|
|
.end = 0xFFC48038 - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
};
|
|
|
|
static struct platform_device thermal_device = {
|
|
.name = "rcar_thermal",
|
|
.resource = thermal_resources,
|
|
.num_resources = ARRAY_SIZE(thermal_resources),
|
|
};
|
|
|
|
/* HSPI */
|
|
static struct resource hspi_resources[] = {
|
|
[0] = {
|
|
.start = 0xFFFC7000,
|
|
.end = 0xFFFC7018 - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
};
|
|
|
|
static struct platform_device hspi_device = {
|
|
.name = "sh-hspi",
|
|
.id = 0,
|
|
.resource = hspi_resources,
|
|
.num_resources = ARRAY_SIZE(hspi_resources),
|
|
};
|
|
|
|
/* LEDS */
|
|
static struct gpio_led marzen_leds[] = {
|
|
{
|
|
.name = "led2",
|
|
.gpio = RCAR_GP_PIN(4, 29),
|
|
.default_state = LEDS_GPIO_DEFSTATE_ON,
|
|
}, {
|
|
.name = "led3",
|
|
.gpio = RCAR_GP_PIN(4, 30),
|
|
.default_state = LEDS_GPIO_DEFSTATE_ON,
|
|
}, {
|
|
.name = "led4",
|
|
.gpio = RCAR_GP_PIN(4, 31),
|
|
.default_state = LEDS_GPIO_DEFSTATE_ON,
|
|
},
|
|
};
|
|
|
|
static struct gpio_led_platform_data marzen_leds_pdata = {
|
|
.leds = marzen_leds,
|
|
.num_leds = ARRAY_SIZE(marzen_leds),
|
|
};
|
|
|
|
static struct platform_device leds_device = {
|
|
.name = "leds-gpio",
|
|
.id = 0,
|
|
.dev = {
|
|
.platform_data = &marzen_leds_pdata,
|
|
},
|
|
};
|
|
|
|
static struct rcar_vin_platform_data vin_platform_data __initdata = {
|
|
.flags = RCAR_VIN_BT656,
|
|
};
|
|
|
|
#define MARZEN_CAMERA(idx) \
|
|
static struct i2c_board_info camera##idx##_info = { \
|
|
I2C_BOARD_INFO("adv7180", 0x20 + (idx)), \
|
|
}; \
|
|
\
|
|
static struct soc_camera_link iclink##idx##_adv7180 = { \
|
|
.bus_id = 1 + 2 * (idx), \
|
|
.i2c_adapter_id = 0, \
|
|
.board_info = &camera##idx##_info, \
|
|
}; \
|
|
\
|
|
static struct platform_device camera##idx##_device = { \
|
|
.name = "soc-camera-pdrv", \
|
|
.id = idx, \
|
|
.dev = { \
|
|
.platform_data = &iclink##idx##_adv7180, \
|
|
}, \
|
|
};
|
|
|
|
MARZEN_CAMERA(0);
|
|
MARZEN_CAMERA(1);
|
|
|
|
static struct platform_device *marzen_devices[] __initdata = {
|
|
ð_device,
|
|
&sdhi0_device,
|
|
&thermal_device,
|
|
&hspi_device,
|
|
&leds_device,
|
|
&usb_phy,
|
|
&camera0_device,
|
|
&camera1_device,
|
|
};
|
|
|
|
static const struct pinctrl_map marzen_pinctrl_map[] = {
|
|
/* HSPI0 */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh-hspi.0", "pfc-r8a7779",
|
|
"hspi0", "hspi0"),
|
|
/* SCIF2 (CN18: DEBUG0) */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.2", "pfc-r8a7779",
|
|
"scif2_data_c", "scif2"),
|
|
/* SCIF4 (CN19: DEBUG1) */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-r8a7779",
|
|
"scif4_data", "scif4"),
|
|
/* SDHI0 */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
|
|
"sdhi0_data4", "sdhi0"),
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
|
|
"sdhi0_ctrl", "sdhi0"),
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
|
|
"sdhi0_cd", "sdhi0"),
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
|
|
"sdhi0_wp", "sdhi0"),
|
|
/* SMSC */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a7779",
|
|
"intc_irq1_b", "intc"),
|
|
PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a7779",
|
|
"lbsc_ex_cs0", "lbsc"),
|
|
/* USB0 */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform.0", "pfc-r8a7779",
|
|
"usb0", "usb0"),
|
|
/* USB1 */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform.0", "pfc-r8a7779",
|
|
"usb1", "usb1"),
|
|
/* USB2 */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform.1", "pfc-r8a7779",
|
|
"usb2", "usb2"),
|
|
/* VIN1 */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("r8a7779-vin.1", "pfc-r8a7779",
|
|
"vin1_clk", "vin1"),
|
|
PIN_MAP_MUX_GROUP_DEFAULT("r8a7779-vin.1", "pfc-r8a7779",
|
|
"vin1_data8", "vin1"),
|
|
/* VIN3 */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("r8a7779-vin.3", "pfc-r8a7779",
|
|
"vin3_clk", "vin3"),
|
|
PIN_MAP_MUX_GROUP_DEFAULT("r8a7779-vin.3", "pfc-r8a7779",
|
|
"vin3_data8", "vin3"),
|
|
};
|
|
|
|
static void __init marzen_init(void)
|
|
{
|
|
regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
|
|
ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
|
|
regulator_register_fixed(1, dummy_supplies,
|
|
ARRAY_SIZE(dummy_supplies));
|
|
|
|
pinctrl_register_mappings(marzen_pinctrl_map,
|
|
ARRAY_SIZE(marzen_pinctrl_map));
|
|
r8a7779_pinmux_init();
|
|
r8a7779_init_irq_extpin(1); /* IRQ1 as individual interrupt */
|
|
|
|
r8a7779_add_standard_devices();
|
|
r8a7779_add_vin_device(1, &vin_platform_data);
|
|
r8a7779_add_vin_device(3, &vin_platform_data);
|
|
platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
|
|
}
|
|
|
|
static const char *marzen_boards_compat_dt[] __initdata = {
|
|
"renesas,marzen",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(MARZEN, "marzen")
|
|
.smp = smp_ops(r8a7779_smp_ops),
|
|
.map_io = r8a7779_map_io,
|
|
.init_early = r8a7779_add_early_devices,
|
|
.init_irq = r8a7779_init_irq_dt,
|
|
.init_machine = marzen_init,
|
|
.init_late = r8a7779_init_late,
|
|
.dt_compat = marzen_boards_compat_dt,
|
|
.init_time = r8a7779_earlytimer_init,
|
|
MACHINE_END
|