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

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
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -1539,14 +1539,17 @@ sdmmc3-clk-lb-out-pee4 { /* NC */

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

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

	serial@70006300 {
		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
		/delete-property/ reg-shift;
	};

	hdmi_ddc: i2c@7000c700 {
+3 −0
Original line number Diff line number Diff line
@@ -1532,14 +1532,17 @@ sdmmc3-clk-lb-out-pee4 { /* NC */

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

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

	serial@70006300 {
		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
		/delete-property/ reg-shift;
	};

	hdmi_ddc: i2c@7000c400 {
+2 −0
Original line number Diff line number Diff line
@@ -1389,6 +1389,7 @@ dsi_b {
	 */
	serial@70006000 {
		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
		/delete-property/ reg-shift;
		status = "okay";
	};

@@ -1401,6 +1402,7 @@ serial@70006000 {
	 */
	serial@70006040 {
		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
		/delete-property/ reg-shift;
		status = "okay";
	};

+2 −0
Original line number Diff line number Diff line
@@ -382,11 +382,13 @@ tegra_i2s1: i2s@70002800 {

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

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

		/* Azurewave AW-NH665 BCM4329B1 */
+2 −0
Original line number Diff line number Diff line
@@ -428,10 +428,12 @@ tegra_ac97: ac97@70002000 {

	serial@70006040 {
		compatible = "nvidia,tegra20-hsuart";
		/delete-property/ reg-shift;
	};

	serial@70006300 {
		compatible = "nvidia,tegra20-hsuart";
		/delete-property/ reg-shift;
	};

	nand-controller@70008000 {
Loading