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

Commit fbe1d5b0 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v3.17/dt' into omap-for-v3.18/dt 

Merge the gta04 related changes that were too late for v3.17
parents 69e273c0 c9940680

arch/arm/boot/dts/Makefile

+3 −1
Original line number Original line Diff line number Diff line
@@ -286,7 +286,9 @@ dtb-$(CONFIG_ARCH_OMAP3) += am3517-craneboard.dtb \ 
	omap3-devkit8000.dtb \

	omap3-devkit8000.dtb \

	omap3-evm.dtb \

	omap3-evm.dtb \

	omap3-evm-37xx.dtb \

	omap3-evm-37xx.dtb \

	omap3-gta04.dtb \

	omap3-gta04a3.dtb \

	omap3-gta04a4.dtb \

	omap3-gta04a5.dtb \

	omap3-igep0020.dtb \

	omap3-igep0020.dtb \

	omap3-igep0030.dtb \

	omap3-igep0030.dtb \

	omap3-ldp.dtb \

	omap3-ldp.dtb \

arch/arm/boot/dts/omap3-gta04.dts→arch/arm/boot/dts/omap3-gta04.dtsi

+145 −5
Original line number Original line Diff line number Diff line
@@ -26,6 +26,10 @@ 
		reg = <0x80000000 0x20000000>; /* 512 MB */

		reg = <0x80000000 0x20000000>; /* 512 MB */

	};

	};





	aliases {

		display0 = &lcd;

	};



	gpio-keys {

	gpio-keys {

		compatible = "gpio-keys";

		compatible = "gpio-keys";
@@ -74,9 +78,30 @@ 
			};

			};

		};

		};

	};

	};



	hsusb2_phy: hsusb2_phy {

		compatible = "usb-nop-xceiv";

		reset-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;

	};

};

};





&omap3_pmx_core {

&omap3_pmx_core {

	pinctrl-names = "default";

	pinctrl-0 = <

			&hsusb2_pins

	>;



	hsusb2_pins: pinmux_hsusb2_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21d4, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi1_cs3.hsusb2_data2 */

			OMAP3_CORE1_IOPAD(0x21d6, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_clk.hsusb2_data7 */

			OMAP3_CORE1_IOPAD(0x21d8, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_simo.hsusb2_data4 */

			OMAP3_CORE1_IOPAD(0x21da, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_somi.hsusb2_data5 */

			OMAP3_CORE1_IOPAD(0x21dc, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_cs0.hsusb2_data6 */

			OMAP3_CORE1_IOPAD(0x21de, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* mcspi2_cs1.hsusb2_data3 */

		>;

	};



	uart1_pins: pinmux_uart1_pins {

	uart1_pins: pinmux_uart1_pins {

		pinctrl-single,pins = <

		pinctrl-single,pins = <

			0x152 (PIN_INPUT | MUX_MODE0)		/* uart1_rx.uart1_rx */

			0x152 (PIN_INPUT | MUX_MODE0)		/* uart1_rx.uart1_rx */
@@ -141,12 +166,31 @@ 
                       0x0da (PIN_OUTPUT | MUX_MODE0)   /* dss_data23.dss_data23 */

                       0x0da (PIN_OUTPUT | MUX_MODE0)   /* dss_data23.dss_data23 */

               >;

               >;

       };

       };

};



&omap3_pmx_core2 {

	pinctrl-names = "default";

	pinctrl-0 = <

			&hsusb2_2_pins

	>;



	hsusb2_2_pins: pinmux_hsusb2_2_pins {

		pinctrl-single,pins = <

			OMAP3630_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3)		/* etk_d10.hsusb2_clk */

			OMAP3630_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3)		/* etk_d11.hsusb2_stp */

			OMAP3630_CORE2_IOPAD(0x25f4, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d12.hsusb2_dir */

			OMAP3630_CORE2_IOPAD(0x25f6, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d13.hsusb2_nxt */

			OMAP3630_CORE2_IOPAD(0x25f8, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d14.hsusb2_data0 */

			OMAP3630_CORE2_IOPAD(0x25fa, PIN_INPUT_PULLDOWN | MUX_MODE3)	/* etk_d15.hsusb2_data1 */

		>;

	};





	spi_gpio_pins: spi_gpio_pinmux {

	spi_gpio_pins: spi_gpio_pinmux {

		pinctrl-single,pins = <0x5a8 (PIN_OUTPUT | MUX_MODE4) /* clk */

		pinctrl-single,pins = <

			0x5b6 (PIN_OUTPUT | MUX_MODE4) /* cs */

			OMAP3630_CORE2_IOPAD(0x25d8, PIN_OUTPUT | MUX_MODE4) /* clk */

			0x5b8 (PIN_OUTPUT | MUX_MODE4) /* tx */

			OMAP3630_CORE2_IOPAD(0x25e6, PIN_OUTPUT | MUX_MODE4) /* cs */

			0x5b4 (PIN_INPUT | MUX_MODE4) /* rx */

			OMAP3630_CORE2_IOPAD(0x25e8, PIN_OUTPUT | MUX_MODE4) /* tx */

			OMAP3630_CORE2_IOPAD(0x25e4, PIN_INPUT | MUX_MODE4) /* rx */

		>;

		>;

	};

	};

};

};
@@ -196,6 +240,9 @@ 
		#size-cells = <0>;

		#size-cells = <0>;

		reg = <0x45>;

		reg = <0x45>;





		gpio-controller;

		#gpio-cells = <2>;



		gta04_led0: red_aux@0 {

		gta04_led0: red_aux@0 {

			label = "gta04:red:aux";

			label = "gta04:red:aux";

			reg = <0x0>;

			reg = <0x0>;
@@ -216,11 +263,16 @@ 
			label = "gta04:green:power";

			label = "gta04:green:power";

			reg = <0x4>;

			reg = <0x4>;

		};

		};



		wifi_reset: wifi_reset@6 {

			reg = <0x6>;

			compatible = "gpio";

		};

	};

	};





	/* compass aka magnetometer */

	/* compass aka magnetometer */

	hmc5843@1e {

	hmc5843@1e {

		compatible = "honeywell,hmc5843";

		compatible = "honeywell,hmc5883l";

		reg = <0x1e>;

		reg = <0x1e>;

	};

	};
@@ -248,6 +300,14 @@ 
	power = <50>;

	power = <50>;

};

};





&usbhshost {

	port2-mode = "ehci-phy";

};



&usbhsehci {

	phys = <0 &hsusb2_phy>;

};



&mmc1 {

&mmc1 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	pinctrl-0 = <&mmc1_pins>;
@@ -286,11 +346,37 @@ 
	bb_uamp = <150>;

	bb_uamp = <150>;

};

};





/* spare */

&vaux1 {

	regulator-min-microvolt = <2500000>;

	regulator-max-microvolt = <3000000>;

};



/* sensors */

&vaux2 {

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <2800000>;

	regulator-always-on;

};



/* camera */

&vaux3 {

	regulator-min-microvolt = <2500000>;

	regulator-max-microvolt = <2500000>;

};



/* WLAN/BT */

&vaux4 {

&vaux4 {

	regulator-min-microvolt = <2800000>;

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <3150000>;

	regulator-max-microvolt = <3150000>;

};

};





/* GPS LNA */

&vsim {

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <3150000>;

};



/* Needed to power the DPI pins */

/* Needed to power the DPI pins */

&vpll2 {

&vpll2 {

	regulator-always-on;

	regulator-always-on;
@@ -309,3 +395,57 @@ 
		};

		};

	};

	};

};

};



&gpmc {

	ranges = <0 0 0x30000000 0x04>; /* CS0: NAND */



	nand@0,0 {

		reg = <0 0 0>; /* CS0, offset 0 */

		nand-bus-width = <16>;

		ti,nand-ecc-opt = "bch8";



		gpmc,sync-clk-ps = <0>;

		gpmc,cs-on-ns = <0>;

		gpmc,cs-rd-off-ns = <44>;

		gpmc,cs-wr-off-ns = <44>;

		gpmc,adv-on-ns = <6>;

		gpmc,adv-rd-off-ns = <34>;

		gpmc,adv-wr-off-ns = <44>;

		gpmc,we-off-ns = <40>;

		gpmc,oe-off-ns = <54>;

		gpmc,access-ns = <64>;

		gpmc,rd-cycle-ns = <82>;

		gpmc,wr-cycle-ns = <82>;

		gpmc,wr-access-ns = <40>;

		gpmc,wr-data-mux-bus-ns = <0>;

		gpmc,device-width = <2>;



		#address-cells = <1>;

		#size-cells = <1>;



		x-loader@0 {

			label = "X-Loader";

			reg = <0 0x80000>;

		};



		bootloaders@80000 {

			label = "U-Boot";

			reg = <0x80000 0x1e0000>;

		};



		bootloaders_env@260000 {

			label = "U-Boot Env";

			reg = <0x260000 0x20000>;

		};



		kernel@280000 {

			label = "Kernel";

			reg = <0x280000 0x400000>;

		};



		filesystem@680000 {

			label = "File System";

			reg = <0x680000 0xf980000>;

		};

	};

};

arch/arm/boot/dts/omap3-gta04a3.dts

0 → 100644
+48 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2014 H. Nikolaus Schaller <hns@goldelico.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include "omap3-gta04.dtsi"



/ {

	model = "Goldelico GTA04A3";

};



&i2c2 {



	/* alternate accelerometer that might be installed on some GTA04A3 boards */

	lis302@1d {

		compatible = "st,lis331dlh", "st,lis3lv02d";

		reg = <0x1d>;

		interrupt-parent = <&gpio3>;

		interrupts = <18 (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_EDGE_RISING)>;

		Vdd-supply = <&vaux2>;

		Vdd_IO-supply = <&vaux2>;



		st,click-single-x;

		st,click-single-y;

		st,click-single-z;

		st,click-thresh-x = <8>;

		st,click-thresh-y = <8>;

		st,click-thresh-z = <10>;

		st,click-click-time-limit = <9>;

		st,click-latency = <50>;

		st,irq1-click;

		st,wakeup-x-lo;

		st,wakeup-x-hi;

		st,wakeup-y-lo;

		st,wakeup-y-hi;

		st,wakeup-z-lo;

		st,wakeup-z-hi;

		st,min-limit-x = <32>;

		st,min-limit-y = <3>;

		st,min-limit-z = <3>;

		st,max-limit-x = <3>;

		st,max-limit-y = <32>;

		st,max-limit-z = <32>;

	};

};

arch/arm/boot/dts/omap3-gta04a4.dts

0 → 100644
+13 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2014 Marek Belisko <marek@goldelico.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include "omap3-gta04.dtsi"



/ {

	model = "Goldelico GTA04A4";

};

arch/arm/boot/dts/omap3-gta04a5.dts

0 → 100644
+17 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2014 H. Nikolaus Schaller <hns@goldelico.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include "omap3-gta04.dtsi"



/ {

	model = "Goldelico GTA04A5";



	sound {

		ti,jack-det-gpio = <&twl_gpio 2 0>;    /* GTA04A5 only */

	};

};