diff mbox

[U-Boot] venice2: move device tree to fix build error

Message ID 1392884322-30854-1-git-send-email-yamada.m@jp.panasonic.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Masahiro Yamada Feb. 20, 2014, 8:18 a.m. UTC 
Commit 5ab502cb gathered all device tree sources
to arch/$(ARCH)/dts/.
So tegra124-venice2.dts also must go to arch/arm/dts directory
to build venice2 board.

(Commit 5ab502cb had been posted before venice2 board support
was merged. So an unvisible conflict happened.)

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@ti.com>
---
 arch/arm/dts/Makefile                 |  5 +--
 arch/arm/dts/tegra124-venice2.dts     | 84 +++++++++++++++++++++++++++++++++++
 board/nvidia/dts/tegra124-venice2.dts | 84 -----------------------------------
 3 files changed, 86 insertions(+), 87 deletions(-)
 create mode 100644 arch/arm/dts/tegra124-venice2.dts
 delete mode 100644 board/nvidia/dts/tegra124-venice2.dts

Comments

Stephen Warren Feb. 20, 2014, 4:17 p.m. UTC | #1 
On 02/20/2014 01:18 AM, Masahiro Yamada wrote:
> Commit 5ab502cb gathered all device tree sources
> to arch/$(ARCH)/dts/.
> So tegra124-venice2.dts also must go to arch/arm/dts directory
> to build venice2 board.
> 
> (Commit 5ab502cb had been posted before venice2 board support
> was merged. So an unvisible conflict happened.)

Since all the other DTS have moved likewise,
Acked-by: Stephen Warren <swarren@nvidia.com>

(although not that Tom Warren is the Tegra U-Boot maintainer).

>  arch/arm/dts/Makefile                 |  5 +--
>  arch/arm/dts/tegra124-venice2.dts     | 84 +++++++++++++++++++++++++++++++++++
>  board/nvidia/dts/tegra124-venice2.dts | 84 -----------------------------------

I'm assuming the file was moved with zero changes. "git format-patch -M"
would have been useful to make this clear.
Tom Rini Feb. 20, 2014, 5:16 p.m. UTC | #2 
On Thu, Feb 20, 2014 at 09:08:21AM -0800, Tom Warren wrote:

> This fixes the MAKEALL -s tegra build break I saw this morning when I rebased u-boot-tegra/next against ARM master. Thanks.
> 
> TomR - will you take this into U-Boot master?

Yup, I've already got it queued along with the i2c PR and a few other
small things.
Tom Rini Feb. 20, 2014, 5:17 p.m. UTC | #3 
On Thu, Feb 20, 2014 at 05:18:42PM +0900, Masahiro Yamada wrote:

> Commit 5ab502cb gathered all device tree sources
> to arch/$(ARCH)/dts/.
> So tegra124-venice2.dts also must go to arch/arm/dts directory
> to build venice2 board.
> 
> (Commit 5ab502cb had been posted before venice2 board support
> was merged. So an unvisible conflict happened.)
> 
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Stephen Warren <swarren@nvidia.com>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Tom Rini <trini@ti.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 2658911..e2fcca5 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -2,7 +2,6 @@  dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \
 	exynos5250-snow.dtb \
 	exynos5250-smdk5250.dtb \
 	exynos5420-smdk5420.dtb
-
 dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
 	tegra20-medcom-wide.dtb \
 	tegra20-paz00.dtb \
@@ -16,8 +15,8 @@  dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
 	tegra30-beaver.dtb \
 	tegra30-cardhu.dtb \
 	tegra30-tec-ng.dtb \
-	tegra114-dalmore.dtb
-
+	tegra114-dalmore.dtb \
+	tegra124-venice2.dtb
 dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \
 	zynq-zc706.dtb \
 	zynq-zed.dtb \
diff --git a/arch/arm/dts/tegra124-venice2.dts b/arch/arm/dts/tegra124-venice2.dts
new file mode 100644
index 0000000..2f8d1dc
--- /dev/null
+++ b/arch/arm/dts/tegra124-venice2.dts
@@ -0,0 +1,84 @@ 
+/dts-v1/;
+
+#include "tegra124.dtsi"
+
+/ {
+	model = "NVIDIA Venice2";
+	compatible = "nvidia,venice2", "nvidia,tegra124";
+
+	aliases {
+		i2c0 = "/i2c@7000d000";
+		i2c1 = "/i2c@7000c000";
+		i2c2 = "/i2c@7000c400";
+		i2c3 = "/i2c@7000c500";
+		i2c4 = "/i2c@7000c700";
+		i2c5 = "/i2c@7000d100";
+		sdhci0 = "/sdhci@700b0600";
+		sdhci1 = "/sdhci@700b0400";
+		spi0 = "/spi@7000d400";
+		spi1 = "/spi@7000da00";
+		usb0 = "/usb@7d008000";
+	};
+
+	memory {
+		device_type = "memory";
+		reg = <0x80000000 0x80000000>;
+	};
+
+	i2c@7000c000 {
+		status = "okay";
+		clock-frequency = <100000>;
+	};
+
+	i2c@7000c400 {
+		status = "okay";
+		clock-frequency = <100000>;
+	};
+
+	i2c@7000c500 {
+		status = "okay";
+		clock-frequency = <100000>;
+	};
+
+	i2c@7000c700 {
+		status = "okay";
+		clock-frequency = <100000>;
+	};
+
+	i2c@7000d000 {
+		status = "okay";
+		clock-frequency = <400000>;
+	};
+
+	i2c@7000d100 {
+		status = "okay";
+		clock-frequency = <400000>;
+	};
+
+	spi@7000d400 {
+		status = "okay";
+		spi-max-frequency = <25000000>;
+	};
+
+	spi@7000da00 {
+		status = "okay";
+		spi-max-frequency = <25000000>;
+	};
+
+	sdhci@700b0400 {
+		status = "okay";
+		cd-gpios = <&gpio 170 0>; /* gpio PV2 */
+		power-gpios = <&gpio 136 0>; /* gpio PR0 */
+		bus-width = <4>;
+	};
+
+	sdhci@700b0600 {
+		status = "okay";
+		bus-width = <8>;
+	};
+
+	usb@7d008000 {
+		status = "okay";
+		nvidia,vbus-gpio = <&gpio 109 0>; /* gpio PN5, USB_VBUS_EN1 */
+	};
+};
diff --git a/board/nvidia/dts/tegra124-venice2.dts b/board/nvidia/dts/tegra124-venice2.dts
deleted file mode 100644
index 2f8d1dc..0000000
--- a/board/nvidia/dts/tegra124-venice2.dts
+++ /dev/null
@@ -1,84 +0,0 @@ 
-/dts-v1/;
-
-#include "tegra124.dtsi"
-
-/ {
-	model = "NVIDIA Venice2";
-	compatible = "nvidia,venice2", "nvidia,tegra124";
-
-	aliases {
-		i2c0 = "/i2c@7000d000";
-		i2c1 = "/i2c@7000c000";
-		i2c2 = "/i2c@7000c400";
-		i2c3 = "/i2c@7000c500";
-		i2c4 = "/i2c@7000c700";
-		i2c5 = "/i2c@7000d100";
-		sdhci0 = "/sdhci@700b0600";
-		sdhci1 = "/sdhci@700b0400";
-		spi0 = "/spi@7000d400";
-		spi1 = "/spi@7000da00";
-		usb0 = "/usb@7d008000";
-	};
-
-	memory {
-		device_type = "memory";
-		reg = <0x80000000 0x80000000>;
-	};
-
-	i2c@7000c000 {
-		status = "okay";
-		clock-frequency = <100000>;
-	};
-
-	i2c@7000c400 {
-		status = "okay";
-		clock-frequency = <100000>;
-	};
-
-	i2c@7000c500 {
-		status = "okay";
-		clock-frequency = <100000>;
-	};
-
-	i2c@7000c700 {
-		status = "okay";
-		clock-frequency = <100000>;
-	};
-
-	i2c@7000d000 {
-		status = "okay";
-		clock-frequency = <400000>;
-	};
-
-	i2c@7000d100 {
-		status = "okay";
-		clock-frequency = <400000>;
-	};
-
-	spi@7000d400 {
-		status = "okay";
-		spi-max-frequency = <25000000>;
-	};
-
-	spi@7000da00 {
-		status = "okay";
-		spi-max-frequency = <25000000>;
-	};
-
-	sdhci@700b0400 {
-		status = "okay";
-		cd-gpios = <&gpio 170 0>; /* gpio PV2 */
-		power-gpios = <&gpio 136 0>; /* gpio PR0 */
-		bus-width = <4>;
-	};
-
-	sdhci@700b0600 {
-		status = "okay";
-		bus-width = <8>;
-	};
-
-	usb@7d008000 {
-		status = "okay";
-		nvidia,vbus-gpio = <&gpio 109 0>; /* gpio PN5, USB_VBUS_EN1 */
-	};
-};