* [PATCH 1/8] ARM: dts: omap4-droid4: Add gpio-keys
2017-03-02 1:08 [PATCH 0/8] Droid4 DTS update Sebastian Reichel
@ 2017-03-02 1:08 ` Sebastian Reichel
2017-03-02 1:08 ` [PATCH 2/8] ARM: dts: omap4-droid4: Configure regulators Sebastian Reichel
` (7 subsequent siblings)
8 siblings, 0 replies; 20+ messages in thread
From: Sebastian Reichel @ 2017-03-02 1:08 UTC (permalink / raw)
To: Sebastian Reichel, Tony Lindgren, Benoît Cousson
Cc: Rob Herring, Mark Rutland, linux-omap, devicetree, linux-kernel
On Droid 4 "Volume Down" and "Keypad Slide" keys are
connected via SoC GPIOs, "Power Key" via CPCAP and
all other keys via SoC keypad Matrix. This adds the
GPIO keys.
Signed-off-by: Sebastian Reichel <sre@kernel.org>
---
arch/arm/boot/dts/omap4-droid4-xt894.dts | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index f3ccb4ceed9e..89f5f17cda7a 100644
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -6,6 +6,7 @@
/dts-v1/;
#include "omap443x.dtsi"
+#include <dt-bindings/input/input.h>
/ {
model = "Motorola Droid 4 XT894";
@@ -53,6 +54,26 @@
startup-delay-us = <70000>;
enable-active-high;
};
+
+ gpio_keys {
+ compatible = "gpio-keys";
+
+ volume_down {
+ label = "Volume Down";
+ gpios = <&gpio5 26 GPIO_ACTIVE_LOW>; /* gpio154 */
+ linux,code = <KEY_VOLUMEDOWN>;
+ linux,can-disable;
+ };
+
+ slider {
+ label = "Keypad Slide";
+ gpios = <&gpio4 26 GPIO_ACTIVE_HIGH>; /* gpio122 */
+ linux,input-type = <EV_SW>;
+ linux,code = <SW_KEYPAD_SLIDE>;
+ linux,can-disable;
+
+ };
+ };
};
/* L3_2 interconnect is unused, SRAM, GPMC and L3_ICLK2 disabled */
--
2.11.0
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 2/8] ARM: dts: omap4-droid4: Configure regulators
2017-03-02 1:08 [PATCH 0/8] Droid4 DTS update Sebastian Reichel
2017-03-02 1:08 ` [PATCH 1/8] ARM: dts: omap4-droid4: Add gpio-keys Sebastian Reichel
@ 2017-03-02 1:08 ` Sebastian Reichel
2017-03-02 1:08 ` [PATCH 3/8] ARM: dts: motorola-cpcap-mapphone: add rtc Sebastian Reichel
` (6 subsequent siblings)
8 siblings, 0 replies; 20+ messages in thread
From: Sebastian Reichel @ 2017-03-02 1:08 UTC (permalink / raw)
To: Sebastian Reichel, Tony Lindgren, Benoît Cousson
Cc: Rob Herring, Mark Rutland, linux-omap, devicetree, linux-kernel,
Marcel Partap, Michael Scott
From: Tony Lindgren <tony@atomide.com>
With drivers/mfd/motorola-cpcap.c and drivers/regulator/cpcap-regulator.c
we can now configure proper regulators for droid 4.
Let's add regulator voltages and switch over MMC, eMMC and WLAN to use
the CPCAP regulators.
Cc: devicetree@vger.kernel.org
Cc: Marcel Partap <mpartap@gmx.net>
Cc: Michael Scott <michael.scott@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tested-By: Sebastian Reichel <sre@kernel.org>
---
arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 151 +++++++++++++++++++++++++
arch/arm/boot/dts/omap4-droid4-xt894.dts | 27 +----
2 files changed, 156 insertions(+), 22 deletions(-)
create mode 100644 arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
diff --git a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
new file mode 100644
index 000000000000..b7e12463016e
--- /dev/null
+++ b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
@@ -0,0 +1,151 @@
+/*
+ * Common CPCAP configuration used on Motorola phones
+ *
+ * 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.
+ */
+
+&mcspi1 {
+ cpcap: pmic@0 {
+ compatible = "motorola,cpcap", "st,6556002";
+ reg = <0>; /* cs0 */
+ interrupt-parent = <&gpio1>;
+ interrupts = <7 IRQ_TYPE_EDGE_RISING>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ spi-max-frequency = <3000000>;
+ spi-cs-high;
+
+ cpcap_regulator: regulator {
+ compatible = "motorola,mapphone-cpcap-regulator";
+
+ cpcap_regulators: regulators {
+ };
+ };
+ };
+};
+
+&cpcap_regulators {
+ sw5: SW5 {
+ regulator-min-microvolt = <5050000>;
+ regulator-max-microvolt = <5050000>;
+ regulator-enable-ramp-delay = <50000>;
+ regulator-boot-on;
+ };
+
+ vcam: VCAM {
+ regulator-min-microvolt = <2900000>;
+ regulator-max-microvolt = <2900000>;
+ regulator-enable-ramp-delay = <1000>;
+ };
+
+ /* Used by DSS */
+ vcsi: VCSI {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-enable-ramp-delay = <1000>;
+ regulator-boot-on;
+ };
+
+ vdac: VDAC {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-enable-ramp-delay = <1000>;
+ };
+
+ vdig: VDIG {
+ regulator-min-microvolt = <1875000>;
+ regulator-max-microvolt = <1875000>;
+ regulator-enable-ramp-delay = <1000>;
+ };
+
+ vfuse: VFUSE {
+ regulator-min-microvolt = <1500000>;
+ regulator-max-microvolt = <3150000>;
+ regulator-enable-ramp-delay = <1000>;
+ };
+
+ vhvio: VHVIO {
+ regulator-min-microvolt = <2775000>;
+ regulator-max-microvolt = <2775000>;
+ regulator-enable-ramp-delay = <1000>;
+ regulator-always-on;
+ };
+
+ /* Used by eMMC at mmc2 */
+ vsdio: VSDIO {
+ regulator-min-microvolt = <2900000>;
+ regulator-max-microvolt = <2900000>;
+ regulator-enable-ramp-delay = <1000>;
+ };
+
+ vpll: VPLL {
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-enable-ramp-delay = <100>;
+ };
+
+ vrf1: VRF1 {
+ regulator-min-microvolt = <2775000>;
+ regulator-max-microvolt = <2775000>;
+ regulator-enable-ramp-delay = <1000>;
+ };
+
+ vrf2: VRF2 {
+ regulator-min-microvolt = <2775000>;
+ regulator-max-microvolt = <2775000>;
+ regulator-enable-ramp-delay = <1000>;
+ };
+
+ vrfref: VRFREF {
+ regulator-min-microvolt = <2500000>;
+ regulator-max-microvolt = <2775000>;
+ regulator-enable-ramp-delay = <100>;
+ };
+
+ vwlan1: VWLAN1 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1900000>;
+ regulator-enable-ramp-delay = <1000>;
+ };
+
+ vwlan2: VWLAN2 {
+ regulator-min-microvolt = <3000000>;
+ regulator-max-microvolt = <3000000>;
+ regulator-enable-ramp-delay = <1000>;
+ };
+
+ vsim: VSIM {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <2900000>;
+ regulator-enable-ramp-delay = <1000>;
+ };
+
+ /* Used by micro-SDIO at mmc1 */
+ vsimcard: VSIMCARD {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <2900000>;
+ regulator-enable-ramp-delay = <1000>;
+ };
+
+ vvib: VVIB {
+ regulator-min-microvolt = <1300000>;
+ regulator-max-microvolt = <3000000>;
+ regulator-enable-ramp-delay = <500>;
+ };
+
+ vusb: VUSB {
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-enable-ramp-delay = <1000>;
+ };
+
+ vaudio: VAUDIO {
+ regulator-min-microvolt = <2775000>;
+ regulator-max-microvolt = <2775000>;
+ regulator-enable-ramp-delay = <1000>;
+ };
+};
diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index 89f5f17cda7a..e9cffc375695 100644
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -5,8 +5,9 @@
*/
/dts-v1/;
-#include "omap443x.dtsi"
#include <dt-bindings/input/input.h>
+#include "omap443x.dtsi"
+#include "motorola-cpcap-mapphone.dtsi"
/ {
model = "Motorola Droid 4 XT894";
@@ -26,25 +27,7 @@
reg = <0x80000000 0x3fd00000>; /* 1021 MB */
};
- /* CPCAP really supports 1650000 to 3400000 range */
- vmmc: regulator-mmc {
- compatible = "regulator-fixed";
- regulator-name = "vmmc";
- regulator-min-microvolt = <3000000>;
- regulator-max-microvolt = <3000000>;
- regulator-always-on;
- };
-
- /* CPCAP really supports 3000000 to 3100000 range */
- vemmc: regulator-emmc {
- compatible = "regulator-fixed";
- regulator-name = "vemmc";
- regulator-min-microvolt = <3000000>;
- regulator-max-microvolt = <3000000>;
- regulator-always-on;
- };
-
- /* CPCAP really supports 1650000 to 1950000 range */
+ /* This is probably coming straight from the battery.. */
wl12xx_vmmc: regulator-wl12xx {
compatible = "regulator-fixed";
regulator-name = "vwl1271";
@@ -82,13 +65,13 @@
};
&mmc1 {
- vmmc-supply = <&vmmc>;
+ vmmc-supply = <&vsimcard>;
bus-width = <4>;
cd-gpios = <&gpio4 10 GPIO_ACTIVE_LOW>; /* gpio106 */
};
&mmc2 {
- vmmc-supply = <&vemmc>;
+ vmmc-supply = <&vsdio>;
bus-width = <8>;
non-removable;
};
--
2.11.0
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 3/8] ARM: dts: motorola-cpcap-mapphone: add rtc
2017-03-02 1:08 [PATCH 0/8] Droid4 DTS update Sebastian Reichel
2017-03-02 1:08 ` [PATCH 1/8] ARM: dts: omap4-droid4: Add gpio-keys Sebastian Reichel
2017-03-02 1:08 ` [PATCH 2/8] ARM: dts: omap4-droid4: Configure regulators Sebastian Reichel
@ 2017-03-02 1:08 ` Sebastian Reichel
2017-03-02 1:08 ` [PATCH 4/8] ARM: dts: motorola-cpcap-mapphone: add pwrbutton Sebastian Reichel
` (5 subsequent siblings)
8 siblings, 0 replies; 20+ messages in thread
From: Sebastian Reichel @ 2017-03-02 1:08 UTC (permalink / raw)
To: Sebastian Reichel, Tony Lindgren, Benoît Cousson
Cc: Rob Herring, Mark Rutland, linux-omap, devicetree, linux-kernel
Signed-off-by: Sebastian Reichel <sre@kernel.org>
---
arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
index b7e12463016e..34fb93ba5966 100644
--- a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
+++ b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
@@ -25,6 +25,13 @@
cpcap_regulators: regulators {
};
};
+
+ cpcap_rtc: rtc {
+ compatible = "motorola,cpcap-rtc";
+
+ interrupt-parent = <&cpcap>;
+ interrupts = <39 IRQ_TYPE_NONE>, <26 IRQ_TYPE_NONE>;
+ };
};
};
--
2.11.0
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 4/8] ARM: dts: motorola-cpcap-mapphone: add pwrbutton
2017-03-02 1:08 [PATCH 0/8] Droid4 DTS update Sebastian Reichel
` (2 preceding siblings ...)
2017-03-02 1:08 ` [PATCH 3/8] ARM: dts: motorola-cpcap-mapphone: add rtc Sebastian Reichel
@ 2017-03-02 1:08 ` Sebastian Reichel
2017-03-02 1:08 ` [PATCH 5/8] ARM: dts: omap4-droid4: Add compass Sebastian Reichel
` (4 subsequent siblings)
8 siblings, 0 replies; 20+ messages in thread
From: Sebastian Reichel @ 2017-03-02 1:08 UTC (permalink / raw)
To: Sebastian Reichel, Tony Lindgren, Benoît Cousson
Cc: Rob Herring, Mark Rutland, linux-omap, devicetree, linux-kernel
Signed-off-by: Sebastian Reichel <sre@kernel.org>
---
arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
index 34fb93ba5966..9970985e685b 100644
--- a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
+++ b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
@@ -32,6 +32,12 @@
interrupt-parent = <&cpcap>;
interrupts = <39 IRQ_TYPE_NONE>, <26 IRQ_TYPE_NONE>;
};
+
+ power_button: button {
+ compatible = "motorola,cpcap-pwrbutton";
+
+ interrupts = <23 IRQ_TYPE_NONE>;
+ };
};
};
--
2.11.0
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 5/8] ARM: dts: omap4-droid4: Add compass
2017-03-02 1:08 [PATCH 0/8] Droid4 DTS update Sebastian Reichel
` (3 preceding siblings ...)
2017-03-02 1:08 ` [PATCH 4/8] ARM: dts: motorola-cpcap-mapphone: add pwrbutton Sebastian Reichel
@ 2017-03-02 1:08 ` Sebastian Reichel
2017-03-02 1:08 ` [PATCH 6/8] ARM: dts: omap4-droid4: Add accelerometer Sebastian Reichel
` (3 subsequent siblings)
8 siblings, 0 replies; 20+ messages in thread
From: Sebastian Reichel @ 2017-03-02 1:08 UTC (permalink / raw)
To: Sebastian Reichel, Tony Lindgren, Benoît Cousson
Cc: Rob Herring, Mark Rutland, linux-omap, devicetree, linux-kernel
Signed-off-by: Sebastian Reichel <sre@kernel.org>
---
arch/arm/boot/dts/omap4-droid4-xt894.dts | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index e9cffc375695..71e1769e9b0f 100644
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -190,3 +190,20 @@
mode = <3>;
power = <50>;
};
+
+&i2c4 {
+ ak8975: magnetometer@c {
+ compatible = "asahi-kasei,ak8975";
+ reg = <0x0c>;
+
+ vdd-supply = <&vhvio>;
+
+ interrupt-parent = <&gpio6>;
+ interrupts = <15 IRQ_TYPE_EDGE_RISING>; /* gpio175 */
+
+ rotation-matrix = "-1", "0", "0",
+ "0", "1", "0",
+ "0", "0", "-1";
+
+ };
+};
--
2.11.0
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 6/8] ARM: dts: omap4-droid4: Add accelerometer
2017-03-02 1:08 [PATCH 0/8] Droid4 DTS update Sebastian Reichel
` (4 preceding siblings ...)
2017-03-02 1:08 ` [PATCH 5/8] ARM: dts: omap4-droid4: Add compass Sebastian Reichel
@ 2017-03-02 1:08 ` Sebastian Reichel
2017-03-02 1:08 ` [PATCH 7/8] ARM: dts: omap4-droid4: Add touchscreen Sebastian Reichel
` (2 subsequent siblings)
8 siblings, 0 replies; 20+ messages in thread
From: Sebastian Reichel @ 2017-03-02 1:08 UTC (permalink / raw)
To: Sebastian Reichel, Tony Lindgren, Benoît Cousson
Cc: Rob Herring, Mark Rutland, linux-omap, devicetree, linux-kernel
Signed-off-by: Sebastian Reichel <sre@kernel.org>
---
arch/arm/boot/dts/omap4-droid4-xt894.dts | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index 71e1769e9b0f..479cd5e5de83 100644
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -206,4 +206,18 @@
"0", "0", "-1";
};
+
+ lis3dh: accelerometer@18 {
+ compatible = "st,lis3dh-accel";
+ reg = <0x18>;
+
+ vdd-supply = <&vhvio>;
+
+ interrupt-parent = <&gpio2>;
+ interrupts = <2 IRQ_TYPE_EDGE_BOTH>; /* gpio34 */
+
+ rotation-matrix = "0", "-1", "0",
+ "1", "0", "0",
+ "0", "0", "1";
+ };
};
--
2.11.0
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 7/8] ARM: dts: omap4-droid4: Add touchscreen
2017-03-02 1:08 [PATCH 0/8] Droid4 DTS update Sebastian Reichel
` (5 preceding siblings ...)
2017-03-02 1:08 ` [PATCH 6/8] ARM: dts: omap4-droid4: Add accelerometer Sebastian Reichel
@ 2017-03-02 1:08 ` Sebastian Reichel
2017-03-02 1:09 ` [PATCH 8/8] ARM: dts: omap4-droid4: Add keypad support Sebastian Reichel
[not found] ` <20170302010900.28532-1-sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
8 siblings, 0 replies; 20+ messages in thread
From: Sebastian Reichel @ 2017-03-02 1:08 UTC (permalink / raw)
To: Sebastian Reichel, Tony Lindgren, Benoît Cousson
Cc: Rob Herring, Mark Rutland, linux-omap, devicetree, linux-kernel
Droid4's touchscreen can be used with mainline's maxtouch
driver. The touchscreen's lower area is used for four soft
buttons (KEY_MENU, KEY_HOME, KEY_BACK, KEY_SEARCH), but that
is currently not supported by the mainline kernel.
Signed-off-by: Sebastian Reichel <sre@kernel.org>
---
arch/arm/boot/dts/omap4-droid4-xt894.dts | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index 479cd5e5de83..364e98e66037 100644
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -191,6 +191,20 @@
power = <50>;
};
+&i2c2 {
+ atmxt: touchscreen@4a {
+ compatible = "atmel,maxtouch";
+ reg = <0x4a>;
+
+ interrupt-parent = <&gpio6>;
+ interrupts = <23 IRQ_TYPE_LEVEL_LOW>; /* gpio183 */
+
+ reset-gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>; /* gpio173 */
+
+ /* TODO: touchscreen has 4 soft buttons */
+ };
+};
+
&i2c4 {
ak8975: magnetometer@c {
compatible = "asahi-kasei,ak8975";
--
2.11.0
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 8/8] ARM: dts: omap4-droid4: Add keypad support
2017-03-02 1:08 [PATCH 0/8] Droid4 DTS update Sebastian Reichel
` (6 preceding siblings ...)
2017-03-02 1:08 ` [PATCH 7/8] ARM: dts: omap4-droid4: Add touchscreen Sebastian Reichel
@ 2017-03-02 1:09 ` Sebastian Reichel
[not found] ` <20170302010900.28532-9-sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
[not found] ` <20170302010900.28532-1-sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
8 siblings, 1 reply; 20+ messages in thread
From: Sebastian Reichel @ 2017-03-02 1:09 UTC (permalink / raw)
To: Sebastian Reichel, Tony Lindgren, Benoît Cousson
Cc: Rob Herring, Mark Rutland, linux-omap, devicetree, linux-kernel,
Marcel Partap, Michael Scott
From: Tony Lindgren <tony@atomide.com>
Let's configure the keypad in a way where it's usable out of the
box for Linux console use. To do this, let's follow the standard
PC keyboard layout for ctrl, shift and alt keys:
Ctrl = what is labeled as shift
Alt = what is labeled as SYM
Shift = what is lableled as caps lock
Meta = what is labled as OK
Who knows where they got the caps lock idea.. Probably from
some focus group popularity vote or something.
Note that some other keys don't match the labels either as they
don't follow the PC keyboard style. For example we have "shift + ,"
produce "<", and "shift + ." produce ">" instead of ";" and ":".
Pretty much Esc is the only key missing. I've used "Meta + 1"
produce Esc, and that seems to work OK. But that can be mapped
using the standard userspace tools.
Cc: Marcel Partap <mpartap@gmx.net>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Michael Scott <michael.scott@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tested-By: Sebastian Reichel <sre@kernel.org>
---
arch/arm/boot/dts/omap4-droid4-xt894.dts | 74 ++++++++++++++++++++++++++++++++
1 file changed, 74 insertions(+)
diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index 364e98e66037..8ea22852ef3f 100644
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -64,6 +64,80 @@
status = "disabled";
};
+&keypad {
+ keypad,num-rows = <8>;
+ keypad,num-columns = <8>;
+ linux,keymap = <
+
+ /* Row 1 */
+ MATRIX_KEY(0, 2, KEY_1)
+ MATRIX_KEY(0, 6, KEY_2)
+ MATRIX_KEY(2, 3, KEY_3)
+ MATRIX_KEY(0, 7, KEY_4)
+ MATRIX_KEY(0, 4, KEY_5)
+ MATRIX_KEY(5, 5, KEY_6)
+ MATRIX_KEY(0, 1, KEY_7)
+ MATRIX_KEY(0, 5, KEY_8)
+ MATRIX_KEY(0, 0, KEY_9)
+ MATRIX_KEY(1, 6, KEY_0)
+
+ /* Row 2 */
+ MATRIX_KEY(3, 4, KEY_APOSTROPHE)
+ MATRIX_KEY(7, 6, KEY_Q)
+ MATRIX_KEY(7, 7, KEY_W)
+ MATRIX_KEY(7, 2, KEY_E)
+ MATRIX_KEY(1, 0, KEY_R)
+ MATRIX_KEY(4, 4, KEY_T)
+ MATRIX_KEY(1, 2, KEY_Y)
+ MATRIX_KEY(6, 7, KEY_U)
+ MATRIX_KEY(2, 2, KEY_I)
+ MATRIX_KEY(5, 6, KEY_O)
+ MATRIX_KEY(3, 7, KEY_P)
+ MATRIX_KEY(6, 5, KEY_BACKSPACE)
+
+ /* Row 3 */
+ MATRIX_KEY(5, 4, KEY_TAB)
+ MATRIX_KEY(5, 7, KEY_A)
+ MATRIX_KEY(2, 7, KEY_S)
+ MATRIX_KEY(7, 0, KEY_D)
+ MATRIX_KEY(2, 6, KEY_F)
+ MATRIX_KEY(6, 2, KEY_G)
+ MATRIX_KEY(6, 6, KEY_H)
+ MATRIX_KEY(1, 4, KEY_J)
+ MATRIX_KEY(3, 1, KEY_K)
+ MATRIX_KEY(2, 1, KEY_L)
+ MATRIX_KEY(4, 6, KEY_ENTER)
+
+ /* Row 4 */
+ MATRIX_KEY(3, 6, KEY_LEFTSHIFT) /* KEY_CAPSLOCK */
+ MATRIX_KEY(6, 1, KEY_Z)
+ MATRIX_KEY(7, 4, KEY_X)
+ MATRIX_KEY(5, 1, KEY_C)
+ MATRIX_KEY(1, 7, KEY_V)
+ MATRIX_KEY(2, 4, KEY_B)
+ MATRIX_KEY(4, 1, KEY_N)
+ MATRIX_KEY(1, 1, KEY_M)
+ MATRIX_KEY(3, 5, KEY_COMMA)
+ MATRIX_KEY(5, 2, KEY_DOT)
+ MATRIX_KEY(6, 3, KEY_UP)
+ MATRIX_KEY(7, 3, KEY_RIGHTMETA) /* KEY_OK */
+
+ /* Row 5 */
+ MATRIX_KEY(2, 5, KEY_LEFTCTRL) /* KEY_LEFTSHIFT */
+ MATRIX_KEY(4, 5, KEY_LEFTALT) /* SYM */
+ MATRIX_KEY(6, 0, KEY_MINUS)
+ MATRIX_KEY(4, 7, KEY_EQUAL)
+ MATRIX_KEY(1, 5, KEY_SPACE)
+ MATRIX_KEY(3, 2, KEY_SLASH)
+ MATRIX_KEY(4, 3, KEY_LEFT)
+ MATRIX_KEY(5, 3, KEY_DOWN)
+ MATRIX_KEY(3, 3, KEY_RIGHT)
+
+ /* Side buttons (KEY_VOLUMEDOWN is gpio-key and PWR is cpcap key) */
+ MATRIX_KEY(5, 0, KEY_VOLUMEUP)
+ >;
+};
+
&mmc1 {
vmmc-supply = <&vsimcard>;
bus-width = <4>;
--
2.11.0
^ permalink raw reply related [flat|nested] 20+ messages in thread[parent not found: <20170302010900.28532-1-sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>]
* Re: [PATCH 0/8] Droid4 DTS update
[not found] ` <20170302010900.28532-1-sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
@ 2017-03-02 1:37 ` Tony Lindgren
2017-03-02 1:49 ` Tony Lindgren
[not found] ` <20170302013707.GK20572-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2017-03-17 11:48 ` Pavel Machek
1 sibling, 2 replies; 20+ messages in thread
From: Tony Lindgren @ 2017-03-02 1:37 UTC (permalink / raw)
To: Sebastian Reichel
Cc: Benoît Cousson, Rob Herring, Mark Rutland,
linux-omap-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
* Sebastian Reichel <sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> [170301 17:10]:
> Hi,
>
> Tony, since your omap4-droid4 dts patches were not
> yet in a public repository and they would merge conflict
> with my patches I put them all together into a single
> patchset. I also added my Tested-By to your patches.
OK
> The mounting-matrix for the sensors and the touchscreen's
> rotation assume, that the phone's default rotation is vertical.
> I think that's sensible, because
>
> * Android on the phone uses this as default rotation
> (like almost? all other phones)
> * volume buttons make sense (in horizontal position one
> would expect, that left button means lower volume. I
> know at least Maemo swaps them)
>
> That should cover all mainline drivers.
Heheheh cool looks like you configured compass and accelerometer :)
I have a better touchscreen patch that also configures the wakeirq
that I did not post yet at http://muru.com/linux/d4/patches/ in the
updated set droid4-wip-next-20170217.tar.gz.
I have few more interesting ones coming, I got the HDMI working
reliably over the weekend. I was planning on waiting until -rc1 to
post them but let's see if I can send few patches out before that.
Anyways, I'll post a better touchscreen patch then let's apply these
into omap-for-v4.12/dt-droid4 branch when -rc1 is tagged.
Regards
Tony
> Sebastian Reichel (6):
> ARM: dts: omap4-droid4: Add gpio-keys
> ARM: dts: motorola-cpcap-mapphone: add rtc
> ARM: dts: motorola-cpcap-mapphone: add pwrbutton
> ARM: dts: omap4-droid4: Add compass
> ARM: dts: omap4-droid4: Add accelerometer
> ARM: dts: omap4-droid4: Add touchscreen
>
> Tony Lindgren (2):
> ARM: dts: omap4-droid4: Configure regulators
> ARM: dts: omap4-droid4: Add keypad support
>
> arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 164 ++++++++++++++++++++++++
> arch/arm/boot/dts/omap4-droid4-xt894.dts | 165 +++++++++++++++++++++----
> 2 files changed, 308 insertions(+), 21 deletions(-)
> create mode 100644 arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
>
> --
> 2.11.0
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH 0/8] Droid4 DTS update
2017-03-02 1:37 ` [PATCH 0/8] Droid4 DTS update Tony Lindgren
@ 2017-03-02 1:49 ` Tony Lindgren
[not found] ` <20170302014910.GM20572-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
[not found] ` <20170302013707.GK20572-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
1 sibling, 1 reply; 20+ messages in thread
From: Tony Lindgren @ 2017-03-02 1:49 UTC (permalink / raw)
To: Sebastian Reichel
Cc: Benoît Cousson, Rob Herring, Mark Rutland, linux-omap,
devicetree, linux-kernel
* Tony Lindgren <tony@atomide.com> [170301 17:45]:
> * Sebastian Reichel <sre@kernel.org> [170301 17:10]:
> > Hi,
> >
> > Tony, since your omap4-droid4 dts patches were not
> > yet in a public repository and they would merge conflict
> > with my patches I put them all together into a single
> > patchset. I also added my Tested-By to your patches.
>
> OK
>
> > The mounting-matrix for the sensors and the touchscreen's
> > rotation assume, that the phone's default rotation is vertical.
> > I think that's sensible, because
> >
> > * Android on the phone uses this as default rotation
> > (like almost? all other phones)
> > * volume buttons make sense (in horizontal position one
> > would expect, that left button means lower volume. I
> > know at least Maemo swaps them)
> >
> > That should cover all mainline drivers.
>
> Heheheh cool looks like you configured compass and accelerometer :)
>
> I have a better touchscreen patch that also configures the wakeirq
> that I did not post yet at http://muru.com/linux/d4/patches/ in the
> updated set droid4-wip-next-20170217.tar.gz.
>
> I have few more interesting ones coming, I got the HDMI working
> reliably over the weekend. I was planning on waiting until -rc1 to
> post them but let's see if I can send few patches out before that.
Oh and I have the poweroff-gpio patch and tmp105 patch.
And the LMU backlight patch should be OK to go as the binding was
already acked a while back.
Some of the command mode LCD patches could be sent out too, and
if the timing patch is OK then we can configure the LCD in the dts
too. Have you had a chance to look at those related to what all I
broke for n950?
Regards,
Tony
^ permalink raw reply [flat|nested] 20+ messages in thread[parent not found: <20170302013707.GK20572-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>]
* Re: [PATCH 0/8] Droid4 DTS update
[not found] ` <20170302013707.GK20572-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
@ 2017-03-03 11:17 ` Sebastian Reichel
2017-03-03 16:31 ` Tony Lindgren
0 siblings, 1 reply; 20+ messages in thread
From: Sebastian Reichel @ 2017-03-03 11:17 UTC (permalink / raw)
To: Tony Lindgren
Cc: Benoît Cousson, Rob Herring, Mark Rutland,
linux-omap-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
[-- Attachment #1: Type: text/plain, Size: 2004 bytes --]
Hi,
On Wed, Mar 01, 2017 at 05:37:08PM -0800, Tony Lindgren wrote:
> * Sebastian Reichel <sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> [170301 17:10]:
> > Hi,
> >
> > Tony, since your omap4-droid4 dts patches were not
> > yet in a public repository and they would merge conflict
> > with my patches I put them all together into a single
> > patchset. I also added my Tested-By to your patches.
>
> OK
>
> > The mounting-matrix for the sensors and the touchscreen's
> > rotation assume, that the phone's default rotation is vertical.
> > I think that's sensible, because
> >
> > * Android on the phone uses this as default rotation
> > (like almost? all other phones)
> > * volume buttons make sense (in horizontal position one
> > would expect, that left button means lower volume. I
> > know at least Maemo swaps them)
> >
> > That should cover all mainline drivers.
>
> Heheheh cool looks like you configured compass and accelerometer :)
Easy targets with driver already available :)
One of them actually does not forward the mount rotation matrix
to sysfs/userspace at the moment due to missing driver support,
but the binding is generic.
> I have a better touchscreen patch that also configures the wakeirq
> that I did not post yet at http://muru.com/linux/d4/patches/ in the
> updated set droid4-wip-next-20170217.tar.gz.
It's part of the LCD patch, so I missed it.
> I have few more interesting ones coming, I got the HDMI working
> reliably over the weekend. I was planning on waiting until -rc1 to
> post them but let's see if I can send few patches out before that.
Thanks for the reminder, that I still have to buy an adapter from
µHDMI to HDMI.
> I was planning on waiting until -rc1 to post them but let's see if
> I can send few patches out before that.
>
> Anyways, I'll post a better touchscreen patch then let's apply these
> into omap-for-v4.12/dt-droid4 branch when -rc1 is tagged.
Sure.
-- Sebastian
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH 0/8] Droid4 DTS update
2017-03-03 11:17 ` Sebastian Reichel
@ 2017-03-03 16:31 ` Tony Lindgren
0 siblings, 0 replies; 20+ messages in thread
From: Tony Lindgren @ 2017-03-03 16:31 UTC (permalink / raw)
To: Sebastian Reichel
Cc: Benoît Cousson, Rob Herring, Mark Rutland,
linux-omap-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
* Sebastian Reichel <sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> [170303 03:18]:
> Hi,
>
> On Wed, Mar 01, 2017 at 05:37:08PM -0800, Tony Lindgren wrote:
> > * Sebastian Reichel <sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> [170301 17:10]:
> > > Hi,
> > >
> > > Tony, since your omap4-droid4 dts patches were not
> > > yet in a public repository and they would merge conflict
> > > with my patches I put them all together into a single
> > > patchset. I also added my Tested-By to your patches.
> >
> > OK
> >
> > > The mounting-matrix for the sensors and the touchscreen's
> > > rotation assume, that the phone's default rotation is vertical.
> > > I think that's sensible, because
> > >
> > > * Android on the phone uses this as default rotation
> > > (like almost? all other phones)
> > > * volume buttons make sense (in horizontal position one
> > > would expect, that left button means lower volume. I
> > > know at least Maemo swaps them)
> > >
> > > That should cover all mainline drivers.
> >
> > Heheheh cool looks like you configured compass and accelerometer :)
>
> Easy targets with driver already available :)
>
> One of them actually does not forward the mount rotation matrix
> to sysfs/userspace at the moment due to missing driver support,
> but the binding is generic.
>
> > I have a better touchscreen patch that also configures the wakeirq
> > that I did not post yet at http://muru.com/linux/d4/patches/ in the
> > updated set droid4-wip-next-20170217.tar.gz.
>
> It's part of the LCD patch, so I missed it.
Yeah so it seems sorry. I got most of the patches split out last
night, still need some time before I can send them out.
Regards,
Tony
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 0/8] Droid4 DTS update
[not found] ` <20170302010900.28532-1-sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-03-02 1:37 ` [PATCH 0/8] Droid4 DTS update Tony Lindgren
@ 2017-03-17 11:48 ` Pavel Machek
2017-03-17 14:00 ` Tony Lindgren
1 sibling, 1 reply; 20+ messages in thread
From: Pavel Machek @ 2017-03-17 11:48 UTC (permalink / raw)
To: Sebastian Reichel
Cc: Tony Lindgren, Benoît Cousson, Rob Herring, Mark Rutland,
linux-omap-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
[-- Attachment #1: Type: text/plain, Size: 795 bytes --]
Hi!
> The mounting-matrix for the sensors and the touchscreen's
> rotation assume, that the phone's default rotation is vertical.
> I think that's sensible, because
>
> * Android on the phone uses this as default rotation
> (like almost? all other phones)
> * volume buttons make sense (in horizontal position one
> would expect, that left button means lower volume. I
> know at least Maemo swaps them)
>
> That should cover all mainline drivers.
Actually, I'd use orientation with keyboard open (horizontal) -- as
that's how the console will be orientated (right?) and how the linux
will be most useful...
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH 0/8] Droid4 DTS update
2017-03-17 11:48 ` Pavel Machek
@ 2017-03-17 14:00 ` Tony Lindgren
0 siblings, 0 replies; 20+ messages in thread
From: Tony Lindgren @ 2017-03-17 14:00 UTC (permalink / raw)
To: Pavel Machek
Cc: Sebastian Reichel, Benoît Cousson, Rob Herring, Mark Rutland,
linux-omap, devicetree, linux-kernel
* Pavel Machek <pavel@ucw.cz> [170317 04:50]:
> Hi!
>
> > The mounting-matrix for the sensors and the touchscreen's
> > rotation assume, that the phone's default rotation is vertical.
> > I think that's sensible, because
> >
> > * Android on the phone uses this as default rotation
> > (like almost? all other phones)
> > * volume buttons make sense (in horizontal position one
> > would expect, that left button means lower volume. I
> > know at least Maemo swaps them)
> >
> > That should cover all mainline drivers.
>
> Actually, I'd use orientation with keyboard open (horizontal) -- as
> that's how the console will be orientated (right?) and how the linux
> will be most useful...
Right, so how can we do that by default? I currently have
"fbcon=rotate:1" in cmdline.
BTW, I think with omap4 we have the tiler hardware taking care
of the rotation on omap4, well I have not verified that though.
Regards,
Tony
^ permalink raw reply [flat|nested] 20+ messages in thread