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

Commit af3c0380 authored by Florian Vaussard's avatar Florian Vaussard Committed by Tony Lindgren
Browse files

ARM: dts: overo: reorganize include files 



Currently, overo-related include files are organized as follow:

                     omap3-overo.dtsi
                             |
                             |
omap34xx.dtsi   omap3-overo-tobi-common.dtsi   omap36xx.dtsi
      |              |                 |             |
      ---------------                  ---------------
              |                                |
    omap3-overo-tobi.dts          omap3-overo-storm-tobi.dts

This is unpractical when one has to deal with SoC-specific pinmux
belonging to the omap3_pmx_core2 (defined in omap34xx/omap36xx),
for pins related to the processor board. With the current
hierarchy, such pinmux has to be defined in the expansion board's
.dts, which is not logical.

This patches reorganizes the files to add (yet another) abstraction
layer between the processor and the expansion boards.

omap34xx.dtsi       omap3-overo-base.dtsi      omap36xx.dtsi
      |              |                 |             |
      ---------------                  ---------------
              |                                |
      omap3-overo.dtsi               omap3-overo-storm.dtsi
              |                                |
      --------                                  ------
      |         omap3-overo-tobi-common.dtsi         |
      |              |                 |             |
      ---------------                  ---------------
              |                                |
    omap3-overo-tobi.dts          omap3-overo-storm-tobi.dts

Signed-off-by: default avatarFlorian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent cfbf8d48

arch/arm/boot/dts/omap3-overo-base.dtsi

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

 * Copyright (C) 2012 Florian Vaussard, EPFL Mobots group

 *

 * 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.

 */



/*

 * The Gumstix Overo must be combined with an expansion board.

 */



/ {

	pwmleds {

		compatible = "pwm-leds";



		overo {

			label = "overo:blue:COM";

			pwms = <&twl_pwmled 1 7812500>;

			max-brightness = <127>;

			linux,default-trigger = "mmc0";

		};

	};



	sound {

		compatible = "ti,omap-twl4030";

		ti,model = "overo";



		ti,mcbsp = <&mcbsp2>;

		ti,codec = <&twl_audio>;

	};

};



&i2c1 {

	clock-frequency = <2600000>;



	twl: twl@48 {

		reg = <0x48>;

		interrupts = <7>; /* SYS_NIRQ cascaded to intc */

		interrupt-parent = <&intc>;



		twl_audio: audio {

			compatible = "ti,twl4030-audio";

			codec {

			};

		};

	};

};



#include "twl4030.dtsi"

#include "twl4030_omap3.dtsi"



/* i2c2 pins are used for gpio */

&i2c2 {

	status = "disabled";

};



/* on board microSD slot */

&mmc1 {

	vmmc-supply = <&vmmc1>;

	bus-width = <4>;

};



/* optional on board WiFi */

&mmc2 {

	bus-width = <4>;

};



&twl_gpio {

	ti,use-leds;

};



&usb_otg_hs {

	interface-type = <0>;

	usb-phy = <&usb2_phy>;

	phys = <&usb2_phy>;

	phy-names = "usb2-phy";

	mode = <3>;

	power = <50>;

};



&omap3_pmx_core {

	uart3_pins: pinmux_uart3_pins {

		pinctrl-single,pins = <

			0x16e (PIN_INPUT | PIN_OFF_WAKEUPENABLE | MUX_MODE0) /* uart3_rx_irrx.uart3_rx_irrx */

			0x170 (PIN_OUTPUT | MUX_MODE0) /* uart3_tx_irtx.uart3_tx_irtx */

		>;

	};

};



&uart3 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart3_pins>;

};

arch/arm/boot/dts/omap3-overo-storm-tobi.dts

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


/dts-v1/;



#include "omap36xx.dtsi"

#include "omap3-overo-storm.dtsi"

#include "omap3-overo-tobi-common.dtsi"



/ {

arch/arm/boot/dts/omap3-overo-storm.dtsi

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

 * Copyright (C) 2014 Florian Vaussard, EPFL Mobots group

 *

 * 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 "omap36xx.dtsi"

#include "omap3-overo-base.dtsi"

arch/arm/boot/dts/omap3-overo-tobi-common.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 
 * Tobi expansion board is manufactured by Gumstix Inc.

 */



#include "omap3-overo.dtsi"



/ {

	leds {

		compatible = "gpio-leds";

arch/arm/boot/dts/omap3-overo-tobi.dts

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


/dts-v1/;



#include "omap34xx.dtsi"

#include "omap3-overo.dtsi"

#include "omap3-overo-tobi-common.dtsi"



/ {