[U-Boot] [PATCH v2 1/4] tegra: Remove merge markers in some Kconfig files

[U-Boot] [PATCH v2 1/4] tegra: Remove merge markers in some Kconfig files

[Simon Glass]

These were added by mistake in commit fde7e189. They cause a warning when
configuring the boards. Remove them.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Stephen Warren <swarren@nvidia.com>
Reported-by: Kevin Hilman <khilman@linaro.org>
Tested-by: Stephen Warren <swarren@nvidia.com>
Fixes: fde7e18938d8 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig")
---

Changes in v2:
- Add 'Fixes' tag

 configs/beaver_defconfig     | 3 ---
 configs/cardhu_defconfig     | 3 ---
 configs/jetson-tk1_defconfig | 3 ---
 configs/trimslice_defconfig  | 3 ---
 4 files changed, 12 deletions(-)

diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 2930344..8add08d 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
-<<<<<<< HEAD
 CONFIG_SPI_FLASH_WINBOND=y
-=======
 CONFIG_PCI_TEGRA=y
->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SLINK=y
 CONFIG_USB=y
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 5760018..c9f565a 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
-<<<<<<< HEAD
 CONFIG_SPI_FLASH_WINBOND=y
-=======
 CONFIG_PCI_TEGRA=y
->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SLINK=y
 CONFIG_USB=y
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 9500d2c..efc4aee 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
-<<<<<<< HEAD
 CONFIG_SPI_FLASH_WINBOND=y
-=======
 CONFIG_PCI_TEGRA=y
->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index ee40218..e34faa3 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
-<<<<<<< HEAD
 CONFIG_SPI_FLASH_WINBOND=y
-=======
 CONFIG_PCI_TEGRA=y
->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SFLASH=y
 CONFIG_USB=y
-- 
2.6.0.rc2.230.g3dd15c0

[U-Boot] [PATCH v2 2/4] dm: serial: ns16550: Add pre-reloc flag to the driver

[Simon Glass]

For platforms that don't use device tree in SPL the only way to mark this
driver as 'required by relocation' is with the DM_FLAG_PRE_RELOC flag. Add
this to ensure that the driver is bound.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Thomas Chou <thomas@wytron.com.tw>
Fixes: 1874626b (ns16550: unify serial_tegra)
---

Changes in v2: None

 drivers/serial/ns16550.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 166deab..256c7ea 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -451,5 +451,6 @@ U_BOOT_DRIVER(ns16550_serial) = {
 	.priv_auto_alloc_size = sizeof(struct NS16550),
 	.probe = ns16550_serial_probe,
 	.ops	= &ns16550_serial_ops,
+	.flags	= DM_FLAG_PRE_RELOC,
 };
 #endif /* CONFIG_DM_SERIAL */
-- 
2.6.0.rc2.230.g3dd15c0

[U-Boot] [PATCH v2 3/4] dm: tegra: Provide serial platform data for SPL

[Simon Glass]

At present an incorrect #if term is preventing this data from being compiled
in. All tegra boards use driver model for serial, so we can just drop this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Thomas Chou <thomas@wytron.com.tw>
Fixes: 1874626b (ns16550: unify serial_tegra)
---

Changes in v2: None

 arch/arm/mach-tegra/board.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index 8c8927d..3d1d26d 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -214,7 +214,7 @@ void board_init_uart_f(void)
 	setup_uarts(uart_ids);
 }
 
-#if CONFIG_IS_ENABLED(DM_SERIAL) && !CONFIG_IS_ENABLED(OF_CONTROL)
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
 static struct ns16550_platdata ns16550_com1_pdata = {
 	.base = CONFIG_SYS_NS16550_COM1,
 	.reg_shift = 2,
-- 
2.6.0.rc2.230.g3dd15c0

[U-Boot] [PATCH v2 4/4] dm: omap: Fix serial UART on beaglebone black (vboot only)

[Simon Glass]

This is currently broken since it does not have the reg-shift property for
the UART in the device tree. Fix it.

Reported-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
---
This patch does not fix the non-vboot boards. I haven't added this to the
series in v2 as Tom has already sent a patch.

Changes in v2: None

 arch/arm/dts/am33xx.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/dts/am33xx.dtsi b/arch/arm/dts/am33xx.dtsi
index 21fcc44..b26e21b 100644
--- a/arch/arm/dts/am33xx.dtsi
+++ b/arch/arm/dts/am33xx.dtsi
@@ -214,6 +214,7 @@
 			ti,hwmods = "uart1";
 			clock-frequency = <48000000>;
 			reg = <0x44e09000 0x2000>;
+			reg-shift = <2>;
 			interrupts = <72>;
 			status = "disabled";
 			dmas = <&edma 26>, <&edma 27>;
@@ -225,6 +226,7 @@
 			ti,hwmods = "uart2";
 			clock-frequency = <48000000>;
 			reg = <0x48022000 0x2000>;
+			reg-shift = <2>;
 			interrupts = <73>;
 			status = "disabled";
 			dmas = <&edma 28>, <&edma 29>;
@@ -236,6 +238,7 @@
 			ti,hwmods = "uart3";
 			clock-frequency = <48000000>;
 			reg = <0x48024000 0x2000>;
+			reg-shift = <2>;
 			interrupts = <74>;
 			status = "disabled";
 			dmas = <&edma 30>, <&edma 31>;
@@ -247,6 +250,7 @@
 			ti,hwmods = "uart4";
 			clock-frequency = <48000000>;
 			reg = <0x481a6000 0x2000>;
+			reg-shift = <2>;
 			interrupts = <44>;
 			status = "disabled";
 		};
@@ -256,6 +260,7 @@
 			ti,hwmods = "uart5";
 			clock-frequency = <48000000>;
 			reg = <0x481a8000 0x2000>;
+			reg-shift = <2>;
 			interrupts = <45>;
 			status = "disabled";
 		};
@@ -265,6 +270,7 @@
 			ti,hwmods = "uart6";
 			clock-frequency = <48000000>;
 			reg = <0x481aa000 0x2000>;
+			reg-shift = <2>;
 			interrupts = <46>;
 			status = "disabled";
 		};
-- 
2.6.0.rc2.230.g3dd15c0