ARM: imx: dynamically register imx-uart devices (imx25) (7cc3c846) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/arm/mach-mx25/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ comment "MX25 platforms:"

		config MACH_MX25_3DS
		bool "Support MX25PDK (3DS) Platform"
		select IMX_HAVE_PLATFORM_IMX_UART
		select IMX_HAVE_PLATFORM_MXC_NAND

		endif

arch/arm/mach-mx25/devices-imx25.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,17 @@
		#define imx25_add_imx_i2c2(pdata) \
		imx_add_imx_i2c(2, MX25_I2C3_BASE_ADDR, SZ_16K, MX25_INT_I2C3, pdata)

		#define imx25_add_imx_uart0(pdata) \
		imx_add_imx_uart_1irq(0, MX25_UART1_BASE_ADDR, SZ_16K, MX25_INT_UART1, pdata)
		#define imx25_add_imx_uart1(pdata) \
		imx_add_imx_uart_1irq(1, MX25_UART2_BASE_ADDR, SZ_16K, MX25_INT_UART2, pdata)
		#define imx25_add_imx_uart2(pdata) \
		imx_add_imx_uart_1irq(2, MX25_UART3_BASE_ADDR, SZ_16K, MX25_INT_UART3, pdata)
		#define imx25_add_imx_uart3(pdata) \
		imx_add_imx_uart_1irq(3, MX25_UART4_BASE_ADDR, SZ_16K, MX25_INT_UART4, pdata)
		#define imx25_add_imx_uart4(pdata) \
		imx_add_imx_uart_1irq(4, MX25_UART5_BASE_ADDR, SZ_16K, MX25_INT_UART5, pdata)

		#define imx25_add_mxc_nand(pdata) \
		imx_add_mxc_nand_v21(MX25_NFC_BASE_ADDR, MX25_INT_NANDFC, pdata)

arch/arm/mach-mx25/devices.c

+0 −95

Original line number	Diff line number	Diff line
		@@ -22,101 +22,6 @@
		#include <mach/mx25.h>
		#include <mach/irqs.h>

		static struct resource uart0[] = {
		{
		.start = 0x43f90000,
		.end = 0x43f93fff,
		.flags = IORESOURCE_MEM,
		}, {
		.start = 45,
		.end = 45,
		.flags = IORESOURCE_IRQ,
		},
		};

		struct platform_device mxc_uart_device0 = {
		.name = "imx-uart",
		.id = 0,
		.resource = uart0,
		.num_resources = ARRAY_SIZE(uart0),
		};

		static struct resource uart1[] = {
		{
		.start = 0x43f94000,
		.end = 0x43f97fff,
		.flags = IORESOURCE_MEM,
		}, {
		.start = 32,
		.end = 32,
		.flags = IORESOURCE_IRQ,
		},
		};

		struct platform_device mxc_uart_device1 = {
		.name = "imx-uart",
		.id = 1,
		.resource = uart1,
		.num_resources = ARRAY_SIZE(uart1),
		};

		static struct resource uart2[] = {
		{
		.start = 0x5000c000,
		.end = 0x5000ffff,
		.flags = IORESOURCE_MEM,
		}, {
		.start = 18,
		.end = 18,
		.flags = IORESOURCE_IRQ,
		},
		};

		struct platform_device mxc_uart_device2 = {
		.name = "imx-uart",
		.id = 2,
		.resource = uart2,
		.num_resources = ARRAY_SIZE(uart2),
		};

		static struct resource uart3[] = {
		{
		.start = 0x50008000,
		.end = 0x5000bfff,
		.flags = IORESOURCE_MEM,
		}, {
		.start = 5,
		.end = 5,
		.flags = IORESOURCE_IRQ,
		},
		};

		struct platform_device mxc_uart_device3 = {
		.name = "imx-uart",
		.id = 3,
		.resource = uart3,
		.num_resources = ARRAY_SIZE(uart3),
		};

		static struct resource uart4[] = {
		{
		.start = 0x5002c000,
		.end = 0x5002ffff,
		.flags = IORESOURCE_MEM,
		}, {
		.start = 40,
		.end = 40,
		.flags = IORESOURCE_IRQ,
		},
		};

		struct platform_device mxc_uart_device4 = {
		.name = "imx-uart",
		.id = 4,
		.resource = uart4,
		.num_resources = ARRAY_SIZE(uart4),
		};

		#define MX25_OTG_BASE_ADDR 0x53FF4000

		static u64 otg_dmamask = DMA_BIT_MASK(32);

arch/arm/mach-mx25/devices.h

+0 −5

Original line number	Diff line number	Diff line
		extern struct platform_device mxc_uart_device0;
		extern struct platform_device mxc_uart_device1;
		extern struct platform_device mxc_uart_device2;
		extern struct platform_device mxc_uart_device3;
		extern struct platform_device mxc_uart_device4;
		extern struct platform_device mxc_otg;
		extern struct platform_device otg_udc_device;
		extern struct platform_device mxc_usbh2;

arch/arm/mach-mx25/mach-mx25_3ds.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@
		#include <asm/memory.h>
		#include <asm/mach/map.h>
		#include <mach/common.h>
		#include <mach/imx-uart.h>
		#include <mach/mx25.h>
		#include <mach/imxfb.h>
		#include <mach/iomux-mx25.h>
		@@ -46,7 +45,7 @@
		#include "devices-imx25.h"
		#include "devices.h"

		static struct imxuart_platform_data uart_pdata = {
		static const struct imxuart_platform_data uart_pdata __initconst = {
		.flags = IMXUART_HAVE_RTSCTS,
		};

		@@ -150,7 +149,7 @@ static void __init mx25pdk_init(void)
		mxc_iomux_v3_setup_multiple_pads(mx25pdk_pads,
		ARRAY_SIZE(mx25pdk_pads));

		mxc_register_device(&mxc_uart_device0, &uart_pdata);
		imx25_add_imx_uart0(&uart_pdata);
		mxc_register_device(&mxc_usbh2, NULL);
		imx25_add_mxc_nand(&mx25pdk_nand_board_info);
		mxc_register_device(&mx25_rtc_device, NULL);