mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 21:54:06 +08:00
Merge branch 'renesas/cleanup2' into next/soc
Merging in as base to resolve a merge conflict with later soc branch locally.
This commit is contained in:
commit
e1ddcdef84
@ -31,11 +31,13 @@
|
|||||||
device_type = "cpu";
|
device_type = "cpu";
|
||||||
compatible = "arm,cortex-a9";
|
compatible = "arm,cortex-a9";
|
||||||
reg = <0>;
|
reg = <0>;
|
||||||
|
clock-frequency = <533000000>;
|
||||||
};
|
};
|
||||||
cpu@1 {
|
cpu@1 {
|
||||||
device_type = "cpu";
|
device_type = "cpu";
|
||||||
compatible = "arm,cortex-a9";
|
compatible = "arm,cortex-a9";
|
||||||
reg = <1>;
|
reg = <1>;
|
||||||
|
clock-frequency = <533000000>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -144,6 +144,7 @@
|
|||||||
device_type = "cpu";
|
device_type = "cpu";
|
||||||
compatible = "arm,cortex-a9";
|
compatible = "arm,cortex-a9";
|
||||||
reg = <0>;
|
reg = <0>;
|
||||||
|
clock-frequency = <400000000>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -24,10 +24,12 @@
|
|||||||
#include <linux/pinctrl/machine.h>
|
#include <linux/pinctrl/machine.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/sh_clk.h>
|
#include <linux/sh_clk.h>
|
||||||
#include <mach/r8a73a4.h>
|
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
#include "r8a73a4.h"
|
||||||
|
|
||||||
static void __init ape6evm_add_standard_devices(void)
|
static void __init ape6evm_add_standard_devices(void)
|
||||||
{
|
{
|
||||||
|
@ -33,11 +33,13 @@
|
|||||||
#include <linux/regulator/machine.h>
|
#include <linux/regulator/machine.h>
|
||||||
#include <linux/sh_clk.h>
|
#include <linux/sh_clk.h>
|
||||||
#include <linux/smsc911x.h>
|
#include <linux/smsc911x.h>
|
||||||
#include <mach/r8a73a4.h>
|
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "irqs.h"
|
#include "irqs.h"
|
||||||
|
#include "r8a73a4.h"
|
||||||
|
|
||||||
/* LEDS */
|
/* LEDS */
|
||||||
static struct gpio_led ape6evm_leds[] = {
|
static struct gpio_led ape6evm_leds[] = {
|
||||||
|
@ -24,10 +24,12 @@
|
|||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/gpio.h>
|
#include <linux/gpio.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <mach/r8a7740.h>
|
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
#include <asm/hardware/cache-l2x0.h>
|
#include <asm/hardware/cache-l2x0.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
#include "r8a7740.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* CON1 Camera Module
|
* CON1 Camera Module
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
#include <linux/mmc/sh_mobile_sdhi.h>
|
#include <linux/mmc/sh_mobile_sdhi.h>
|
||||||
#include <linux/i2c-gpio.h>
|
#include <linux/i2c-gpio.h>
|
||||||
#include <linux/reboot.h>
|
#include <linux/reboot.h>
|
||||||
#include <mach/r8a7740.h>
|
|
||||||
#include <media/mt9t112.h>
|
#include <media/mt9t112.h>
|
||||||
#include <media/sh_mobile_ceu.h>
|
#include <media/sh_mobile_ceu.h>
|
||||||
#include <media/soc_camera.h>
|
#include <media/soc_camera.h>
|
||||||
@ -59,9 +59,11 @@
|
|||||||
#include <video/sh_mobile_hdmi.h>
|
#include <video/sh_mobile_hdmi.h>
|
||||||
#include <sound/sh_fsi.h>
|
#include <sound/sh_fsi.h>
|
||||||
#include <sound/simple_card.h>
|
#include <sound/simple_card.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "irqs.h"
|
#include "irqs.h"
|
||||||
#include "pm-rmobile.h"
|
#include "pm-rmobile.h"
|
||||||
|
#include "r8a7740.h"
|
||||||
#include "sh-gpio.h"
|
#include "sh-gpio.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -19,9 +19,11 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/of_platform.h>
|
#include <linux/of_platform.h>
|
||||||
#include <mach/r8a7778.h>
|
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
#include "r8a7778.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* see board-bock.c for checking detail of dip-switch
|
* see board-bock.c for checking detail of dip-switch
|
||||||
|
@ -34,13 +34,15 @@
|
|||||||
#include <linux/spi/spi.h>
|
#include <linux/spi/spi.h>
|
||||||
#include <linux/spi/flash.h>
|
#include <linux/spi/flash.h>
|
||||||
#include <linux/usb/renesas_usbhs.h>
|
#include <linux/usb/renesas_usbhs.h>
|
||||||
|
|
||||||
#include <media/soc_camera.h>
|
#include <media/soc_camera.h>
|
||||||
#include <mach/r8a7778.h>
|
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
#include <sound/rcar_snd.h>
|
#include <sound/rcar_snd.h>
|
||||||
#include <sound/simple_card.h>
|
#include <sound/simple_card.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "irqs.h"
|
#include "irqs.h"
|
||||||
|
#include "r8a7778.h"
|
||||||
|
|
||||||
#define FPGA 0x18200000
|
#define FPGA 0x18200000
|
||||||
#define IRQ0MR 0x30
|
#define IRQ0MR 0x30
|
||||||
|
@ -20,11 +20,13 @@
|
|||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/of_platform.h>
|
#include <linux/of_platform.h>
|
||||||
#include <mach/r7s72100.h>
|
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
|
|
||||||
#include "clock.h"
|
#include "clock.h"
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
#include "r7s72100.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This is a really crude hack to provide clkdev support to platform
|
* This is a really crude hack to provide clkdev support to platform
|
||||||
@ -47,7 +49,7 @@ static const char * const genmai_boards_compat_dt[] __initconst = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
DT_MACHINE_START(GENMAI_DT, "genmai")
|
DT_MACHINE_START(GENMAI_DT, "genmai")
|
||||||
.init_early = r7s72100_init_early,
|
.init_early = shmobile_init_delay,
|
||||||
.init_machine = genmai_add_standard_devices,
|
.init_machine = genmai_add_standard_devices,
|
||||||
.dt_compat = genmai_boards_compat_dt,
|
.dt_compat = genmai_boards_compat_dt,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
@ -25,11 +25,13 @@
|
|||||||
#include <linux/sh_eth.h>
|
#include <linux/sh_eth.h>
|
||||||
#include <linux/spi/rspi.h>
|
#include <linux/spi/rspi.h>
|
||||||
#include <linux/spi/spi.h>
|
#include <linux/spi/spi.h>
|
||||||
#include <mach/r7s72100.h>
|
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "irqs.h"
|
#include "irqs.h"
|
||||||
|
#include "r7s72100.h"
|
||||||
|
|
||||||
/* Ether */
|
/* Ether */
|
||||||
static const struct sh_eth_plat_data ether_pdata __initconst = {
|
static const struct sh_eth_plat_data ether_pdata __initconst = {
|
||||||
@ -154,7 +156,7 @@ static const char * const genmai_boards_compat_dt[] __initconst = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
DT_MACHINE_START(GENMAI_DT, "genmai")
|
DT_MACHINE_START(GENMAI_DT, "genmai")
|
||||||
.init_early = r7s72100_init_early,
|
.init_early = shmobile_init_delay,
|
||||||
.init_machine = genmai_add_standard_devices,
|
.init_machine = genmai_add_standard_devices,
|
||||||
.dt_compat = genmai_boards_compat_dt,
|
.dt_compat = genmai_boards_compat_dt,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
@ -25,11 +25,13 @@
|
|||||||
#include <linux/irq.h>
|
#include <linux/irq.h>
|
||||||
#include <linux/input.h>
|
#include <linux/input.h>
|
||||||
#include <linux/of_platform.h>
|
#include <linux/of_platform.h>
|
||||||
#include <mach/sh73a0.h>
|
|
||||||
#include <asm/hardware/cache-l2x0.h>
|
#include <asm/hardware/cache-l2x0.h>
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
#include "sh73a0.h"
|
||||||
|
|
||||||
static void __init kzm_init(void)
|
static void __init kzm_init(void)
|
||||||
{
|
{
|
||||||
|
@ -41,15 +41,17 @@
|
|||||||
#include <linux/usb/r8a66597.h>
|
#include <linux/usb/r8a66597.h>
|
||||||
#include <linux/usb/renesas_usbhs.h>
|
#include <linux/usb/renesas_usbhs.h>
|
||||||
#include <linux/videodev2.h>
|
#include <linux/videodev2.h>
|
||||||
|
|
||||||
#include <sound/sh_fsi.h>
|
#include <sound/sh_fsi.h>
|
||||||
#include <sound/simple_card.h>
|
#include <sound/simple_card.h>
|
||||||
#include <mach/sh73a0.h>
|
|
||||||
#include <asm/hardware/cache-l2x0.h>
|
#include <asm/hardware/cache-l2x0.h>
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
#include <video/sh_mobile_lcdc.h>
|
#include <video/sh_mobile_lcdc.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "irqs.h"
|
#include "irqs.h"
|
||||||
|
#include "sh73a0.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* external GPIO
|
* external GPIO
|
||||||
|
@ -22,11 +22,13 @@
|
|||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/of_platform.h>
|
#include <linux/of_platform.h>
|
||||||
#include <linux/platform_data/rcar-du.h>
|
#include <linux/platform_data/rcar-du.h>
|
||||||
#include <mach/r8a7790.h>
|
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
|
|
||||||
#include "clock.h"
|
#include "clock.h"
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "irqs.h"
|
#include "irqs.h"
|
||||||
|
#include "r8a7790.h"
|
||||||
#include "rcar-gen2.h"
|
#include "rcar-gen2.h"
|
||||||
|
|
||||||
/* DU */
|
/* DU */
|
||||||
@ -129,7 +131,7 @@ static const char *lager_boards_compat_dt[] __initdata = {
|
|||||||
|
|
||||||
DT_MACHINE_START(LAGER_DT, "lager")
|
DT_MACHINE_START(LAGER_DT, "lager")
|
||||||
.smp = smp_ops(r8a7790_smp_ops),
|
.smp = smp_ops(r8a7790_smp_ops),
|
||||||
.init_early = r8a7790_init_early,
|
.init_early = shmobile_init_delay,
|
||||||
.init_time = rcar_gen2_timer_init,
|
.init_time = rcar_gen2_timer_init,
|
||||||
.init_machine = lager_add_standard_devices,
|
.init_machine = lager_add_standard_devices,
|
||||||
.init_late = shmobile_init_late,
|
.init_late = shmobile_init_late,
|
||||||
|
@ -31,6 +31,8 @@
|
|||||||
#include <linux/mmc/host.h>
|
#include <linux/mmc/host.h>
|
||||||
#include <linux/mmc/sh_mmcif.h>
|
#include <linux/mmc/sh_mmcif.h>
|
||||||
#include <linux/mmc/sh_mobile_sdhi.h>
|
#include <linux/mmc/sh_mobile_sdhi.h>
|
||||||
|
#include <linux/mtd/partitions.h>
|
||||||
|
#include <linux/mtd/mtd.h>
|
||||||
#include <linux/pinctrl/machine.h>
|
#include <linux/pinctrl/machine.h>
|
||||||
#include <linux/platform_data/camera-rcar.h>
|
#include <linux/platform_data/camera-rcar.h>
|
||||||
#include <linux/platform_data/gpio-rcar.h>
|
#include <linux/platform_data/gpio-rcar.h>
|
||||||
@ -43,21 +45,21 @@
|
|||||||
#include <linux/regulator/gpio-regulator.h>
|
#include <linux/regulator/gpio-regulator.h>
|
||||||
#include <linux/regulator/machine.h>
|
#include <linux/regulator/machine.h>
|
||||||
#include <linux/sh_eth.h>
|
#include <linux/sh_eth.h>
|
||||||
#include <linux/usb/phy.h>
|
|
||||||
#include <linux/usb/renesas_usbhs.h>
|
|
||||||
#include <mach/r8a7790.h>
|
|
||||||
#include <media/soc_camera.h>
|
|
||||||
#include <asm/mach-types.h>
|
|
||||||
#include <asm/mach/arch.h>
|
|
||||||
#include <linux/mtd/partitions.h>
|
|
||||||
#include <linux/mtd/mtd.h>
|
|
||||||
#include <linux/spi/flash.h>
|
#include <linux/spi/flash.h>
|
||||||
#include <linux/spi/rspi.h>
|
#include <linux/spi/rspi.h>
|
||||||
#include <linux/spi/spi.h>
|
#include <linux/spi/spi.h>
|
||||||
|
#include <linux/usb/phy.h>
|
||||||
|
#include <linux/usb/renesas_usbhs.h>
|
||||||
|
|
||||||
|
#include <media/soc_camera.h>
|
||||||
|
#include <asm/mach-types.h>
|
||||||
|
#include <asm/mach/arch.h>
|
||||||
#include <sound/rcar_snd.h>
|
#include <sound/rcar_snd.h>
|
||||||
#include <sound/simple_card.h>
|
#include <sound/simple_card.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "irqs.h"
|
#include "irqs.h"
|
||||||
|
#include "r8a7790.h"
|
||||||
#include "rcar-gen2.h"
|
#include "rcar-gen2.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -887,7 +889,7 @@ static const char * const lager_boards_compat_dt[] __initconst = {
|
|||||||
|
|
||||||
DT_MACHINE_START(LAGER_DT, "lager")
|
DT_MACHINE_START(LAGER_DT, "lager")
|
||||||
.smp = smp_ops(r8a7790_smp_ops),
|
.smp = smp_ops(r8a7790_smp_ops),
|
||||||
.init_early = r8a7790_init_early,
|
.init_early = shmobile_init_delay,
|
||||||
.init_time = rcar_gen2_timer_init,
|
.init_time = rcar_gen2_timer_init,
|
||||||
.init_machine = lager_init,
|
.init_machine = lager_init,
|
||||||
.init_late = shmobile_init_late,
|
.init_late = shmobile_init_late,
|
||||||
|
@ -51,6 +51,7 @@
|
|||||||
#include <linux/tca6416_keypad.h>
|
#include <linux/tca6416_keypad.h>
|
||||||
#include <linux/usb/renesas_usbhs.h>
|
#include <linux/usb/renesas_usbhs.h>
|
||||||
#include <linux/dma-mapping.h>
|
#include <linux/dma-mapping.h>
|
||||||
|
|
||||||
#include <video/sh_mobile_hdmi.h>
|
#include <video/sh_mobile_hdmi.h>
|
||||||
#include <video/sh_mobile_lcdc.h>
|
#include <video/sh_mobile_lcdc.h>
|
||||||
#include <media/sh_mobile_ceu.h>
|
#include <media/sh_mobile_ceu.h>
|
||||||
@ -58,13 +59,14 @@
|
|||||||
#include <media/soc_camera_platform.h>
|
#include <media/soc_camera_platform.h>
|
||||||
#include <sound/sh_fsi.h>
|
#include <sound/sh_fsi.h>
|
||||||
#include <sound/simple_card.h>
|
#include <sound/simple_card.h>
|
||||||
#include <mach/sh7372.h>
|
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "irqs.h"
|
#include "irqs.h"
|
||||||
#include "pm-rmobile.h"
|
#include "pm-rmobile.h"
|
||||||
#include "sh-gpio.h"
|
#include "sh-gpio.h"
|
||||||
|
#include "sh7372.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Address Interface BusWidth note
|
* Address Interface BusWidth note
|
||||||
|
@ -19,8 +19,9 @@
|
|||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/sh_clk.h>
|
#include <linux/sh_clk.h>
|
||||||
#include <linux/clkdev.h>
|
#include <linux/clkdev.h>
|
||||||
#include <mach/r7s72100.h>
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
#include "r7s72100.h"
|
||||||
|
|
||||||
/* Frequency Control Registers */
|
/* Frequency Control Registers */
|
||||||
#define FRQCR 0xfcfe0010
|
#define FRQCR 0xfcfe0010
|
||||||
|
@ -22,9 +22,10 @@
|
|||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/sh_clk.h>
|
#include <linux/sh_clk.h>
|
||||||
#include <linux/clkdev.h>
|
#include <linux/clkdev.h>
|
||||||
#include <mach/r8a7740.h>
|
|
||||||
#include "clock.h"
|
#include "clock.h"
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
#include "r8a7740.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* | MDx | XTAL1/EXTAL1 | System | EXTALR |
|
* | MDx | XTAL1/EXTAL1 | System | EXTALR |
|
||||||
|
@ -22,9 +22,10 @@
|
|||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/sh_clk.h>
|
#include <linux/sh_clk.h>
|
||||||
#include <linux/clkdev.h>
|
#include <linux/clkdev.h>
|
||||||
#include <mach/r8a7790.h>
|
|
||||||
#include "clock.h"
|
#include "clock.h"
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
#include "r8a7790.h"
|
||||||
#include "rcar-gen2.h"
|
#include "rcar-gen2.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -24,11 +24,13 @@
|
|||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/irqchip.h>
|
#include <linux/irqchip.h>
|
||||||
#include <linux/irqchip/arm-gic.h>
|
#include <linux/irqchip/arm-gic.h>
|
||||||
#include <mach/sh73a0.h>
|
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
|
|
||||||
#include "intc.h"
|
#include "intc.h"
|
||||||
#include "irqs.h"
|
#include "irqs.h"
|
||||||
|
#include "sh73a0.h"
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
UNUSED = 0,
|
UNUSED = 0,
|
||||||
|
@ -11,9 +11,11 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
|
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <mach/r8a7790.h>
|
|
||||||
#include "pm-rcar.h"
|
#include "pm-rcar.h"
|
||||||
|
#include "r8a7790.h"
|
||||||
|
|
||||||
/* SYSC */
|
/* SYSC */
|
||||||
#define SYSCIER 0x0c
|
#define SYSCIER 0x0c
|
||||||
|
@ -21,13 +21,15 @@
|
|||||||
#include <linux/irq.h>
|
#include <linux/irq.h>
|
||||||
#include <linux/bitrev.h>
|
#include <linux/bitrev.h>
|
||||||
#include <linux/console.h>
|
#include <linux/console.h>
|
||||||
|
|
||||||
#include <asm/cpuidle.h>
|
#include <asm/cpuidle.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/tlbflush.h>
|
#include <asm/tlbflush.h>
|
||||||
#include <asm/suspend.h>
|
#include <asm/suspend.h>
|
||||||
#include <mach/sh7372.h>
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "pm-rmobile.h"
|
#include "pm-rmobile.h"
|
||||||
|
#include "sh7372.h"
|
||||||
|
|
||||||
/* DBG */
|
/* DBG */
|
||||||
#define DBGREG1 IOMEM(0xe6100020)
|
#define DBGREG1 IOMEM(0xe6100020)
|
||||||
|
@ -3,6 +3,5 @@
|
|||||||
|
|
||||||
void r7s72100_add_dt_devices(void);
|
void r7s72100_add_dt_devices(void);
|
||||||
void r7s72100_clock_init(void);
|
void r7s72100_clock_init(void);
|
||||||
void r7s72100_init_early(void);
|
|
||||||
|
|
||||||
#endif /* __ASM_R7S72100_H__ */
|
#endif /* __ASM_R7S72100_H__ */
|
@ -31,7 +31,6 @@ void r8a7790_add_dt_devices(void);
|
|||||||
void r8a7790_clock_init(void);
|
void r8a7790_clock_init(void);
|
||||||
void r8a7790_pinmux_init(void);
|
void r8a7790_pinmux_init(void);
|
||||||
void r8a7790_pm_init(void);
|
void r8a7790_pm_init(void);
|
||||||
void r8a7790_init_early(void);
|
|
||||||
extern struct smp_operations r8a7790_smp_ops;
|
extern struct smp_operations r8a7790_smp_ops;
|
||||||
|
|
||||||
#endif /* __ASM_R8A7790_H__ */
|
#endif /* __ASM_R8A7790_H__ */
|
@ -16,10 +16,9 @@
|
|||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
#include <linux/clk-provider.h>
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/of_platform.h>
|
#include <linux/mm.h>
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
#include <asm/mach/map.h>
|
#include <asm/mach/map.h>
|
||||||
@ -42,17 +41,6 @@ static void __init emev2_map_io(void)
|
|||||||
iotable_init(emev2_io_desc, ARRAY_SIZE(emev2_io_desc));
|
iotable_init(emev2_io_desc, ARRAY_SIZE(emev2_io_desc));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init emev2_init_delay(void)
|
|
||||||
{
|
|
||||||
shmobile_setup_delay(533, 1, 3); /* Cortex-A9 @ 533MHz */
|
|
||||||
}
|
|
||||||
|
|
||||||
static void __init emev2_add_standard_devices_dt(void)
|
|
||||||
{
|
|
||||||
of_clk_init(NULL);
|
|
||||||
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static const char *emev2_boards_compat_dt[] __initconst = {
|
static const char *emev2_boards_compat_dt[] __initconst = {
|
||||||
"renesas,emev2",
|
"renesas,emev2",
|
||||||
NULL,
|
NULL,
|
||||||
@ -63,8 +51,7 @@ extern struct smp_operations emev2_smp_ops;
|
|||||||
DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
|
DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
|
||||||
.smp = smp_ops(emev2_smp_ops),
|
.smp = smp_ops(emev2_smp_ops),
|
||||||
.map_io = emev2_map_io,
|
.map_io = emev2_map_io,
|
||||||
.init_early = emev2_init_delay,
|
.init_early = shmobile_init_delay,
|
||||||
.init_machine = emev2_add_standard_devices_dt,
|
|
||||||
.init_late = shmobile_init_late,
|
.init_late = shmobile_init_late,
|
||||||
.dt_compat = emev2_boards_compat_dt,
|
.dt_compat = emev2_boards_compat_dt,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
@ -22,10 +22,12 @@
|
|||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/of_platform.h>
|
#include <linux/of_platform.h>
|
||||||
#include <linux/sh_timer.h>
|
#include <linux/sh_timer.h>
|
||||||
#include <mach/r7s72100.h>
|
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "irqs.h"
|
#include "irqs.h"
|
||||||
|
#include "r7s72100.h"
|
||||||
|
|
||||||
static struct resource mtu2_resources[] __initdata = {
|
static struct resource mtu2_resources[] __initdata = {
|
||||||
DEFINE_RES_MEM(0xfcff0000, 0x400),
|
DEFINE_RES_MEM(0xfcff0000, 0x400),
|
||||||
@ -43,11 +45,6 @@ void __init r7s72100_add_dt_devices(void)
|
|||||||
r7s72100_register_mtu2();
|
r7s72100_register_mtu2();
|
||||||
}
|
}
|
||||||
|
|
||||||
void __init r7s72100_init_early(void)
|
|
||||||
{
|
|
||||||
shmobile_setup_delay(400, 1, 3); /* Cortex-A9 @ 400MHz */
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_USE_OF
|
#ifdef CONFIG_USE_OF
|
||||||
static const char *r7s72100_boards_compat_dt[] __initdata = {
|
static const char *r7s72100_boards_compat_dt[] __initdata = {
|
||||||
"renesas,r7s72100",
|
"renesas,r7s72100",
|
||||||
@ -55,7 +52,7 @@ static const char *r7s72100_boards_compat_dt[] __initdata = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
DT_MACHINE_START(R7S72100_DT, "Generic R7S72100 (Flattened Device Tree)")
|
DT_MACHINE_START(R7S72100_DT, "Generic R7S72100 (Flattened Device Tree)")
|
||||||
.init_early = r7s72100_init_early,
|
.init_early = shmobile_init_delay,
|
||||||
.dt_compat = r7s72100_boards_compat_dt,
|
.dt_compat = r7s72100_boards_compat_dt,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
#endif /* CONFIG_USE_OF */
|
#endif /* CONFIG_USE_OF */
|
||||||
|
@ -24,11 +24,13 @@
|
|||||||
#include <linux/serial_sci.h>
|
#include <linux/serial_sci.h>
|
||||||
#include <linux/sh_dma.h>
|
#include <linux/sh_dma.h>
|
||||||
#include <linux/sh_timer.h>
|
#include <linux/sh_timer.h>
|
||||||
#include <mach/r8a73a4.h>
|
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "dma-register.h"
|
#include "dma-register.h"
|
||||||
#include "irqs.h"
|
#include "irqs.h"
|
||||||
|
#include "r8a73a4.h"
|
||||||
|
|
||||||
static const struct resource pfc_resources[] = {
|
static const struct resource pfc_resources[] = {
|
||||||
DEFINE_RES_MEM(0xe6050000, 0x9000),
|
DEFINE_RES_MEM(0xe6050000, 0x9000),
|
||||||
|
@ -31,15 +31,17 @@
|
|||||||
#include <linux/sh_dma.h>
|
#include <linux/sh_dma.h>
|
||||||
#include <linux/sh_timer.h>
|
#include <linux/sh_timer.h>
|
||||||
#include <linux/platform_data/sh_ipmmu.h>
|
#include <linux/platform_data/sh_ipmmu.h>
|
||||||
#include <mach/r8a7740.h>
|
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
#include <asm/mach/map.h>
|
#include <asm/mach/map.h>
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
#include <asm/mach/time.h>
|
#include <asm/mach/time.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "dma-register.h"
|
#include "dma-register.h"
|
||||||
#include "irqs.h"
|
#include "irqs.h"
|
||||||
#include "pm-rmobile.h"
|
#include "pm-rmobile.h"
|
||||||
|
#include "r8a7740.h"
|
||||||
|
|
||||||
static struct map_desc r8a7740_io_desc[] __initdata = {
|
static struct map_desc r8a7740_io_desc[] __initdata = {
|
||||||
/*
|
/*
|
||||||
|
@ -37,11 +37,13 @@
|
|||||||
#include <linux/usb/ehci_pdriver.h>
|
#include <linux/usb/ehci_pdriver.h>
|
||||||
#include <linux/usb/ohci_pdriver.h>
|
#include <linux/usb/ohci_pdriver.h>
|
||||||
#include <linux/dma-mapping.h>
|
#include <linux/dma-mapping.h>
|
||||||
#include <mach/r8a7778.h>
|
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
#include <asm/hardware/cache-l2x0.h>
|
#include <asm/hardware/cache-l2x0.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "irqs.h"
|
#include "irqs.h"
|
||||||
|
#include "r8a7778.h"
|
||||||
|
|
||||||
/* SCIF */
|
/* SCIF */
|
||||||
#define R8A7778_SCIF(index, baseaddr, irq) \
|
#define R8A7778_SCIF(index, baseaddr, irq) \
|
||||||
|
@ -26,11 +26,13 @@
|
|||||||
#include <linux/serial_sci.h>
|
#include <linux/serial_sci.h>
|
||||||
#include <linux/sh_dma.h>
|
#include <linux/sh_dma.h>
|
||||||
#include <linux/sh_timer.h>
|
#include <linux/sh_timer.h>
|
||||||
#include <mach/r8a7790.h>
|
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "dma-register.h"
|
#include "dma-register.h"
|
||||||
#include "irqs.h"
|
#include "irqs.h"
|
||||||
|
#include "r8a7790.h"
|
||||||
#include "rcar-gen2.h"
|
#include "rcar-gen2.h"
|
||||||
|
|
||||||
/* Audio-DMAC */
|
/* Audio-DMAC */
|
||||||
@ -308,13 +310,6 @@ void __init r8a7790_add_standard_devices(void)
|
|||||||
r8a7790_register_audio_dmac(1);
|
r8a7790_register_audio_dmac(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void __init r8a7790_init_early(void)
|
|
||||||
{
|
|
||||||
#ifndef CONFIG_ARM_ARCH_TIMER
|
|
||||||
shmobile_setup_delay(1300, 2, 4); /* Cortex-A15 @ 1300MHz */
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_USE_OF
|
#ifdef CONFIG_USE_OF
|
||||||
|
|
||||||
static const char * const r8a7790_boards_compat_dt[] __initconst = {
|
static const char * const r8a7790_boards_compat_dt[] __initconst = {
|
||||||
@ -324,7 +319,7 @@ static const char * const r8a7790_boards_compat_dt[] __initconst = {
|
|||||||
|
|
||||||
DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
|
DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
|
||||||
.smp = smp_ops(r8a7790_smp_ops),
|
.smp = smp_ops(r8a7790_smp_ops),
|
||||||
.init_early = r8a7790_init_early,
|
.init_early = shmobile_init_delay,
|
||||||
.init_time = rcar_gen2_timer_init,
|
.init_time = rcar_gen2_timer_init,
|
||||||
.init_late = shmobile_init_late,
|
.init_late = shmobile_init_late,
|
||||||
.reserve = rcar_gen2_reserve,
|
.reserve = rcar_gen2_reserve,
|
||||||
|
@ -33,15 +33,17 @@
|
|||||||
#include <linux/pm_domain.h>
|
#include <linux/pm_domain.h>
|
||||||
#include <linux/dma-mapping.h>
|
#include <linux/dma-mapping.h>
|
||||||
#include <linux/platform_data/sh_ipmmu.h>
|
#include <linux/platform_data/sh_ipmmu.h>
|
||||||
#include <mach/sh7372.h>
|
|
||||||
#include <asm/mach/map.h>
|
#include <asm/mach/map.h>
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
#include <asm/mach/time.h>
|
#include <asm/mach/time.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "dma-register.h"
|
#include "dma-register.h"
|
||||||
#include "irqs.h"
|
#include "irqs.h"
|
||||||
#include "pm-rmobile.h"
|
#include "pm-rmobile.h"
|
||||||
|
#include "sh7372.h"
|
||||||
|
|
||||||
static struct map_desc sh7372_io_desc[] __initdata = {
|
static struct map_desc sh7372_io_desc[] __initdata = {
|
||||||
/* create a 1:1 entity map for 0xe6xxxxxx
|
/* create a 1:1 entity map for 0xe6xxxxxx
|
||||||
|
@ -32,14 +32,16 @@
|
|||||||
#include <linux/sh_timer.h>
|
#include <linux/sh_timer.h>
|
||||||
#include <linux/platform_data/sh_ipmmu.h>
|
#include <linux/platform_data/sh_ipmmu.h>
|
||||||
#include <linux/platform_data/irq-renesas-intc-irqpin.h>
|
#include <linux/platform_data/irq-renesas-intc-irqpin.h>
|
||||||
#include <mach/sh73a0.h>
|
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
#include <asm/mach/map.h>
|
#include <asm/mach/map.h>
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
#include <asm/mach/time.h>
|
#include <asm/mach/time.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "dma-register.h"
|
#include "dma-register.h"
|
||||||
#include "irqs.h"
|
#include "irqs.h"
|
||||||
|
#include "sh73a0.h"
|
||||||
|
|
||||||
static struct map_desc sh73a0_io_desc[] __initdata = {
|
static struct map_desc sh73a0_io_desc[] __initdata = {
|
||||||
/* create a 1:1 entity map for 0xe6xxxxxx
|
/* create a 1:1 entity map for 0xe6xxxxxx
|
||||||
|
@ -17,10 +17,12 @@
|
|||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/smp.h>
|
#include <linux/smp.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
|
|
||||||
#include <asm/smp_plat.h>
|
#include <asm/smp_plat.h>
|
||||||
#include <mach/r8a7790.h>
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "pm-rcar.h"
|
#include "pm-rcar.h"
|
||||||
|
#include "r8a7790.h"
|
||||||
|
|
||||||
#define RST 0xe6160000
|
#define RST 0xe6160000
|
||||||
#define CA15BAR 0x0020
|
#define CA15BAR 0x0020
|
||||||
|
@ -22,10 +22,12 @@
|
|||||||
#include <linux/smp.h>
|
#include <linux/smp.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <mach/sh73a0.h>
|
|
||||||
#include <asm/smp_plat.h>
|
#include <asm/smp_plat.h>
|
||||||
#include <asm/smp_twd.h>
|
#include <asm/smp_twd.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
#include "sh73a0.h"
|
||||||
|
|
||||||
#define WUPCR IOMEM(0xe6151010)
|
#define WUPCR IOMEM(0xe6151010)
|
||||||
#define SRESCR IOMEM(0xe6151018)
|
#define SRESCR IOMEM(0xe6151018)
|
||||||
|
Loading…
Reference in New Issue
Block a user