Commit dbee3f2a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'ux500-devicetree-2' of... 

Merge tag 'ux500-devicetree-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt

From Linus Walleij:
Second part of the Ux500 devicetree conversion and ATAG
deletion: this fixes bugs discovered when switching to a
devicetree-only setup, primarily on the HREF prototypes.
The biggest change is to split into four DTS variants as
the UIB autodetection was lost.

* tag 'ux500-devicetree-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

:
  ARM: ux500: move BU21013 touchpad GPIOs into top-level DTS
  ARM: ux500: register the tc35892 GPIO on the TVK UIB
  ARM: ux500: split the HREF DTS files from two to four
  ARM: ux500: split HREF UIB files
  ARM: ux500: move TC35892 at 0x42 to hrefprev60
  ARM: ux500: correct CD for micro SD on hrev60plus
  ARM: ux500: fix proximity sensor button
  ARM: ux500: correct I2C address of ambient light sensor
  ARM: ux500 enable the AB8500 gpio for all HREFs
  ARM: ux500: add default trigger on HREF LED

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a32d8c0e 741a6c4c

arch/arm/boot/dts/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -190,8 +190,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-stuib.dtsi→arch/arm/boot/dts/ste-href-stuib.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 
			bu21013_tp@5c {

				compatible = "rohm,bu21013_tp";

				reg = <0x5c>;

				touch-gpio = <&gpio2 20 0x4>;

				avdd-supply = <&ab8500_ldo_aux1_reg>;



				rohm,touch-max-x = <384>;
@@ -68,7 +67,6 @@ 
			bu21013_tp@5d {

				compatible = "rohm,bu21013_tp";

				reg = <0x5d>;

				touch-gpio = <&gpio2 20 0x4>;

				avdd-supply = <&ab8500_ldo_aux1_reg>;



				rohm,touch-max-x = <384>;

arch/arm/boot/dts/ste-href-tvk1281618.dtsi

0 → 100644
+41 −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 TVK1281618 UIB

 */



#include <dt-bindings/interrupt-controller/irq.h>



/ {

	soc {

		/* Add Synaptics touch screen, TC35892 keypad etc here */

		i2c@80004000 {

			tc3589x@44 {

				compatible = "tc3589x";

				reg = <0x44>;

				interrupt-parent = <&gpio6>;

				interrupts = <26 IRQ_TYPE_EDGE_RISING>;



				interrupt-controller;

				#interrupt-cells = <2>;



				tc3589x_gpio {

					compatible = "tc3589x-gpio";

					interrupts = <0 IRQ_TYPE_EDGE_RISING>;



					interrupt-controller;

					#interrupt-cells = <2>;

					gpio-controller;

					#gpio-cells = <2>;

				};

			};

		};

	};

};

arch/arm/boot/dts/ste-href.dtsi

+6 −23
Original line number Diff line number Diff line
@@ -41,28 +41,6 @@ 
			status = "okay";

		};



		i2c@80004000 {

			tc3589x@42 {

				compatible = "tc3589x";

				reg = <0x42>;

				interrupt-parent = <&gpio6>;

				interrupts = <25 IRQ_TYPE_EDGE_RISING>;



				interrupt-controller;

				#interrupt-cells = <2>;



				tc3589x_gpio: tc3589x_gpio {

					compatible = "tc3589x-gpio";

					interrupts = <0 IRQ_TYPE_EDGE_RISING>;



					interrupt-controller;

					#interrupt-cells = <2>;

					gpio-controller;

					#gpio-cells = <2>;

				};

			};

		};



		i2c@80128000 {

			lp5521@33 {

				compatible = "national,lp5521";
@@ -72,6 +50,7 @@ 
				chan0 {

					led-cur = /bits/ 8 <0x2f>;

					max-cur = /bits/ 8 <0x5f>;

					linux,default-trigger = "heartbeat";

				};

				chan1 {

					led-cur = /bits/ 8 <0x2f>;
@@ -102,7 +81,7 @@ 
			};

			bh1780@29 {

				compatible = "rohm,bh1780gli";

				reg = <0x33>;

				reg = <0x29>;

			};

		};
@@ -168,6 +147,10 @@ 


		prcmu@80157000 {

			ab8500 {

				ab8500-gpio {

					compatible = "stericsson,ab8500-gpio";

				};



				ab8500-regulators {

					ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {

						regulator-name = "V-DISPLAY";

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

0 → 100644
+34 −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 {

			/* Only one of these will be used */

			bu21013_tp@5c {

				touch-gpio = <&gpio2 12 0x4>;

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

			};

			bu21013_tp@5d {

				touch-gpio = <&gpio2 12 0x4>;

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

			};

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE