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

[U-Boot] [PATCH 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>
---

 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 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>
---

 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 2/4] dm: serial: ns16550: Add pre-reloc flag to the driver

[Thomas Chou]

On 2015?12?04? 23:58, Simon Glass wrote:
> 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>
> ---
>
>   drivers/serial/ns16550.c | 1 +
>   1 file changed, 1 insertion(+)
>

Acked-by: Thomas Chou <thomas@wytron.com.tw>

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

[Tom Rini]

On Fri, Dec 04, 2015 at 08:58:38AM -0700, Simon Glass wrote:

> 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.
> 
> Fixes: fde7e18938d8 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig")
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reported-by: Stephen Warren <swarren@nvidia.com>
> Acked-by: Thomas Chou <thomas@wytron.com.tw>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151206/4a495896/attachment.sig>

[U-Boot] [PATCH 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>
---

 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 3/4] dm: tegra: Provide serial platform data for SPL

[Thomas Chou]

On 2015?12?04? 23:58, Simon Glass wrote:
> 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>
> ---
>
>   arch/arm/mach-tegra/board.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>

Acked-by: Thomas Chou <thomas@wytron.com.tw>

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

[Tom Rini]

On Fri, Dec 04, 2015 at 08:58:39AM -0700, Simon Glass wrote:

> 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.
> 
> Fixes: fde7e18938d8 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig")
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reported-by: Stephen Warren <swarren@nvidia.com>
> Acked-by: Thomas Chou <thomas@wytron.com.tw>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151206/190c90ad/attachment.sig>

[U-Boot] [PATCH 4/4] dm: omap: Fix serial UART on beaglebone black

[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>
---

 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

[U-Boot] [PATCH 4/4] dm: omap: Fix serial UART on beaglebone black

[Thomas Chou]

On 2015?12?04? 23:58, Simon Glass wrote:
> 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>
> ---
>
>   arch/arm/dts/am33xx.dtsi | 6 ++++++
>   1 file changed, 6 insertions(+)
>

Acked-by: Thomas Chou <thomas@wytron.com.tw>

[U-Boot] [PATCH 4/4] dm: omap: Fix serial UART on beaglebone black

[Tom Rini]

On Fri, Dec 04, 2015 at 08:58:40AM -0700, Simon Glass wrote:

> 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>

OK, this isn't enough.  Both this patch, and Mugunthan's more
comprehensive one (That gets all TI targets) fails on the non-OF_CONTROL
case.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151206/594a54dd/attachment.sig>

[U-Boot] [PATCH 4/4] dm: omap: Fix serial UART on beaglebone black

[Simon Glass]

Hi Tom,

On 6 December 2015 at 06:17, Tom Rini <trini@konsulko.com> wrote:
>
> On Fri, Dec 04, 2015 at 08:58:40AM -0700, Simon Glass wrote:
>
> > 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>
>
> OK, this isn't enough.  Both this patch, and Mugunthan's more
> comprehensive one (That gets all TI targets) fails on the non-OF_CONTROL
> case.

Yes I see. I meant to test that case as well but ran out of time. I'll
update the series.

Regards,
Simon

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

[Stephen Warren]

On 12/04/2015 08:58 AM, Simon Glass wrote:
> These were added by mistake in commit fde7e189. They cause a warning when
> configuring the boards. Remove them.

Patches 1-3,
Tested-by: Stephen Warren <swarren@nvidia.com>

It would be useful to include the appropriate Fixes: tags in the commit 
message, and this issue was originally:

Reported-by: Kevin Hilman <khilman@linaro.org>

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

[Simon Glass]

Hi Stephen,

On 4 December 2015 at 10:16, Stephen Warren <swarren@wwwdotorg.org> wrote:
> On 12/04/2015 08:58 AM, Simon Glass wrote:
>>
>> These were added by mistake in commit fde7e189. They cause a warning when
>> configuring the boards. Remove them.
>
>
> Patches 1-3,
> Tested-by: Stephen Warren <swarren@nvidia.com>
>
> It would be useful to include the appropriate Fixes: tags in the commit
> message, and this issue was originally:
>
> Reported-by: Kevin Hilman <khilman@linaro.org>

Thanks - what Fixes tags?

Regards,
Simon

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

[Stephen Warren]

On 12/04/2015 10:25 AM, Simon Glass wrote:
> Hi Stephen,
>
> On 4 December 2015 at 10:16, Stephen Warren <swarren@wwwdotorg.org> wrote:
>> On 12/04/2015 08:58 AM, Simon Glass wrote:
>>>
>>> These were added by mistake in commit fde7e189. They cause a warning when
>>> configuring the boards. Remove them.
>>
>>
>> Patches 1-3,
>> Tested-by: Stephen Warren <swarren@nvidia.com>
>>
>> It would be useful to include the appropriate Fixes: tags in the commit
>> message, and this issue was originally:
>>
>> Reported-by: Kevin Hilman <khilman@linaro.org>
>
> Thanks - what Fixes tags?

I'd expect the following at the start of the "signature paragraph":

Fixes: fde7e18938d8 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig")

Referencing in a standard way the commits that caused the bug that this 
patch fixes makes researching bug/commit history easier. Admittedly that 
tag is something from the Linux kernel development process and isn't 
mandated by U-Boot's process, but I think it's a good idea that's worth 
following.

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

[Thomas Chou]

On 2015?12?04? 23:58, Simon Glass wrote:
> 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>
> ---
>
>   configs/beaver_defconfig     | 3 ---
>   configs/cardhu_defconfig     | 3 ---
>   configs/jetson-tk1_defconfig | 3 ---
>   configs/trimslice_defconfig  | 3 ---
>   4 files changed, 12 deletions(-)
>

Acked-by: Thomas Chou <thomas@wytron.com.tw>

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

[Tom Rini]

On Fri, Dec 04, 2015 at 08:58:37AM -0700, Simon Glass wrote:

> These were added by mistake in commit fde7e189. They cause a warning when
> configuring the boards. Remove them.
> 
> Fixes: fde7e18938d8 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig")
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reported-by: Stephen Warren <swarren@nvidia.com>
> Tested-by: Stephen Warren <swarren@nvidia.com>
> Reported-by: Kevin Hilman <khilman@linaro.org>
> Acked-by: Thomas Chou <thomas@wytron.com.tw>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151206/3dbcf8ea/attachment.sig>