[ARM] 2987/1: Replace map_desc.physical with map_desc.pfn: OMAP (9fe133b1) · Commits · 戴 / test

arch/arm/mach-omap1/board-innovator.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -103,8 +103,12 @@ static struct platform_device innovator_flash_device = {

		/* Only FPGA needs to be mapped here. All others are done with ioremap */
		static struct map_desc innovator1510_io_desc[] __initdata = {
		{ OMAP1510_FPGA_BASE, OMAP1510_FPGA_START, OMAP1510_FPGA_SIZE,
		MT_DEVICE },
		{
		.virtual = OMAP1510_FPGA_BASE,
		.pfn = __phys_to_pfn(OMAP1510_FPGA_START),
		.length = OMAP1510_FPGA_SIZE,
		.type = MT_DEVICE
		}
		};

		static struct resource innovator1510_smc91x_resources[] = {

arch/arm/mach-omap1/board-perseus2.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -134,8 +134,12 @@ void omap_perseus2_init_irq(void)

		/* Only FPGA needs to be mapped here. All others are done with ioremap */
		static struct map_desc omap_perseus2_io_desc[] __initdata = {
		{H2P2_DBG_FPGA_BASE, H2P2_DBG_FPGA_START, H2P2_DBG_FPGA_SIZE,
		MT_DEVICE},
		{
		.virtual = H2P2_DBG_FPGA_BASE,
		.pfn = __phys_to_pfn(H2P2_DBG_FPGA_START),
		.length = H2P2_DBG_FPGA_SIZE,
		.type = MT_DEVICE
		}
		};

		static void __init omap_perseus2_map_io(void)

arch/arm/mach-omap1/io.c

+39 −7

Original line number	Diff line number	Diff line
		@@ -26,27 +26,59 @@ extern void omap_sram_init(void);
		* default mapping provided here.
		*/
		static struct map_desc omap_io_desc[] __initdata = {
		{ IO_VIRT, IO_PHYS, IO_SIZE, MT_DEVICE },
		{
		.virtual = IO_VIRT,
		.pfn = __phys_to_pfn(IO_PHYS),
		.length = IO_SIZE,
		.type = MT_DEVICE
		}
		};

		#ifdef CONFIG_ARCH_OMAP730
		static struct map_desc omap730_io_desc[] __initdata = {
		{ OMAP730_DSP_BASE, OMAP730_DSP_START, OMAP730_DSP_SIZE, MT_DEVICE },
		{ OMAP730_DSPREG_BASE, OMAP730_DSPREG_START, OMAP730_DSPREG_SIZE, MT_DEVICE },
		{
		.virtual = OMAP730_DSP_BASE,
		.pfn = __phys_to_pfn(OMAP730_DSP_START),
		.length = OMAP730_DSP_SIZE,
		.type = MT_DEVICE
		}, {
		.virtual = OMAP730_DSPREG_BASE,
		.pfn = __phys_to_pfn(OMAP730_DSPREG_START),
		.length = OMAP730_DSPREG_SIZE,
		.type = MT_DEVICE
		}
		};
		#endif

		#ifdef CONFIG_ARCH_OMAP1510
		static struct map_desc omap1510_io_desc[] __initdata = {
		{ OMAP1510_DSP_BASE, OMAP1510_DSP_START, OMAP1510_DSP_SIZE, MT_DEVICE },
		{ OMAP1510_DSPREG_BASE, OMAP1510_DSPREG_START, OMAP1510_DSPREG_SIZE, MT_DEVICE },
		{
		.virtual = OMAP1510_DSP_BASE,
		.pfn = __phys_to_pfn(OMAP1510_DSP_START),
		.length = OMAP1510_DSP_SIZE,
		.type = MT_DEVICE
		}, {
		.virtual = OMAP1510_DSPREG_BASE,
		.pfn = __phys_to_pfn(OMAP1510_DSPREG_START),
		.length = OMAP1510_DSPREG_SIZE,
		.type = MT_DEVICE
		}
		};
		#endif

		#if defined(CONFIG_ARCH_OMAP16XX)
		static struct map_desc omap16xx_io_desc[] __initdata = {
		{ OMAP16XX_DSP_BASE, OMAP16XX_DSP_START, OMAP16XX_DSP_SIZE, MT_DEVICE },
		{ OMAP16XX_DSPREG_BASE, OMAP16XX_DSPREG_START, OMAP16XX_DSPREG_SIZE, MT_DEVICE },
		{
		.virtual = OMAP16XX_DSP_BASE,
		.pfn = __phys_to_pfn(OMAP16XX_DSP_START),
		.length = OMAP16XX_DSP_SIZE,
		.type = MT_DEVICE
		}, {
		.virtual = OMAP16XX_DSPREG_BASE,
		.pfn = __phys_to_pfn(OMAP16XX_DSPREG_START),
		.length = OMAP16XX_DSPREG_SIZE,
		.type = MT_DEVICE
		}
		};
		#endif

arch/arm/plat-omap/sram.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,11 @@ void __init omap_detect_sram(void)
		}

		static struct map_desc omap_sram_io_desc[] __initdata = {
		{ OMAP1_SRAM_BASE, OMAP1_SRAM_START, 0, MT_DEVICE }
		{ /* .length gets filled in at runtime */
		.virtual = OMAP1_SRAM_BASE,
		.pfn = __phys_to_pfn(OMAP1_SRAM_START),
		.type = MT_DEVICE
		}
		};

		/*

Admin message