[ARM] 2983/1: Replace map_desc.physical with map_desc.pfn: IOP3xx (4835e64a) · Commits · 戴 / test

arch/arm/mach-iop3xx/iop321-setup.c

+11 −7

Original line number	Diff line number	Diff line
		@@ -38,13 +38,17 @@
		* Standard IO mapping for all IOP321 based systems
		*/
		static struct map_desc iop321_std_desc[] __initdata = {
		/* virtual physical length type */

		/* mem mapped registers */
		{ IOP321_VIRT_MEM_BASE, IOP321_PHYS_MEM_BASE, 0x00002000, MT_DEVICE },

		/* PCI IO space */
		{ IOP321_PCI_LOWER_IO_VA, IOP321_PCI_LOWER_IO_PA, IOP321_PCI_IO_WINDOW_SIZE, MT_DEVICE }
		{ /* mem mapped registers */
		.virtual = IOP321_VIRT_MEM_BASE,
		.pfn = __phys_to_pfn(IOP321_PHYS_MEM_BASE),
		.length = 0x00002000,
		.type = MT_DEVICE
		}, { /* PCI IO space */
		.virtual = IOP321_PCI_LOWER_IO_VA,
		.pfn = __phys_to_pfn(IOP321_PCI_LOWER_IO_PA),
		.length = IOP321_PCI_IO_WINDOW_SIZE,
		.type = MT_DEVICE
		}
		};

		#ifdef CONFIG_ARCH_IQ80321

+11 −7

Original line number	Diff line number	Diff line
		@@ -37,13 +37,17 @@
		* Standard IO mapping for all IOP331 based systems
		*/
		static struct map_desc iop331_std_desc[] __initdata = {
		/* virtual physical length type */

		/* mem mapped registers */
		{ IOP331_VIRT_MEM_BASE, IOP331_PHYS_MEM_BASE, 0x00002000, MT_DEVICE },

		/* PCI IO space */
		{ IOP331_PCI_LOWER_IO_VA, IOP331_PCI_LOWER_IO_PA, IOP331_PCI_IO_WINDOW_SIZE, MT_DEVICE }
		{ /* mem mapped registers */
		.virtual = IOP331_VIRT_MEM_BASE,
		.pfn = __phys_to_pfn(IOP331_PHYS_MEM_BASE),
		.length = 0x00002000,
		.type = MT_DEVICE
		}, { /* PCI IO space */
		.virtual = IOP331_PCI_LOWER_IO_VA,
		.pfn = __phys_to_pfn(IOP331_PCI_LOWER_IO_PA),
		.length = IOP331_PCI_IO_WINDOW_SIZE,
		.type = MT_DEVICE
		}
		};

		static struct uart_port iop331_serial_ports[] = {

+6 −4

Original line number	Diff line number	Diff line
		@@ -29,10 +29,12 @@
		* We use RedBoot's setup for the onboard devices.
		*/
		static struct map_desc iq31244_io_desc[] __initdata = {
		/* virtual physical length type */

		/* on-board devices */
		{ IQ31244_UART, IQ31244_UART, 0x00100000, MT_DEVICE }
		{ /* on-board devices */
		.virtual = IQ31244_UART,
		.pfn = __phys_to_pfn(IQ31244_UART),
		.length = 0x00100000,
		.type = MT_DEVICE
		}
		};

		void __init iq31244_map_io(void)

+6 −4

Original line number	Diff line number	Diff line
		@@ -29,10 +29,12 @@
		* We use RedBoot's setup for the onboard devices.
		*/
		static struct map_desc iq80321_io_desc[] __initdata = {
		/* virtual physical length type */

		/* on-board devices */
		{ IQ80321_UART, IQ80321_UART, 0x00100000, MT_DEVICE }
		{ /* on-board devices */
		.virtual = IQ80321_UART,
		.pfn = __phys_to_pfn(IQ80321_UART),
		.length = 0x00100000,
		.type = MT_DEVICE
		}
		};

		void __init iq80321_map_io(void)