Skip to content
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.

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

Asus Transformers update #34

Merged
merged 3 commits into from
Apr 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 4 additions & 19 deletions arch/arm/boot/dts/tegra30-asus-tf201.dts
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,6 @@
model = "Asus Transformer Prime TF201";
compatible = "asus,tf201", "nvidia,tegra30";

host1x@50000000 {
lcd: dc@54200000 {
rgb {
status = "okay";

port@0 {
lcd_output: endpoint {
remote-endpoint = <&lvds_encoder_input>;
bus-width = <24>;
};
};
};
};
};

pinmux@70000868 {
state_default: pinmux {
lcd_pwr2_pc6 {
Expand Down Expand Up @@ -181,7 +166,7 @@

port {
panel_input: endpoint {
remote-endpoint = <&lvds_encoder_output>;
remote-endpoint = <&bridge_output>;
};
};
};
Expand All @@ -200,15 +185,15 @@
port@0 {
reg = <0>;

lvds_encoder_input: endpoint {
remote-endpoint = <&lcd_output>;
bridge_input: endpoint {
remote-endpoint = <&dpi_output>;
};
};

port@1 {
reg = <1>;

lvds_encoder_output: endpoint {
bridge_output: endpoint {
remote-endpoint = <&panel_input>;
};
};
Expand Down
27 changes: 10 additions & 17 deletions arch/arm/boot/dts/tegra30-asus-tf300t.dts
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,11 @@
model = "Asus Transformer Pad TF300T";
compatible = "asus,tf300t", "nvidia,tegra30";

host1x@50000000 {
lcd: dc@54200000 {
rgb {
status = "okay";

port@0 {
lcd_output: endpoint {
remote-endpoint = <&lvds_encoder_input>;
bus-width = <24>;
};
};
};
gpio@6000d000 {
tf300t-init-hog {
gpio-hog;
gpios = <TEGRA_GPIO(BB, 5) GPIO_ACTIVE_HIGH>;
output-low;
};
};

Expand Down Expand Up @@ -168,7 +161,7 @@

port {
panel_input: endpoint {
remote-endpoint = <&lvds_encoder_output>;
remote-endpoint = <&bridge_output>;
};
};
};
Expand All @@ -187,15 +180,15 @@
port@0 {
reg = <0>;

lvds_encoder_input: endpoint {
remote-endpoint = <&lcd_output>;
bridge_input: endpoint {
remote-endpoint = <&dpi_output>;
};
};

port@1 {
reg = <1>;

lvds_encoder_output: endpoint {
bridge_output: endpoint {
remote-endpoint = <&panel_input>;
};
};
Expand All @@ -216,7 +209,7 @@
"Int Spk", "LON",
"IN1L", "Mic Jack",
"IN2L", "Mic Jack",
"DMIC", "Int Mic";
"DMICDAT", "Int Mic";

nvidia,audio-codec = <&wm8903>;
nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
Expand Down
15 changes: 2 additions & 13 deletions arch/arm/boot/dts/tegra30-asus-tf700t.dts
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,8 @@

host1x@50000000 {
lcd: dc@54200000 {
clocks = <&tegra_car TEGRA30_CLK_DISP1>,
<&tegra_car TEGRA30_CLK_PLL_D_OUT0>;

rgb {
status = "okay";

port@0 {
dpi_output: endpoint {
remote-endpoint = <&bridge_input>;
bus-width = <24>;
};
};
};
clocks = <&tegra_car TEGRA30_CLK_DISP1>,
<&tegra_car TEGRA30_CLK_PLL_D_OUT0>;
};
};

Expand Down
38 changes: 24 additions & 14 deletions arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,19 @@
nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
nvidia,ddc-i2c-bus = <&hdmi_ddc>;
};

lcd: dc@54200000 {
rgb {
status = "okay";

port@0 {
dpi_output: endpoint {
remote-endpoint = <&bridge_input>;
bus-width = <24>;
};
};
};
};
};

gpio@6000d000 {
Expand All @@ -94,9 +107,9 @@
output-low;
};

usb_charge_limit-hog {
usb-charge-limit-hog {
gpio-hog;
gpios = <TEGRA_GPIO(R, 1) GPIO_ACTIVE_LOW>; // LIMIT_SET0, out, lo; @tegra_udc.LIMIT_PWR [0 = 0.5A, 1 = 1A]
gpios = <TEGRA_GPIO(R, 1) GPIO_ACTIVE_LOW>;
output-high;
};
};
Expand Down Expand Up @@ -1239,8 +1252,8 @@

vdd_1v8: vio {
regulator-name = "vdd_1v8_gen";
regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <3300000>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
regulator-boot-on;
};
Expand Down Expand Up @@ -1332,6 +1345,8 @@
regulator-max-microvolt = <5000000>;
regulator-always-on;
regulator-boot-on;
gpio = <&pmic 8 GPIO_ACTIVE_HIGH>;
enable-active-high;
};

vdd_3v3_sys: regulator@1 {
Expand All @@ -1341,6 +1356,8 @@
regulator-max-microvolt = <3300000>;
regulator-always-on;
regulator-boot-on;
gpio = <&pmic 6 GPIO_ACTIVE_HIGH>;
enable-active-high;
};

vdd_pnl: regulator@2 {
Expand Down Expand Up @@ -1525,7 +1542,7 @@

enable-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
power-supply = <&vdd_5v0_sys>;
pwms = <&pwm 0 5000000>;
pwms = <&pwm 0 4000000>;

brightness-levels = <1 255>;
num-interpolated-steps = <254>;
Expand Down Expand Up @@ -1653,16 +1670,9 @@
};

thermal-zones {
skin-thermal {
polling-delay-passive = <1000>; /* milliseconds */
polling-delay = <0>; /* milliseconds */

thermal-sensors = <&nct72 0>;
};

cpu-thermal {
polling-delay-passive = <500>; /* milliseconds */
polling-delay = <1000>; /* milliseconds */
polling-delay-passive = <1000>; /* milliseconds */
polling-delay = <5000>; /* milliseconds */

thermal-sensors = <&nct72 1>;

Expand Down