Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58ecb23f authored by Stephen Warren's avatar Stephen Warren
Browse files

ARM: tegra: add missing unit addresses to DT



DT node names should include a unit address iff the node has a reg
property. For Tegra DTs at least, we were previously applying a different
rule, namely that node names only needed to include a unit address if it
was required to make the node name unique. Consequently, many unit
addresses are missing. Add them.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent 18f48a4f
Loading
Loading
Loading
Loading
+9 −9
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@
		reg = <0x80000000 0x40000000>;
		reg = <0x80000000 0x40000000>;
	};
	};


	pinmux {
	pinmux@70000868 {
		pinctrl-names = "default";
		pinctrl-names = "default";
		pinctrl-0 = <&state_default>;
		pinctrl-0 = <&state_default>;


@@ -722,7 +722,7 @@
		status = "okay";
		status = "okay";
		clock-frequency = <100000>;
		clock-frequency = <100000>;


		battery: smart-battery {
		battery: smart-battery@b {
			compatible = "ti,bq20z45", "sbs,sbs-battery";
			compatible = "ti,bq20z45", "sbs,sbs-battery";
			reg = <0xb>;
			reg = <0xb>;
			battery-name = "battery";
			battery-name = "battery";
@@ -731,7 +731,7 @@
			power-supplies = <&charger>;
			power-supplies = <&charger>;
		};
		};


		rt5640: rt5640 {
		rt5640: rt5640@1c {
			compatible = "realtek,rt5640";
			compatible = "realtek,rt5640";
			reg = <0x1c>;
			reg = <0x1c>;
			interrupt-parent = <&gpio>;
			interrupt-parent = <&gpio>;
@@ -753,7 +753,7 @@
		status = "okay";
		status = "okay";
		clock-frequency = <400000>;
		clock-frequency = <400000>;


		tps51632 {
		tps51632@43 {
			compatible = "ti,tps51632";
			compatible = "ti,tps51632";
			reg = <0x43>;
			reg = <0x43>;
			regulator-name = "vdd-cpu";
			regulator-name = "vdd-cpu";
@@ -763,7 +763,7 @@
			regulator-always-on;
			regulator-always-on;
		};
		};


		tps65090 {
		tps65090@48 {
			compatible = "ti,tps65090";
			compatible = "ti,tps65090";
			reg = <0x48>;
			reg = <0x48>;
			interrupt-parent = <&gpio>;
			interrupt-parent = <&gpio>;
@@ -846,7 +846,7 @@
			};
			};
		};
		};


		palmas: tps65913 {
		palmas: tps65913@58 {
			compatible = "ti,palmas";
			compatible = "ti,palmas";
			reg = <0x58>;
			reg = <0x58>;
			interrupts = <0 86 IRQ_TYPE_LEVEL_LOW>;
			interrupts = <0 86 IRQ_TYPE_LEVEL_LOW>;
@@ -1046,7 +1046,7 @@
		};
		};
	};
	};


	pmc {
	pmc@7000e400 {
		nvidia,invert-interrupt;
		nvidia,invert-interrupt;
		nvidia,suspend-mode = <1>;
		nvidia,suspend-mode = <1>;
		nvidia,cpu-pwr-good-time = <500>;
		nvidia,cpu-pwr-good-time = <500>;
@@ -1057,7 +1057,7 @@
		nvidia,sys-clock-req-active-high;
		nvidia,sys-clock-req-active-high;
	};
	};


	ahub {
	ahub@70080000 {
		i2s@70080400 {
		i2s@70080400 {
			status = "okay";
			status = "okay";
		};
		};
@@ -1089,7 +1089,7 @@
		#address-cells = <1>;
		#address-cells = <1>;
		#size-cells = <0>;
		#size-cells = <0>;


		clk32k_in: clock {
		clk32k_in: clock@0 {
			compatible = "fixed-clock";
			compatible = "fixed-clock";
			reg=<0>;
			reg=<0>;
			#clock-cells = <0>;
			#clock-cells = <0>;
+12 −12
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@
		serial3 = &uartd;
		serial3 = &uartd;
	};
	};


	gic: interrupt-controller {
	gic: interrupt-controller@50041000 {
		compatible = "arm,cortex-a15-gic";
		compatible = "arm,cortex-a15-gic";
		#interrupt-cells = <3>;
		#interrupt-cells = <3>;
		interrupt-controller;
		interrupt-controller;
@@ -39,14 +39,14 @@
		clocks = <&tegra_car TEGRA114_CLK_TIMER>;
		clocks = <&tegra_car TEGRA114_CLK_TIMER>;
	};
	};


	tegra_car: clock {
	tegra_car: clock@60006000 {
		compatible = "nvidia,tegra114-car";
		compatible = "nvidia,tegra114-car";
		reg = <0x60006000 0x1000>;
		reg = <0x60006000 0x1000>;
		#clock-cells = <1>;
		#clock-cells = <1>;
		#reset-cells = <1>;
		#reset-cells = <1>;
	};
	};


	apbdma: dma {
	apbdma: dma@6000a000 {
		compatible = "nvidia,tegra114-apbdma";
		compatible = "nvidia,tegra114-apbdma";
		reg = <0x6000a000 0x1400>;
		reg = <0x6000a000 0x1400>;
		interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
		interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
@@ -87,12 +87,12 @@
		#dma-cells = <1>;
		#dma-cells = <1>;
	};
	};


	ahb: ahb {
	ahb: ahb@6000c004 {
		compatible = "nvidia,tegra114-ahb", "nvidia,tegra30-ahb";
		compatible = "nvidia,tegra114-ahb", "nvidia,tegra30-ahb";
		reg = <0x6000c004 0x14c>;
		reg = <0x6000c004 0x14c>;
	};
	};


	gpio: gpio {
	gpio: gpio@6000d000 {
		compatible = "nvidia,tegra114-gpio", "nvidia,tegra30-gpio";
		compatible = "nvidia,tegra114-gpio", "nvidia,tegra30-gpio";
		reg = <0x6000d000 0x1000>;
		reg = <0x6000d000 0x1000>;
		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>,
		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>,
@@ -109,7 +109,7 @@
		interrupt-controller;
		interrupt-controller;
	};
	};


	pinmux: pinmux {
	pinmux: pinmux@70000868 {
		compatible = "nvidia,tegra114-pinmux";
		compatible = "nvidia,tegra114-pinmux";
		reg = <0x70000868 0x148		/* Pad control registers */
		reg = <0x70000868 0x148		/* Pad control registers */
		       0x70003000 0x40c>;	/* Mux registers */
		       0x70003000 0x40c>;	/* Mux registers */
@@ -175,7 +175,7 @@
		status = "disabled";
		status = "disabled";
	};
	};


	pwm: pwm {
	pwm: pwm@7000a000 {
		compatible = "nvidia,tegra114-pwm", "nvidia,tegra20-pwm";
		compatible = "nvidia,tegra114-pwm", "nvidia,tegra20-pwm";
		reg = <0x7000a000 0x100>;
		reg = <0x7000a000 0x100>;
		#pwm-cells = <2>;
		#pwm-cells = <2>;
@@ -350,14 +350,14 @@
		status = "disabled";
		status = "disabled";
	};
	};


	rtc {
	rtc@7000e000 {
		compatible = "nvidia,tegra114-rtc", "nvidia,tegra20-rtc";
		compatible = "nvidia,tegra114-rtc", "nvidia,tegra20-rtc";
		reg = <0x7000e000 0x100>;
		reg = <0x7000e000 0x100>;
		interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
		interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&tegra_car TEGRA114_CLK_RTC>;
		clocks = <&tegra_car TEGRA114_CLK_RTC>;
	};
	};


	kbc {
	kbc@7000e200 {
		compatible = "nvidia,tegra114-kbc";
		compatible = "nvidia,tegra114-kbc";
		reg = <0x7000e200 0x100>;
		reg = <0x7000e200 0x100>;
		interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
		interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
@@ -367,14 +367,14 @@
		status = "disabled";
		status = "disabled";
	};
	};


	pmc {
	pmc@7000e400 {
		compatible = "nvidia,tegra114-pmc";
		compatible = "nvidia,tegra114-pmc";
		reg = <0x7000e400 0x400>;
		reg = <0x7000e400 0x400>;
		clocks = <&tegra_car TEGRA114_CLK_PCLK>, <&clk32k_in>;
		clocks = <&tegra_car TEGRA114_CLK_PCLK>, <&clk32k_in>;
		clock-names = "pclk", "clk32k_in";
		clock-names = "pclk", "clk32k_in";
	};
	};


	iommu {
	iommu@70019010 {
		compatible = "nvidia,tegra114-smmu", "nvidia,tegra30-smmu";
		compatible = "nvidia,tegra114-smmu", "nvidia,tegra30-smmu";
		reg = <0x70019010 0x02c
		reg = <0x70019010 0x02c
		       0x700191f0 0x010
		       0x700191f0 0x010
@@ -385,7 +385,7 @@
		nvidia,ahb = <&ahb>;
		nvidia,ahb = <&ahb>;
	};
	};


	ahub {
	ahub@70080000 {
		compatible = "nvidia,tegra114-ahub";
		compatible = "nvidia,tegra114-ahub";
		reg = <0x70080000 0x200>,
		reg = <0x70080000 0x200>,
		      <0x70080200 0x100>,
		      <0x70080200 0x100>,
+6 −6
Original line number Original line Diff line number Diff line
@@ -8,8 +8,8 @@
		reg = <0x00000000 0x20000000>;
		reg = <0x00000000 0x20000000>;
	};
	};


	host1x {
	host1x@50000000 {
		hdmi {
		hdmi@54280000 {
			vdd-supply = <&hdmi_vdd_reg>;
			vdd-supply = <&hdmi_vdd_reg>;
			pll-supply = <&hdmi_pll_reg>;
			pll-supply = <&hdmi_pll_reg>;


@@ -19,7 +19,7 @@
		};
		};
	};
	};


	pinmux {
	pinmux@70000014 {
		pinctrl-names = "default";
		pinctrl-names = "default";
		pinctrl-0 = <&state_default>;
		pinctrl-0 = <&state_default>;


@@ -362,7 +362,7 @@
		};
		};
	};
	};


	pmc {
	pmc@7000e400 {
		nvidia,suspend-mode = <1>;
		nvidia,suspend-mode = <1>;
		nvidia,cpu-pwr-good-time = <5000>;
		nvidia,cpu-pwr-good-time = <5000>;
		nvidia,cpu-pwr-off-time = <5000>;
		nvidia,cpu-pwr-off-time = <5000>;
@@ -442,7 +442,7 @@
		};
		};
	};
	};


	ac97: ac97 {
	ac97: ac97@70002000 {
		status = "okay";
		status = "okay";
		nvidia,codec-reset-gpio = <&gpio TEGRA_GPIO(V, 0)
		nvidia,codec-reset-gpio = <&gpio TEGRA_GPIO(V, 0)
			GPIO_ACTIVE_HIGH>;
			GPIO_ACTIVE_HIGH>;
@@ -471,7 +471,7 @@
		#address-cells = <1>;
		#address-cells = <1>;
		#size-cells = <0>;
		#size-cells = <0>;


		clk32k_in: clock {
		clk32k_in: clock@0 {
			compatible = "fixed-clock";
			compatible = "fixed-clock";
			reg=<0>;
			reg=<0>;
			#clock-cells = <0>;
			#clock-cells = <0>;
+7 −7
Original line number Original line Diff line number Diff line
@@ -10,8 +10,8 @@
		reg = <0x00000000 0x40000000>;
		reg = <0x00000000 0x40000000>;
	};
	};


	host1x {
	host1x@50000000 {
		hdmi {
		hdmi@54280000 {
			status = "okay";
			status = "okay";


			vdd-supply = <&hdmi_vdd_reg>;
			vdd-supply = <&hdmi_vdd_reg>;
@@ -23,7 +23,7 @@
		};
		};
	};
	};


	pinmux {
	pinmux@70000014 {
		pinctrl-names = "default";
		pinctrl-names = "default";
		pinctrl-0 = <&state_default>;
		pinctrl-0 = <&state_default>;


@@ -415,7 +415,7 @@
		};
		};
	};
	};


	pmc {
	pmc@7000e400 {
		nvidia,invert-interrupt;
		nvidia,invert-interrupt;
		nvidia,suspend-mode = <1>;
		nvidia,suspend-mode = <1>;
		nvidia,cpu-pwr-good-time = <5000>;
		nvidia,cpu-pwr-good-time = <5000>;
@@ -425,7 +425,7 @@
		nvidia,sys-clock-req-active-high;
		nvidia,sys-clock-req-active-high;
	};
	};


	pcie-controller {
	pcie-controller@80003000 {
		pex-clk-supply = <&pci_clk_reg>;
		pex-clk-supply = <&pci_clk_reg>;
		vdd-supply = <&pci_vdd_reg>;
		vdd-supply = <&pci_vdd_reg>;
		status = "okay";
		status = "okay";
@@ -488,7 +488,7 @@
		#address-cells = <1>;
		#address-cells = <1>;
		#size-cells = <0>;
		#size-cells = <0>;


		clk32k_in: clock {
		clk32k_in: clock@0 {
			compatible = "fixed-clock";
			compatible = "fixed-clock";
			reg=<0>;
			reg=<0>;
			#clock-cells = <0>;
			#clock-cells = <0>;
@@ -507,7 +507,7 @@
		};
		};
	};
	};


	kbc {
	kbc@7000e200 {
		status = "okay";
		status = "okay";
		nvidia,debounce-delay-ms = <2>;
		nvidia,debounce-delay-ms = <2>;
		nvidia,repeat-delay-ms = <160>;
		nvidia,repeat-delay-ms = <160>;
+3 −3
Original line number Original line Diff line number Diff line
@@ -6,13 +6,13 @@
	model = "Toradex Colibri T20 512MB on Iris";
	model = "Toradex Colibri T20 512MB on Iris";
	compatible = "toradex,iris", "toradex,colibri_t20-512", "nvidia,tegra20";
	compatible = "toradex,iris", "toradex,colibri_t20-512", "nvidia,tegra20";


	host1x {
	host1x@50000000 {
		hdmi {
		hdmi@54280000 {
			status = "okay";
			status = "okay";
		};
		};
	};
	};


	pinmux {
	pinmux@70000014 {
		state_default: pinmux {
		state_default: pinmux {
			hdint {
			hdint {
				nvidia,tristate = <0>;
				nvidia,tristate = <0>;
Loading