Commit 01dc909f authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: ux500: split the HREF DTS files from two to four 



As the device tree conversion did away with the ability to
auto-detect the UIB (User Interface Board) version from attempting
to read an I2C address, we now have to pass the knowledge of
what UIB is mounted through the device tree. This gives rise
to four possible board permutations:

- HREF prior to v60, ST UIB (hrefprev60-stuib)
- HREF prior to v60, TVK1281618 UIB (hrefprev60-tvk)
- HREF v60 and later, ST UIB (href60plus-stuib)
- HREF v60 and later, TVK1281618 UIB (hrefv60plus-tvk)

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 9c19cfa9

arch/arm/boot/dts/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -189,8 +189,10 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb

dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \

	ste-hrefprev60.dtb \

	ste-hrefv60plus.dtb \

	ste-hrefprev60-stuib.dtb \

	ste-hrefprev60-tvk.dtb \

	ste-hrefv60plus-stuib.dtb \

	ste-hrefv60plus-tvk.dtb \

	ste-ccu8540.dtb \

	ste-ccu9540.dtb

dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb

arch/arm/boot/dts/ste-hrefprev60-stuib.dts

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

 * Copyright 2012 ST-Ericsson AB

 *

 * 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

 */



/dts-v1/;

#include "ste-hrefprev60.dtsi"

#include "ste-href-stuib.dtsi"



/ {

	model = "ST-Ericsson HREF (pre-v60) and ST UIB";

	compatible = "st-ericsson,mop500", "st-ericsson,u8500";



	soc {

		/* Reset line for the BU21013 touchscreen */

		i2c@80110000 {

			bu21013_tp@5c {

				reset-gpio = <&tc3589x_gpio 13 0x4>;

			};

		};

	};

};

arch/arm/boot/dts/ste-hrefprev60-tvk.dts

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

 * Copyright 2012 ST-Ericsson AB

 *

 * 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

 */



/dts-v1/;

#include "ste-hrefprev60.dtsi"

#include "ste-href-tvk1281618.dtsi"



/ {

	model = "ST-Ericsson HREF (pre-v60) and TVK1281618 UIB";

	compatible = "st-ericsson,mop500", "st-ericsson,u8500";

};

arch/arm/boot/dts/ste-hrefprev60.dts→arch/arm/boot/dts/ste-hrefprev60.dtsi

+2 −6
Original line number Diff line number Diff line
@@ -7,18 +7,14 @@ 
 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 *

 * Device Tree for the HREF+ prior to the v60 variant.

 */



/dts-v1/;

#include "ste-dbx5x0.dtsi"

#include "ste-href.dtsi"

#include "ste-href-stuib.dtsi"

#include "ste-href-tvk1281618.dtsi"



/ {

	model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";

	compatible = "st-ericsson,mop500", "st-ericsson,u8500";



	gpio_keys {

		button@1 {

			gpios = <&tc3589x_gpio 7 0x4>;

arch/arm/boot/dts/ste-hrefv60plus-stuib.dts

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

 * Copyright 2012 ST-Ericsson AB

 *

 * 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

 *

 * Device Tree for the HREF version 60 or later with the ST UIB

 */



/dts-v1/;

#include "ste-hrefv60plus.dtsi"

#include "ste-href-stuib.dtsi"



/ {

	model = "ST-Ericsson HREF (v60+) and ST UIB";

	compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500";



	soc {

		/* Reset line for the BU21013 touchscreen */

		i2c@80110000 {

			bu21013_tp@0x5c {

				reset-gpio = <&gpio4 15 0x4>;

			};

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE