Skip to content

ARM: dts: qcom: msm8226-samsung-matisse-common: move accelerometer and touchscreen node into common dtsi #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: qcom-msm8226-6.15.y
Choose a base branch
from
Open

ARM: dts: qcom: msm8226-samsung-matisse-common: move accelerometer and touchscreen node into common dtsi #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 6 additions & 67 deletions arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,66 +12,6 @@
model = "Samsung Galaxy Tab 4 10.1";
compatible = "samsung,matisse-wifi", "qcom,apq8026";
chassis-type = "tablet";

reg_tsp_3p3v: regulator-tsp-3p3v {
compatible = "regulator-fixed";
regulator-name = "tsp_3p3v";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;

gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>;
enable-active-high;

pinctrl-names = "default";
pinctrl-0 = <&tsp_en1_default_state>;
};
};

&blsp1_i2c2 {
status = "okay";

accelerometer@1d {
compatible = "st,lis2hh12";
reg = <0x1d>;

interrupt-parent = <&tlmm>;
interrupts = <54 IRQ_TYPE_LEVEL_HIGH>;

pinctrl-names = "default";
pinctrl-0 = <&accel_int_default_state>;

st,drdy-int-pin = <1>;

vdd-supply = <&pm8226_l19>;
vddio-supply = <&pm8226_lvs1>;
};
};

&blsp1_i2c5 {
status = "okay";

touchscreen@4a {
compatible = "atmel,maxtouch";
reg = <0x4a>;

interrupt-parent = <&tlmm>;
interrupts = <17 IRQ_TYPE_LEVEL_LOW>;

linux,keycodes = <KEY_RESERVED>,
<KEY_RESERVED>,
<KEY_RESERVED>,
<KEY_RESERVED>,
<KEY_APPSELECT>,
<KEY_BACK>;

pinctrl-names = "default";
pinctrl-0 = <&tsp_int_rst_default_state>;

reset-gpios = <&pm8226_gpios 6 GPIO_ACTIVE_LOW>;

vdd-supply = <&reg_tsp_1p8v>;
vdda-supply = <&reg_tsp_3p3v>;
};
};

&pm8226_l3 {
Expand All @@ -82,11 +22,10 @@
regulator-max-microvolt = <1800000>;
};

&tlmm {
tsp_en1_default_state: tsp-en1-default-state {
pins = "gpio73";
function = "gpio";
drive-strength = <2>;
bias-disable;
};
&reg_tsp_3p3v {
gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>;
};

&tsp_en1_default_state {
pins = "gpio73";
};
65 changes: 65 additions & 0 deletions arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,19 @@
pinctrl-0 = <&tsp_en_default_state>;
};

reg_tsp_3p3v: regulator-tsp-3p3v {
compatible = "regulator-fixed";
regulator-name = "tsp_3p3v";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;

gpio = <&tlmm 32 GPIO_ACTIVE_HIGH>;
enable-active-high;

pinctrl-0 = <&tsp_en1_default_state>;
pinctrl-names = "default";
};

reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
Expand Down Expand Up @@ -211,6 +224,25 @@
status = "okay";
};

&blsp1_i2c2 {
status = "okay";

accelerometer@1d {
compatible = "st,lis2hh12";
reg = <0x1d>;

interrupts-extended = <&tlmm 54 IRQ_TYPE_LEVEL_HIGH>;

pinctrl-0 = <&accel_int_default_state>;
pinctrl-names = "default";

st,drdy-int-pin = <1>;

vdd-supply = <&pm8226_l19>;
vddio-supply = <&pm8226_lvs1>;
};
};

&blsp1_i2c4 {
status = "okay";

Expand All @@ -226,6 +258,32 @@
};
};

&blsp1_i2c5 {
status = "okay";

touchscreen@4a {
compatible = "atmel,maxtouch";
reg = <0x4a>;

interrupts-extended = <&tlmm 17 IRQ_TYPE_LEVEL_LOW>;

linux,keycodes = <KEY_RESERVED>,
<KEY_RESERVED>,
<KEY_RESERVED>,
<KEY_RESERVED>,
<KEY_APPSELECT>,
<KEY_BACK>;

pinctrl-0 = <&tsp_int_rst_default_state>;
pinctrl-names = "default";

reset-gpios = <&pm8226_gpios 6 GPIO_ACTIVE_LOW>;

vdd-supply = <&reg_tsp_1p8v>;
vdda-supply = <&reg_tsp_3p3v>;
};
};

&blsp1_uart3 {
status = "okay";
};
Expand Down Expand Up @@ -474,6 +532,13 @@
bias-disable;
};

tsp_en1_default_state: tsp-en1-default-state {
pins = "gpio32";
function = "gpio";
drive-strength = <2>;
bias-disable;
};

tsp_int_rst_default_state: tsp-int-rst-default-state {
pins = "gpio17";
function = "gpio";
Expand Down
22 changes: 0 additions & 22 deletions arch/arm/boot/dts/qcom/qcom-msm8926-samsung-matisselte.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,8 @@
model = "Samsung Galaxy Tab 4 10.1 LTE";
compatible = "samsung,matisselte", "qcom,msm8926", "qcom,msm8226";
chassis-type = "tablet";

reg_tsp_3p3v: regulator-tsp-3p3v {
compatible = "regulator-fixed";
regulator-name = "tsp_3p3v";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;

gpio = <&tlmm 32 GPIO_ACTIVE_HIGH>;
enable-active-high;

pinctrl-names = "default";
pinctrl-0 = <&tsp_en1_default_state>;
};
};

&modem {
mss-supply = <&pm8226_s5>;
};

&tlmm {
tsp_en1_default_state: tsp-en1-default-state {
pins = "gpio32";
function = "gpio";
drive-strength = <2>;
bias-disable;
};
};