system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-23 03:37:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Second part of the Ux500 devicetree conversion and ATAG

Browse source 
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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJSUEvnAAoJEEEQszewGV1zTqgP/jMTQjic9PC5o0nF0R88ezzd
 h+OhLu9j2kMpUhn818I5cqnca8oUbdZf81/TI9oE9ectOz88ZClu71eUvRY8sdi8
 SpBjb4F8de4hwYyFxclAi/Rl9Jdk85Cb1IHA0PH/WGnMK93RBzud0nOum0CrnCjb
 Y+qGoN9ONYbn6cH40cdbUqnjTotPcRQFzTuabqKsoj4N/J5Mn3Q8/ANtCyTvVF19
 XuGCwTgGekI1NNu9DQw8nkhfKiUKTVeiAjyQTWn9mvJzKSlk7zhczpWrXJpqIcl6
 cTcu7rzAQp2sePLxjYF58W46oCTZ15l+/3k7TIQQi/w/uuy9rll3mwL0xc5qyDhV
 8XwNnZhkNDRwy9gNh5zn97b00s0G0CQk8rYrr7ycIZSGY5lUjX/u73T5pOHF3jRq
 E7cQfFRp7HMlOGqT/372lddoJ2io45N63IzT8rFWSQH00CSDpcVQ1YS/auquFh6V
 Qs2mZ73NB7n1ne0F6qbL/92eGnq7M9vGrHG2F5bBonfGA07FaZb3JjGtDODzBKQ0
 WBsrd1XfgxgPiMUmu31lhwnsegEyXqF2Gq+gAswrhw62Wd2cGh32GUQoXeUNJHUm
 b57eI9FJZV9rhhFoSYBvDe1sb3oMtmd7G5cXjQn2t/eoIML4yX3kU5aNdiXeN2Cd
 AxrTeaIlv/bOh1DDQa9t
 =xjIK
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2013-10-07 10:23:39 -07:00
parent a32d8c0e84 741a6c4c59
commit dbee3f2a12
10 changed files with 183 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/boot/dts/Makefile
View file

@ -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

2
arch/arm/boot/dts/ste-stuib.dtsi → arch/arm/boot/dts/ste-href-stuib.dtsi
View file

@ -57,7 +57,6 @@ i2c@80110000 {
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@5c {
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>;

41
arch/arm/boot/dts/ste-href-tvk1281618.dtsi Normal file
View file

@ -0,0 +1,41 @@
/*
* 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>;
};
};
};
};
};

29
arch/arm/boot/dts/ste-href.dtsi
View file

@ -41,28 +41,6 @@ uart@80007000 {
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 @@ lp5521@33 {
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 @@ chan2 {
};
bh1780@29 {
compatible = "rohm,bh1780gli";
reg = <0x33>;
reg = <0x29>;
};
};
@ -168,6 +147,10 @@ msp3: msp@80125000 {
prcmu@80157000 {
ab8500 {
ab8500-gpio {
compatible = "stericsson,ab8500-gpio";
};
ab8500-regulators {
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
regulator-name = "V-DISPLAY";

34
arch/arm/boot/dts/ste-hrefprev60-stuib.dts Normal file
View file

@ -0,0 +1,34 @@
/*
* 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>;
};
};
};
};

19
arch/arm/boot/dts/ste-hrefprev60-tvk.dts Normal file
View file

@ -0,0 +1,19 @@
/*
* 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";
};

37
arch/arm/boot/dts/ste-hrefprev60.dts → arch/arm/boot/dts/ste-hrefprev60.dtsi
View file

@ -7,17 +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-stuib.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>;
@ -25,24 +22,30 @@ button@1 {
};
soc {
prcmu@80157000 {
ab8500@5 {
ab8500-gpio {
compatible = "stericsson,ab8500-gpio";
};
};
};
i2c@80004000 {
tps61052@33 {
compatible = "tps61052";
reg = <0x33>;
};
};
i2c@80110000 {
bu21013_tp@5c {
reset-gpio = <&tc3589x_gpio 13 0x4>;
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>;
};
};
};

36
arch/arm/boot/dts/ste-hrefv60plus-stuib.dts Normal file
View file

@ -0,0 +1,36 @@
/*
* 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 {
/* Only one of these will be used */
bu21013_tp@5c {
touch-gpio = <&gpio2 20 0x4>;
reset-gpio = <&gpio4 17 0x4>;
};
bu21013_tp@5d {
touch-gpio = <&gpio2 20 0x4>;
reset-gpio = <&gpio4 17 0x4>;
};
};
};
};

21
arch/arm/boot/dts/ste-hrefv60plus-tvk.dts Normal file
View file

@ -0,0 +1,21 @@
/*
* 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 TVK1281618 UIB
*/
/dts-v1/;
#include "ste-hrefv60plus.dtsi"
#include "ste-href-tvk1281618.dtsi"
/ {
model = "ST-Ericsson HREF (v60+) and TVK1281618 UIB";
compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500";
};

12
arch/arm/boot/dts/ste-hrefv60plus.dts → arch/arm/boot/dts/ste-hrefv60plus.dtsi
View file

@ -9,10 +9,8 @@
* http://www.gnu.org/copyleft/gpl.html
*/
/dts-v1/;
#include "ste-dbx5x0.dtsi"
#include "ste-href.dtsi"
#include "ste-stuib.dtsi"
/ {
model = "ST-Ericsson HREF (v60+) platform with Device Tree";
@ -20,17 +18,11 @@ / {
gpio_keys {
button@1 {
gpios = <&gpio6 25 0x4>;
gpios = <&gpio5 25 0x4>;
};
};
soc {
i2c@80110000 {
bu21013_tp@0x5c {
reset-gpio = <&gpio4 15 0x4>;
};
};
// External Micro SD slot
sdi0_per1@80126000 {
arm,primecell-periphid = <0x10480180>;
@ -40,7 +32,7 @@ sdi0_per1@80126000 {
mmc-cap-mmc-highspeed;
vmmc-supply = <&ab8500_ldo_aux3_reg>;
cd-gpios = <&tc3589x_gpio 3 0x4>;
cd-gpios = <&gpio2 31 0x4>; // 95
status = "okay";
};