Skip to content
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
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1355,6 +1355,8 @@ dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += \
tegra30-asus-tf201.dtb \
tegra30-asus-tf300t.dtb \
tegra30-asus-tf300tg.dtb \
tegra30-asus-tf300tl.dtb \
tegra30-asus-tf600t.dtb \
tegra30-asus-tf700t.dtb \
tegra30-beaver.dtb \
tegra30-cardhu-a02.dtb \
Expand Down
14 changes: 14 additions & 0 deletions arch/arm/boot/dts/tegra20-asus-tf101.dts
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,20 @@
status = "okay";
clock-frequency = <400000>;

/* Fortemedia FM34NE voice processor */
dsp@60 {
compatible = "asus,tf101-dsp", "fortemedia,fm34";
reg = <0x60>;

bypass-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
reset-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;

vdd-supply = <&vdd_1v8_sys>;

clocks = <&tegra_car TEGRA20_CLK_CDEV1>;
clock-names = "mclk";
};

/* Aichi AMI306 digital compass */
magnetometer@e {
compatible = "asahi-kasei,ak8974";
Expand Down
30 changes: 29 additions & 1 deletion arch/arm/boot/dts/tegra30-asus-tf201.dts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,25 @@
};
};

i2c@7000c000 {
/* Fortemedia FM34NE voice processor */
dsp@60 {
compatible = "asus,tf201-dsp", "fortemedia,fm34";
reg = <0x60>;

bypass-gpios = <&gpio TEGRA_GPIO(BB, 6) GPIO_ACTIVE_HIGH>;
reset-gpios = <&gpio TEGRA_GPIO(O, 3) GPIO_ACTIVE_LOW>;

vdd-supply = <&vdd_1v8_dsp>;

clocks = <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
clock-names = "mclk";

assigned-clocks = <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
assigned-clock-parents = <&tegra_car TEGRA30_CLK_EXTERN1>;
};
};

i2c@7000c400 {
/* Atmel MXT768E touchscreen */
touchscreen@4d {
Expand Down Expand Up @@ -620,7 +639,16 @@
vcc-supply = <&vdd_3v3_sys>;
};

/* FIXME: Sound only works, if booted from downstream kernel */
vdd_1v8_dsp: regulator-dsp {
compatible = "regulator-fixed";
regulator-name = "vdd_1v8_dsp";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
gpio = <&gpio TEGRA_GPIO(U, 5) GPIO_ACTIVE_HIGH>;
enable-active-high;
vin-supply = <&vdd_1v8_vio>;
};

sound {
compatible = "asus,tegra-audio-rt5631-tf201",
"nvidia,tegra-audio-rt5631";
Expand Down
30 changes: 29 additions & 1 deletion arch/arm/boot/dts/tegra30-asus-tf300t.dts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,25 @@
};
};

i2c@7000c000 {
/* Fortemedia FM34NE voice processor */
dsp@60 {
compatible = "asus,tf300t-dsp", "fortemedia,fm34";
reg = <0x60>;

bypass-gpios = <&gpio TEGRA_GPIO(BB, 6) GPIO_ACTIVE_HIGH>;
reset-gpios = <&gpio TEGRA_GPIO(O, 3) GPIO_ACTIVE_LOW>;

vdd-supply = <&vdd_1v8_dsp>;

clocks = <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
clock-names = "mclk";

assigned-clocks = <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
assigned-clock-parents = <&tegra_car TEGRA30_CLK_EXTERN1>;
};
};

i2c@7000c400 {
/* Elantech EKTH1036 touchscreen */
touchscreen@10 {
Expand Down Expand Up @@ -1013,7 +1032,16 @@
compatible = "innolux,g101ice-l01";
};

/* FIXME: Sound doesn't work yet */
vdd_1v8_dsp: regulator-dsp {
compatible = "regulator-fixed";
regulator-name = "vdd_1v8_dsp";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
gpio = <&gpio TEGRA_GPIO(P, 3) GPIO_ACTIVE_HIGH>;
enable-active-high;
vin-supply = <&vdd_1v8_vio>;
};

sound {
compatible = "asus,tegra-audio-wm8903-tf300t",
"nvidia,tegra-audio-wm8903";
Expand Down
21 changes: 20 additions & 1 deletion arch/arm/boot/dts/tegra30-asus-tf300tg.dts
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,25 @@
};
};

i2c@7000c000 {
/* Fortemedia FM34NE voice processor */
dsp@60 {
compatible = "asus,tf300t-dsp", "fortemedia,fm34";
reg = <0x60>;

bypass-gpios = <&gpio TEGRA_GPIO(BB, 6) GPIO_ACTIVE_HIGH>;
reset-gpios = <&gpio TEGRA_GPIO(O, 3) GPIO_ACTIVE_LOW>;

vdd-supply = <&vdd_1v8_vio>;

clocks = <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
clock-names = "mclk";

assigned-clocks = <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
assigned-clock-parents = <&tegra_car TEGRA30_CLK_EXTERN1>;
};
};

i2c@7000c400 {
/* Elantech EKTH1036 touchscreen */
touchscreen@10 {
Expand Down Expand Up @@ -1088,7 +1107,7 @@
};

sound {
compatible = "nvidia,tegra-audio-rt5631-tf300tg",
compatible = "asus,tegra-audio-rt5631-tf300tg",
"nvidia,tegra-audio-rt5631";
nvidia,model = "Asus Transformer Pad TF300TG RT5631";

Expand Down
Loading