github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 00:53:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ARM: dts: ux500: Totally separate TVK R2 and R3

Browse Source 
There is no point in sharing any definitions between
the R2 and R3 versions of the TVK1281618 UIB. The
proximity sensor collides with the touchscreen etc,
it is less confusing to get rid of the overarching
TVK1281618 UIB file and just use one for each.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2021-03-27 00:18:05 +01:00
parent c9334538bf
commit 396e4dd89d
3 changed files with 64 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi
View File

@ -3,10 +3,32 @@
* Device Tree for the TVK1281618 R2 user interface board (UIB)
*/
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/input/input.h>
#include "ste-href-tvk1281618.dtsi"
/ {
gpio_keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
vdd-supply = <&ab8500_ldo_aux1_reg>;
pinctrl-names = "default";
pinctrl-0 = <&prox_tvk_mode>, <&hall_tvk_mode>;
button@139 {
/* Proximity sensor */
gpios = <&gpio6 25 GPIO_ACTIVE_HIGH>;
linux,code = <11>; /* SW_FRONT_PROXIMITY */
label = "SFH7741 Proximity Sensor";
};
button@145 {
/* Hall sensor */
gpios = <&gpio4 17 GPIO_ACTIVE_HIGH>;
linux,code = <0>; /* SW_LID */
label = "HED54XXU11 Hall Effect Sensor";
};
};
soc {
i2c@80004000 {
tc35893@44 {
@ -195,6 +217,22 @@ panel {
};
};
pinctrl {
prox {
prox_tvk_mode: prox_tvk {
tvk_cfg {
pins = "GPIO217_AH12";
ste,config = <&gpio_in_pu>;
};
};
};
hall {
hall_tvk_mode: hall_tvk {
tvk_cfg {
pins = "GPIO145_C13";
ste,config = <&gpio_in_pu>;
};
};
};
tc35893 {
/* IRQ from the TC35893 */
tc35893_tvk_mode: tc35893_tvk {

26
arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi
View File

@ -4,10 +4,26 @@
* also known as the "CYTTSP board"
*/
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/input/input.h>
#include "ste-href-tvk1281618.dtsi"
/ {
gpio_keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
vdd-supply = <&ab8500_ldo_aux1_reg>;
pinctrl-names = "default";
pinctrl-0 = <&hall_tvk_mode>;
button@145 {
/* Hall sensor */
gpios = <&gpio4 17 GPIO_ACTIVE_HIGH>;
linux,code = <0>; /* SW_LID */
label = "HED54XXU11 Hall Effect Sensor";
};
};
soc {
i2c@80004000 {
tc35893@44 {
@ -116,6 +132,14 @@ panel {
};
pinctrl {
hall {
hall_tvk_mode: hall_tvk {
tvk_cfg {
pins = "GPIO145_C13";
ste,config = <&gpio_in_pu>;
};
};
};
tc35893 {
/* IRQ from the TC35893 */
tc35893_tvk_mode: tc35893_tvk {

53
arch/arm/boot/dts/ste-href-tvk1281618.dtsi
View File

@ -1,53 +0,0 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2012 ST-Ericsson AB
*
* Device Tree for the TVK1281618 family of UIBs
*/
#include <dt-bindings/interrupt-controller/irq.h>
/ {
gpio_keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
vdd-supply = <&ab8500_ldo_aux1_reg>;
pinctrl-names = "default";
pinctrl-0 = <&prox_tvk_mode>, <&hall_tvk_mode>;
button@139 {
/* Proximity sensor */
gpios = <&gpio6 25 GPIO_ACTIVE_HIGH>;
linux,code = <11>; /* SW_FRONT_PROXIMITY */
label = "SFH7741 Proximity Sensor";
};
button@145 {
/* Hall sensor */
gpios = <&gpio4 17 GPIO_ACTIVE_HIGH>;
linux,code = <0>; /* SW_LID */
label = "HED54XXU11 Hall Effect Sensor";
};
};
soc {
pinctrl {
prox {
prox_tvk_mode: prox_tvk {
tvk_cfg {
pins = "GPIO217_AH12";
ste,config = <&gpio_in_pu>;
};
};
};
hall {
hall_tvk_mode: hall_tvk {
tvk_cfg {
pins = "GPIO145_C13";
ste,config = <&gpio_in_pu>;
};
};
};
};
};
};