Skip to content

L
linux
Commit 9ab9ecd8 authored by Thierry Reding's avatar Thierry Reding
Browse files
Options

ARM: tegra: Drop reg-shift for Tegra HS UART 

When the Tegra High-Speed UART is used instead of the regular UART, the
reg-shift property is implied from the compatible string and should not
be explicitly listed.
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 1b5bad01
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 1 deletion
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
View file @ 9ab9ecd8
...@@ -1539,14 +1539,17 @@ sdmmc3-clk-lb-out-pee4 { /* NC */ ...@@ -1539,14 +1539,17 @@ sdmmc3-clk-lb-out-pee4 { /* NC */
serial@70006040 { serial@70006040 {
compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
}; };
serial@70006200 { serial@70006200 {
compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
}; };
serial@70006300 { serial@70006300 {
compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
}; };
hdmi_ddc: i2c@7000c700 { hdmi_ddc: i2c@7000c700 {
......
arch/arm/boot/dts/tegra124-apalis.dtsi
View file @ 9ab9ecd8
...@@ -1532,14 +1532,17 @@ sdmmc3-clk-lb-out-pee4 { /* NC */ ...@@ -1532,14 +1532,17 @@ sdmmc3-clk-lb-out-pee4 { /* NC */
serial@70006040 { serial@70006040 {
compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
}; };
serial@70006200 { serial@70006200 {
compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
}; };
serial@70006300 { serial@70006300 {
compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
}; };
hdmi_ddc: i2c@7000c400 { hdmi_ddc: i2c@7000c400 {
......
arch/arm/boot/dts/tegra124-jetson-tk1.dts
View file @ 9ab9ecd8
...@@ -1389,6 +1389,7 @@ dsi_b { ...@@ -1389,6 +1389,7 @@ dsi_b {
*/ */
serial@70006000 { serial@70006000 {
compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
status = "okay"; status = "okay";
}; };
...@@ -1401,6 +1402,7 @@ serial@70006000 { ...@@ -1401,6 +1402,7 @@ serial@70006000 {
*/ */
serial@70006040 { serial@70006040 {
compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
View file @ 9ab9ecd8
...@@ -382,11 +382,13 @@ tegra_i2s1: i2s@70002800 { ...@@ -382,11 +382,13 @@ tegra_i2s1: i2s@70002800 {
uartb: serial@70006040 { uartb: serial@70006040 {
compatible = "nvidia,tegra20-hsuart"; compatible = "nvidia,tegra20-hsuart";
/delete-property/ reg-shift;
/* GPS BCM4751 */ /* GPS BCM4751 */
}; };
uartc: serial@70006200 { uartc: serial@70006200 {
compatible = "nvidia,tegra20-hsuart"; compatible = "nvidia,tegra20-hsuart";
/delete-property/ reg-shift;
status = "okay"; status = "okay";
/* Azurewave AW-NH665 BCM4329B1 */ /* Azurewave AW-NH665 BCM4329B1 */
......
arch/arm/boot/dts/tegra20-colibri.dtsi
View file @ 9ab9ecd8
...@@ -428,10 +428,12 @@ tegra_ac97: ac97@70002000 { ...@@ -428,10 +428,12 @@ tegra_ac97: ac97@70002000 {
serial@70006040 { serial@70006040 {
compatible = "nvidia,tegra20-hsuart"; compatible = "nvidia,tegra20-hsuart";
/delete-property/ reg-shift;
}; };
serial@70006300 { serial@70006300 {
compatible = "nvidia,tegra20-hsuart"; compatible = "nvidia,tegra20-hsuart";
/delete-property/ reg-shift;
}; };
nand-controller@70008000 { nand-controller@70008000 {
......
arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi
View file @ 9ab9ecd8
...@@ -829,14 +829,17 @@ pv0 { ...@@ -829,14 +829,17 @@ pv0 {
serial@70006040 { serial@70006040 {
compatible = "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
}; };
serial@70006200 { serial@70006200 {
compatible = "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
}; };
serial@70006300 { serial@70006300 {
compatible = "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
}; };
hdmi_ddc: i2c@7000c700 { hdmi_ddc: i2c@7000c700 {
......
arch/arm/boot/dts/tegra30-apalis.dtsi
View file @ 9ab9ecd8
...@@ -820,14 +820,17 @@ pv0 { ...@@ -820,14 +820,17 @@ pv0 {
serial@70006040 { serial@70006040 {
compatible = "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
}; };
serial@70006200 { serial@70006200 {
compatible = "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
}; };
serial@70006300 { serial@70006300 {
compatible = "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
}; };
hdmi_ddc: i2c@7000c700 { hdmi_ddc: i2c@7000c700 {
......
arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi
View file @ 9ab9ecd8
...@@ -804,11 +804,13 @@ drive_gma { ...@@ -804,11 +804,13 @@ drive_gma {
uartb: serial@70006040 { uartb: serial@70006040 {
compatible = "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
/* GPS BCM4751 */ /* GPS BCM4751 */
}; };
uartc: serial@70006200 { uartc: serial@70006200 {
compatible = "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
status = "okay"; status = "okay";
nvidia,adjust-baud-rates = <0 9600 100>, nvidia,adjust-baud-rates = <0 9600 100>,
......
arch/arm/boot/dts/tegra30-cardhu.dtsi
View file @ 9ab9ecd8
...@@ -175,6 +175,7 @@ serial@70006000 { ...@@ -175,6 +175,7 @@ serial@70006000 {
serial@70006200 { serial@70006200 {
compatible = "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/tegra30-colibri.dtsi
View file @ 9ab9ecd8
...@@ -701,10 +701,12 @@ pv0 { ...@@ -701,10 +701,12 @@ pv0 {
serial@70006040 { serial@70006040 {
compatible = "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
}; };
serial@70006300 { serial@70006300 {
compatible = "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
}; };
hdmi_ddc: i2c@7000c700 { hdmi_ddc: i2c@7000c700 {
......
arch/arm/boot/dts/tegra30-ouya.dts
View file @ 9ab9ecd8
...@@ -82,8 +82,9 @@ state_default: pinmux { ...@@ -82,8 +82,9 @@ state_default: pinmux {
}; };
uartc: serial@70006200 { uartc: serial@70006200 {
status = "okay";
compatible = "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra30-hsuart";
/delete-property/ reg-shift;
status = "okay";
nvidia,adjust-baud-rates = <0 9600 100>, nvidia,adjust-baud-rates = <0 9600 100>,
<9600 115200 200>, <9600 115200 200>,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7