From 385b6cdb15147f2c2ec5ba2f043de7a53fe1ba4d Mon Sep 17 00:00:00 2001 From: Evgeny Voevodin Date: Wed, 11 Apr 2012 10:32:10 +0400 Subject: [PATCH] ARM: S5P: Add virtio-mmio-net and virtio-mmio-blk devices. Signed-off-by: Evgeny Voevodin --- arch/arm/plat-samsung/devs.c | 30 +++++++++++++++++++++++ arch/arm/plat-samsung/include/plat/devs.h | 2 ++ 2 files changed, 32 insertions(+) diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 8b928f9bc1c3..38f734778c7f 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -1352,6 +1352,36 @@ struct platform_device s5p_device_mixer = { }; #endif /* CONFIG_S5P_DEV_TV */ +#ifdef CONFIG_VIRTIO_MMIO +#ifdef CONFIG_VIRTIO_BLK +static struct resource s5p_virtio_mmio_blk_resources[] = { + [0] = DEFINE_RES_MEM(0x10AD0000, SZ_4K), + [1] = DEFINE_RES_IRQ(IRQ_EINT(7)), +}; + +struct platform_device s5p_virtio_mmio_blk_device = { + .name = "virtio-mmio", + .id = 0, + .resource = s5p_virtio_mmio_blk_resources, + .num_resources = ARRAY_SIZE(s5p_virtio_mmio_blk_resources), +}; +#endif /* CONFIG_VIRTIO_BLK */ + +#ifdef CONFIG_VIRTIO_NET +static struct resource s5p_virtio_mmio_net_resources[] = { + [0] = DEFINE_RES_MEM(0x10AC0000, SZ_4K), + [1] = DEFINE_RES_IRQ(IRQ_EINT(6)), +}; + +struct platform_device s5p_virtio_mmio_net_device = { + .name = "virtio-mmio", + .id = -1, + .resource = s5p_virtio_mmio_net_resources, + .num_resources = ARRAY_SIZE(s5p_virtio_mmio_net_resources), +}; +#endif /* CONFIG_VIRTIO_NET */ +#endif /* CONFIG_VIRTIO_MMIO */ + /* USB */ #ifdef CONFIG_S3C_DEV_USB_HOST diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index 2155d4af62a3..ff1b77a8befe 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h @@ -94,6 +94,8 @@ extern struct platform_device s5p_device_mipi_csis1; extern struct platform_device s5p_device_mixer; extern struct platform_device s5p_device_onenand; extern struct platform_device s5p_device_sdo; +extern struct platform_device s5p_virtio_mmio_blk_device; +extern struct platform_device s5p_virtio_mmio_net_device; extern struct platform_device s5p6440_device_iis; extern struct platform_device s5p6440_device_pcm; -- 2.34.1