Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7db2c15 authored by Stephen Warren's avatar Stephen Warren Committed by Olof Johansson
Browse files

arm/tegra: Add device-tree support for TrimSlice board 



* Add device-tree file for TrimSlice
* Add that to the list of .dts files to build
* Update board-dt.c to recognize TrimSlice board name

v2: Makefile: Add board-trimslice-pinmux.c to obj-$(CONFIG_MACH_TEGRA_DT).
v3: Makefile: Use brackets not braces around var names

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 64f88ec3

arch/arm/boot/dts/tegra-trimslice.dts

0 → 100644
+38 −0
Original line number Diff line number Diff line 
/dts-v1/;



/memreserve/ 0x1c000000 0x04000000;

/include/ "tegra20.dtsi"



/ {

	model = "Compulab TrimSlice board";

	compatible = "compulab,trimslice", "nvidia,tegra20";



	chosen {

		bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk0p1 rw rootwait";

	};



	memory@0 {

		reg = < 0x00000000 0x40000000 >;

	};



	i2c@7000c000 {

		clock-frequency = <400000>;

	};



	i2c@7000c400 {

		clock-frequency = <400000>;

	};



	i2c@7000c500 {

		clock-frequency = <400000>;

	};



	serial@70006000 {

		clock-frequency = < 216000000 >;

	};



	sdhci@c8000600 {

		cd-gpios = <&gpio 121 0>;

		wp-gpios = <&gpio 122 0>;

	};

};

arch/arm/mach-tegra/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ obj-$(CONFIG_MACH_SEABOARD) += board-seaboard-pinmux.o 
obj-$(CONFIG_MACH_TEGRA_DT)             += board-dt.o

obj-$(CONFIG_MACH_TEGRA_DT)             += board-harmony-pinmux.o

obj-$(CONFIG_MACH_TEGRA_DT)             += board-seaboard-pinmux.o

obj-$(CONFIG_MACH_TEGRA_DT)             += board-trimslice-pinmux.o



obj-$(CONFIG_MACH_TRIMSLICE)            += board-trimslice.o

obj-$(CONFIG_MACH_TRIMSLICE)            += board-trimslice-pinmux.o

arch/arm/mach-tegra/Makefile.boot

+1 −0
Original line number Diff line number Diff line
@@ -4,4 +4,5 @@ initrd_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00800000 


dtb-$(CONFIG_MACH_HARMONY) += tegra-harmony.dtb

dtb-$(CONFIG_MACH_SEABOARD) += tegra-seaboard.dtb

dtb-$(CONFIG_MACH_TRIMSLICE) += tegra-trimslice.dtb

dtb-$(CONFIG_MACH_VENTANA) += tegra-ventana.dtb

arch/arm/mach-tegra/board-dt.c

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 


void harmony_pinmux_init(void);

void seaboard_pinmux_init(void);

void trimslice_pinmux_init(void);

void ventana_pinmux_init(void);



struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {
@@ -93,6 +94,7 @@ static struct { 
	char *machine;

	void (*init)(void);

} pinmux_configs[] = {

	{ "compulab,trimslice", trimslice_pinmux_init },

	{ "nvidia,harmony", harmony_pinmux_init },

	{ "nvidia,seaboard", seaboard_pinmux_init },

	{ "nvidia,ventana", ventana_pinmux_init },
@@ -129,6 +131,7 @@ static void __init tegra_dt_init(void) 
}



static const char * tegra_dt_board_compat[] = {

	"compulab,trimslice",

	"nvidia,harmony",

	"nvidia,seaboard",

	"nvidia,ventana",