ARM i.MX31: Add devicetree support (d2a37b3d) · Commits · e / devices / android_kernel_samsung_universal8895

arch/arm/boot/dts/imx31.dtsi

0 → 100644

+88 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2012 Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
		*
		* The code contained herein is licensed under the GNU General Public
		* License. You may obtain a copy of the GNU General Public License
		* Version 2 or later at the following locations:
		*
		* http://www.opensource.org/licenses/gpl-license.html
		* http://www.gnu.org/copyleft/gpl.html
		*/

		/include/ "skeleton.dtsi"

		/ {
		aliases {
		serial0 = &uart1;
		serial1 = &uart2;
		serial2 = &uart3;
		serial3 = &uart4;
		serial4 = &uart5;
		};

		avic: avic-interrupt-controller@60000000 {
		compatible = "fsl,imx31-avic", "fsl,avic";
		interrupt-controller;
		#interrupt-cells = <1>;
		reg = <0x60000000 0x100000>;
		};

		soc {
		#address-cells = <1>;
		#size-cells = <1>;
		compatible = "simple-bus";
		interrupt-parent = <&avic>;
		ranges;

		aips@43f00000 { /* AIPS1 */
		compatible = "fsl,aips-bus", "simple-bus";
		#address-cells = <1>;
		#size-cells = <1>;
		reg = <0x43f00000 0x100000>;
		ranges;

		uart1: serial@43f90000 {
		compatible = "fsl,imx31-uart", "fsl,imx21-uart";
		reg = <0x43f90000 0x4000>;
		interrupts = <45>;
		status = "disabled";
		};

		uart2: serial@43f94000 {
		compatible = "fsl,imx31-uart", "fsl,imx21-uart";
		reg = <0x43f94000 0x4000>;
		interrupts = <32>;
		status = "disabled";
		};

		uart4: serial@43fb0000 {
		compatible = "fsl,imx31-uart", "fsl,imx21-uart";
		reg = <0x43fb0000 0x4000>;
		interrupts = <46>;
		status = "disabled";
		};

		uart5: serial@43fb4000 {
		compatible = "fsl,imx31-uart", "fsl,imx21-uart";
		reg = <0x43fb4000 0x4000>;
		interrupts = <47>;
		status = "disabled";
		};
		};

		spba@50000000 {
		compatible = "fsl,spba-bus", "simple-bus";
		#address-cells = <1>;
		#size-cells = <1>;
		reg = <0x50000000 0x100000>;
		ranges;

		uart3: serial@5000c000 {
		compatible = "fsl,imx31-uart", "fsl,imx21-uart";
		reg = <0x5000c000 0x4000>;
		interrupts = <18>;
		status = "disabled";
		};
		};
		};
		};

arch/arm/mach-imx/Kconfig

+8 −0

Original line number	Diff line number	Diff line
		@@ -557,6 +557,14 @@ config MACH_BUG
		Include support for BUGBase 1.3 platform. This includes specific
		configurations for the board and its peripherals.

		config MACH_IMX31_DT
		bool "Support i.MX31 platforms from device tree"
		select SOC_IMX31
		select USE_OF
		help
		Include support for Freescale i.MX31 based platforms
		using the device tree for discovery.

		comment "MX35 platforms:"

		config MACH_PCM043

arch/arm/mach-imx/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ obj-$(CONFIG_MACH_QONG) += mach-qong.o
		obj-$(CONFIG_MACH_ARMADILLO5X0) += mach-armadillo5x0.o
		obj-$(CONFIG_MACH_KZM_ARM11_01) += mach-kzm_arm11_01.o
		obj-$(CONFIG_MACH_BUG) += mach-bug.o
		obj-$(CONFIG_MACH_IMX31_DT) += imx31-dt.o

		# i.MX35 based machines
		obj-$(CONFIG_MACH_PCM043) += mach-pcm043.o

arch/arm/mach-imx/clk-imx31.c

+19 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include <linux/clkdev.h>
		#include <linux/io.h>
		#include <linux/err.h>
		#include <linux/of.h>

		#include <mach/hardware.h>
		#include <mach/mx31.h>
		@@ -179,3 +180,21 @@ int __init mx31_clocks_init(unsigned long fref)

		return 0;
		}

		#ifdef CONFIG_OF
		int __init mx31_clocks_init_dt(void)
		{
		struct device_node *np;
		u32 fref = 26000000; /* default */

		for_each_compatible_node(np, NULL, "fixed-clock") {
		if (!of_device_is_compatible(np, "fsl,imx-osc26m"))
		continue;

		if (!of_property_read_u32(np, "clock-frequency", &fref))
		break;
		}

		return mx31_clocks_init(fref);
		}
		#endif

arch/arm/mach-imx/imx31-dt.c

0 → 100644

+63 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2012 Sascha Hauer, Pengutronix
		*
		* The code contained herein is licensed under the GNU General Public
		* License. You may obtain a copy of the GNU General Public License
		* Version 2 or later at the following locations:
		*
		* http://www.opensource.org/licenses/gpl-license.html
		* http://www.gnu.org/copyleft/gpl.html
		*/

		#include <linux/irq.h>
		#include <linux/of_irq.h>
		#include <linux/of_platform.h>
		#include <asm/mach/arch.h>
		#include <asm/mach/time.h>
		#include <mach/common.h>
		#include <mach/mx31.h>

		static const struct of_dev_auxdata imx31_auxdata_lookup[] __initconst = {
		OF_DEV_AUXDATA("fsl,imx31-uart", MX31_UART1_BASE_ADDR,
		"imx21-uart.0", NULL),
		OF_DEV_AUXDATA("fsl,imx31-uart", MX31_UART2_BASE_ADDR,
		"imx21-uart.1", NULL),
		OF_DEV_AUXDATA("fsl,imx31-uart", MX31_UART3_BASE_ADDR,
		"imx21-uart.2", NULL),
		OF_DEV_AUXDATA("fsl,imx31-uart", MX31_UART4_BASE_ADDR,
		"imx21-uart.3", NULL),
		OF_DEV_AUXDATA("fsl,imx31-uart", MX31_UART5_BASE_ADDR,
		"imx21-uart.4", NULL),
		{ /* sentinel */ }
		};

		static void __init imx31_dt_init(void)
		{
		of_platform_populate(NULL, of_default_bus_match_table,
		imx31_auxdata_lookup, NULL);
		}

		static void __init imx31_timer_init(void)
		{
		mx31_clocks_init_dt();
		}

		static struct sys_timer imx31_timer = {
		.init = imx31_timer_init,
		};

		static const char *imx31_dt_board_compat[] __initdata = {
		"fsl,imx31",
		NULL
		};

		DT_MACHINE_START(IMX31_DT, "Freescale i.MX31 (Device Tree Support)")
		.map_io = mx31_map_io,
		.init_early = imx31_init_early,
		.init_irq = mx31_init_irq,
		.handle_irq = imx31_handle_irq,
		.timer = &imx31_timer,
		.init_machine = imx31_dt_init,
		.dt_compat = imx31_dt_board_compat,
		.restart = mxc_restart,
		MACHINE_END