Skip to content

GitLab

Commit d3999b60 authored by Amy Maloche's avatar Amy Maloche Committed by Stepan Moskovchenko
Browse files

arm/dt: 8974: move support for IO devices from dtsi to dts file 


Since touch controller and key support can vary from board
to board for 8974, move support for atmel_mxt_ts controller
and gpio-keys to the CDP-specific dts file.

Change-Id: I3743fed6eda33c0784f87a5554d23e5e22c821cd
Signed-off-by: default avatarAmy Maloche <amaloche@codeaurora.org>
Signed-off-by: default avatarStepan Moskovchenko <stepanm@codeaurora.org>
parent 968609e9
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 109 deletions
arch/arm/boot/dts/msm8974-cdp.dts
View file @ d3999b60
......@@ -29,6 +29,117 @@
status = "ok";
};
};
i2c@f9924000 {
atmel_mxt_ts@4a {
compatible = "atmel,mxt-ts";
reg = <0x4a>;
interrupt-parent = <&msmgpio>;
interrupts = <61 0x2>;
vdd_ana-supply = <&pm8941_l18>;
vcc_i2c-supply = <&pm8941_lvs1>;
atmel,reset-gpio = <&msmgpio 60 0x00>;
atmel,irq-gpio = <&msmgpio 61 0x00>;
atmel,panel-coords = <0 0 760 1424>;
atmel,display-coords = <0 0 720 1280>;
atmel,i2c-pull-up = <1>;
atmel,cfg_1 {
atmel,family-id = <0x82>;
atmel,variant-id = <0x19>;
atmel,version = <0x10>;
atmel,build = <0xaa>;
atmel,config = [
/* Object 6, Instance = 0 */
00 00 00 00 00 00
/* Object 38, Instance = 0 */
15 00 02 10 08 0C 00 00
/* Object 7, Instance = 0 */
FF FF 32 03
/* Object 8, Instance = 0 */
0F 00 0A 0A 00 00 0A 00 00 00
/* Object 9, Instance = 0 */
83 00 00 18 0E 00 70 32 02 01
00 03 01 01 05 0A 0A 0A 90 05
F8 02 00 00 0F 0F 00 00 48 2D
07 0C 00 00 00 00
/* Object 15, Instance = 0 */
00 00 00 00 00 00 00 00 00 00
00
/* Object 18, Instance = 0 */
00 00
/* Object 19, Instance = 0 */
00 00 00 00 00 00
/* Object 23, Instance = 0 */
00 00 00 00 00 00 00 00 00 00
00 00 00 00 00
/* Object 25, Instance = 0 */
00 00 00 00 00 00 00 00 00 00
00 00 00 00 00
/* Object 40, Instance = 0 */
00 00 00 00 00
/* Object 42, Instance = 0 */
00 00 00 00 00 00 00 00 00 00
/* Object 46, Instance = 0 */
00 00 10 10 00 00 03 00 00 01
/* Object 47, Instance = 0 */
08 0A 28 0A 02 0A 00 8C 00 20
00 00 00
/* Object 55, Instance = 0 */
00 00 00 00 00 00
/* Object 56, Instance = 0 */
03 00 01 18 05 05 05 05 05 05
05 05 05 05 05 05 05 05 05 05
05 05 05 05 05 05 05 05 00 00
00 00 00 00 00 00 00 00 00 00
00 00
/* Object 57, Instance = 0 */
00 00 00
/* Object 61, Instance = 0 */
00 00 00 00 00
/* Object 61, Instance = 1 */
00 00 00 00 00
/* Object 62, Instance = 0 */
7F 03 00 16 00 00 00 00 00 00
04 08 10 18 05 00 0A 05 05 50
14 19 34 1A 64 00 00 04 40 00
00 00 00 00 30 32 02 00 01 00
05 00 00 00 00 00 00 00 00 00
00 00 0C 00
];
};
};
};
gpio_keys {
compatible = "gpio-keys";
camera_snapshot {
label = "camera_snapshot";
gpios = <&pm8941_gpios 3 0x1>;
linux,input-type = <1>;
linux,code = <0x2fe>;
gpio-key,wakeup;
debounce-interval = <15>;
};
camera_focus {
label = "camera_focus";
gpios = <&pm8941_gpios 4 0x1>;
linux,input-type = <1>;
linux,code = <0x210>;
gpio-key,wakeup;
debounce-interval = <15>;
};
vol_up {
label = "volume_up";
gpios = <&pm8941_gpios 5 0x1>;
linux,input-type = <1>;
linux,code = <115>;
gpio-key,wakeup;
debounce-interval = <15>;
};
};
};
&sdcc2 {
......
arch/arm/boot/dts/msm8974.dtsi
View file @ d3999b60
......@@ -541,84 +541,6 @@
interrupt-names = "qup_err_intr";
qcom,i2c-bus-freq = <100000>;
qcom,i2c-src-freq = <24000000>;
atmel_mxt_ts@4a {
compatible = "atmel,mxt-ts";
reg = <0x4a>;
interrupt-parent = <&msmgpio>;
interrupts = <61 0x2>;
vdd_ana-supply = <&pm8941_l18>;
vcc_i2c-supply = <&pm8941_lvs1>;
atmel,reset-gpio = <&msmgpio 60 0x00>;
atmel,irq-gpio = <&msmgpio 61 0x00>;
atmel,panel-coords = <0 0 760 1424>;
atmel,display-coords = <0 0 720 1280>;
atmel,i2c-pull-up = <1>;
atmel,cfg_1 {
atmel,family-id = <0x82>;
atmel,variant-id = <0x19>;
atmel,version = <0x10>;
atmel,build = <0xaa>;
atmel,config = [
/* Object 6, Instance = 0 */
00 00 00 00 00 00
/* Object 38, Instance = 0 */
15 00 02 10 08 0C 00 00
/* Object 7, Instance = 0 */
FF FF 32 03
/* Object 8, Instance = 0 */
0F 00 0A 0A 00 00 0A 00 00 00
/* Object 9, Instance = 0 */
83 00 00 18 0E 00 70 32 02 01
00 03 01 01 05 0A 0A 0A 90 05
F8 02 00 00 0F 0F 00 00 48 2D
07 0C 00 00 00 00
/* Object 15, Instance = 0 */
00 00 00 00 00 00 00 00 00 00
00
/* Object 18, Instance = 0 */
00 00
/* Object 19, Instance = 0 */
00 00 00 00 00 00
/* Object 23, Instance = 0 */
00 00 00 00 00 00 00 00 00 00
00 00 00 00 00
/* Object 25, Instance = 0 */
00 00 00 00 00 00 00 00 00 00
00 00 00 00 00
/* Object 40, Instance = 0 */
00 00 00 00 00
/* Object 42, Instance = 0 */
00 00 00 00 00 00 00 00 00 00
/* Object 46, Instance = 0 */
00 00 10 10 00 00 03 00 00 01
/* Object 47, Instance = 0 */
08 0A 28 0A 02 0A 00 8C 00 20
00 00 00
/* Object 55, Instance = 0 */
00 00 00 00 00 00
/* Object 56, Instance = 0 */
03 00 01 18 05 05 05 05 05 05
05 05 05 05 05 05 05 05 05 05
05 05 05 05 05 05 05 05 00 00
00 00 00 00 00 00 00 00 00 00
00 00
/* Object 57, Instance = 0 */
00 00 00
/* Object 61, Instance = 0 */
00 00 00 00 00
/* Object 61, Instance = 1 */
00 00 00 00 00
/* Object 62, Instance = 0 */
7F 03 00 16 00 00 00 00 00 00
04 08 10 18 05 00 0A 05 05 50
14 19 34 1A 64 00 00 04 40 00
00 00 00 00 30 32 02 00 01 00
05 00 00 00 00 00 00 00 00 00
00 00 0C 00
];
};
};
};
qcom,acpuclk@f9000000 {
......@@ -995,37 +917,6 @@
qcom,freq-step = <2>;
};
gpio_keys {
compatible = "gpio-keys";
camera_snapshot {
label = "camera_snapshot";
gpios = <&pm8941_gpios 3 0x1>;
linux,input-type = <1>;
linux,code = <0x2fe>;
gpio-key,wakeup;
debounce-interval = <15>;
};
camera_focus {
label = "camera_focus";
gpios = <&pm8941_gpios 4 0x1>;
linux,input-type = <1>;
linux,code = <0x210>;
gpio-key,wakeup;
debounce-interval = <15>;
};
vol_up {
label = "volume_up";
gpios = <&pm8941_gpios 5 0x1>;
linux,input-type = <1>;
linux,code = <115>;
gpio-key,wakeup;
debounce-interval = <15>;
};
};
qcom,bam_dmux@fc834000 {
compatible = "qcom,bam_dmux";
reg = <0xfc834000 0x7000>;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment