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

Commit 6ec4ed82 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-dt-for-v3.5' of... 

Merge tag 'omap-dt-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Minor DT updates based on the dt-missed-3.4 branch

By Benoit Cousson (3) and Peter Ujfalusi (2)
via Tony Lindgren
* tag 'omap-dt-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  arm/dts: omap4-panda: Add LEDs support
  arm/dts: omap4-sdp: Add LEDs support
  arm/dts: twl4030: Add twl4030-gpio node
  OMAP4: devices: Do not create mcpdm device if the dtb has been provided
  OMAP4: devices: Do not create dmic device if the dtb has been provided
parents 70888a4b 40364b9f

arch/arm/boot/dts/omap4-panda.dts

+15 −0
Original line number Diff line number Diff line
@@ -17,6 +17,21 @@ 
		device_type = "memory";

		reg = <0x80000000 0x40000000>; /* 1 GB */

	};



	leds {

		compatible = "gpio-leds";

		heartbeat {

			label = "pandaboard::status1";

			gpios = <&gpio1 7 0>;

			linux,default-trigger = "heartbeat";

		};



		mmc {

			label = "pandaboard::status2";

			gpios = <&gpio1 8 0>;

			linux,default-trigger = "mmc0";

		};

	};

};



&i2c1 {

arch/arm/boot/dts/omap4-sdp.dts

+43 −0
Original line number Diff line number Diff line
@@ -27,6 +27,49 @@ 
		enable-active-high;

		regulator-boot-on;

	};



	leds {

		compatible = "gpio-leds";

		debug0 {

			label = "omap4:green:debug0";

			gpios = <&gpio2 29 0>; /* 61 */

		};



		debug1 {

			label = "omap4:green:debug1";

			gpios = <&gpio1 30 0>; /* 30 */

		};



		debug2 {

			label = "omap4:green:debug2";

			gpios = <&gpio1 7 0>; /* 7 */

		};



		debug3 {

			label = "omap4:green:debug3";

			gpios = <&gpio1 8 0>; /* 8 */

		};



		debug4 {

			label = "omap4:green:debug4";

			gpios = <&gpio2 18 0>; /* 50 */

		};



		user1 {

			label = "omap4:blue:user";

			gpios = <&gpio6 9 0>; /* 169 */

		};



		user2 {

			label = "omap4:red:user";

			gpios = <&gpio6 10 0>; /* 170 */

		};



		user3 {

			label = "omap4:green:user";

			gpios = <&gpio5 11 0>; /* 139 */

		};

	};

};



&i2c1 {

arch/arm/boot/dts/twl4030.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -36,4 +36,12 @@ 
		regulator-min-microvolt = <1850000>;

		regulator-max-microvolt = <3150000>;

	};



	twl_gpio: gpio {

		compatible = "ti,twl4030-gpio";

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <1>;

	};

};

arch/arm/mach-omap2/devices.c

+4 −3
Original line number Diff line number Diff line
@@ -701,13 +701,14 @@ static int __init omap2_init_devices(void) 
	 * in alphabetical order so they're easier to sort through.

	 */

	omap_init_audio();

	omap_init_mcpdm();

	omap_init_dmic();

	omap_init_camera();

	omap_init_mbox();

	/* If dtb is there, the devices will be created dynamically */

	if (!of_have_populated_dt())

	if (!of_have_populated_dt()) {

		omap_init_dmic();

		omap_init_mcpdm();

		omap_init_mcspi();

	}

	omap_init_pmu();

	omap_hdq_init();

	omap_init_sti();