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
6 changes: 5 additions & 1 deletion arch/arm/boot/dts/tegra20-asus-tf101.dts
Original file line number Diff line number Diff line change
Expand Up @@ -450,11 +450,15 @@

serial@70006040 {
compatible = "nvidia,tegra20-hsuart";
/* GPS BCM4751 */
/delete-property/ reg-shift;
status = "okay";

/* Broadcom GPS BCM4751 */
};

serial@70006200 {
compatible = "nvidia,tegra20-hsuart";
/delete-property/ reg-shift;
status = "okay";

/* Azurewave AW-NH615 BCM4329B1 */
Expand Down
10 changes: 7 additions & 3 deletions arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
chassis-type = "convertible";

aliases {
mmc0 = "/mmc@78000600"; /* eMMC */
mmc1 = "/mmc@78000000"; /* uSD slot */
mmc2 = "/mmc@78000400"; /* WiFi */
mmc0 = &sdmmc4; /* eMMC */
mmc1 = &sdmmc1; /* uSD slot */
mmc2 = &sdmmc3; /* WiFi */
Comment on lines -15 to +17
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All such label changes should be squashed into a single patch and applied to all boards uniformly. I'll keep this patch in grate-kernel for now, but it will need to be extended if we'll want to merge it into upstream. You may continue working on it with further patches.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only tf has this change, tf101 and chagall have labels, but t30 transformers for some reasons did not fit. Idk why.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was in this way when sent to upstream, but reviewers decided to change it. I wonder why?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@thierryreding didn't want to apply patch that added labels to dtsi because some labels were unused.


rtc0 = &pmic;
rtc1 = "/rtc@7000e000";
Expand Down Expand Up @@ -1080,13 +1080,15 @@

serial@70006040 {
compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
status = "okay";

/* Broadcom GPS BCM47511 */
};

serial@70006200 {
compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
status = "okay";

nvidia,adjust-baud-rates = <0 9600 100>,
Expand Down Expand Up @@ -1469,6 +1471,8 @@
interrupt-parent = <&gpio>;
interrupts = <TEGRA_GPIO(O, 4) IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "host-wake";

reset-gpios = <&gpio TEGRA_GPIO(D, 3) GPIO_ACTIVE_LOW>;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please explain how this was tested? This "reset-gpios" isn't used by the kernel's brcmfmac driver, AFAICS.

  1. I see that Chagall and Ouya use D3 in the wifi_pwrseq, it's likely to be correct.
  2. You need to check whether toggling D4 makes a real difference (WiFi doesn't work without enabling it) because this gpio may be physically unconnected on Transformers, similarly to other Tegra devices where reset gpio is connected to both RST and PWR-enb pins of BCM WiFi (Acer A500, Nexus7 and etc).
  3. If D4 really works, then it should be specified as vmmc-supply and D3 should go to the pwrseq.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then why this property is in yaml? There was tests a while ago. wifi_pwrseq uses D4, and vmmc-supply is D0. D3 as I remember did not make any difference, although downstream uses it as reset gpio (https://github.com/clamor-s/morpheus_kernel_asus_tf201/blob/kernel-rework/arch/arm/mach-tegra/board-cardhu-sdhci.c#L38). This is to your choice.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Downstream kernel specifies GPIOs for all board variants, some of those GPIOs may do nothing depending on a board. If D3 does nothing on Transformers, then we shouldn't use it.

I'll merge this PR and drop this patch on rebase.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure

};
};

Expand Down
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/tegra30-pegatron-chagall.dts
Original file line number Diff line number Diff line change
Expand Up @@ -1103,13 +1103,15 @@

uartb: serial@70006040 {
compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
status = "okay";

/* Broadcom GPS BCM47511 */
};

uartc: serial@70006200 {
compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
status = "okay";

nvidia,adjust-baud-rates = <0 9600 100>,
Expand Down