summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorRouven Czerwinski <r.czerwinski@pengutronix.de>2019-01-18 12:12:16 +0100
committerRobert Schwebel <r.schwebel@pengutronix.de>2019-01-18 13:43:36 +0100
commit55a9334b0e98bc7434ba11785a359c1e90d9ce58 (patch)
tree649464e3ea263b68aa4d314013d8d65f1bebb629 /configs
parent7cb2beb67b21adbf3a5efffe68bbd96c5b0d8520 (diff)
downloadDistroKit-55a9334b0e98bc7434ba11785a359c1e90d9ce58.tar.gz
DistroKit-55a9334b0e98bc7434ba11785a359c1e90d9ce58.tar.xz
platform-v7a: barebox 2018.12.0 → 2019.01.0
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Diffstat (limited to 'configs')
-rw-r--r--configs/platform-v7a/barebox-am335x-mlo.config7
-rw-r--r--configs/platform-v7a/barebox-am335x.config7
-rw-r--r--configs/platform-v7a/barebox-mx6.config7
-rw-r--r--configs/platform-v7a/barebox-rpi2.config7
-rw-r--r--configs/platform-v7a/barebox-vexpress.config7
-rw-r--r--configs/platform-v7a/patches/barebox-2018.12.0/series22
-rw-r--r--configs/platform-v7a/patches/barebox-2019.01.0/0001-ARM-rpi-fix-typo-in-rpi-common.c.patch (renamed from configs/platform-v7a/patches/barebox-2018.12.0/0101-ARM-rpi-fix-typo-in-rpi-common.c.patch)4
-rw-r--r--configs/platform-v7a/patches/barebox-2019.01.0/0002-ARM-rpi-move-clks-into-board-specific-rpi-common.patch (renamed from configs/platform-v7a/patches/barebox-2018.12.0/0102-ARM-rpi-move-clks-into-board-specific-rpi-common.patch)4
-rw-r--r--configs/platform-v7a/patches/barebox-2019.01.0/0003-ARM-rpi-retrieve-miniuart-clock-from-firmware.patch (renamed from configs/platform-v7a/patches/barebox-2018.12.0/0103-ARM-rpi-retrieve-miniuart-clock-from-firmware.patch)4
-rw-r--r--configs/platform-v7a/patches/barebox-2019.01.0/0004-serial_ns16550-handle-default-reg-io-width.patch (renamed from configs/platform-v7a/patches/barebox-2018.12.0/0104-serial_ns16550-handle-default-reg-io-width.patch)0
-rw-r--r--configs/platform-v7a/patches/barebox-2019.01.0/0005-serial_ns16550-add-raspberry-pi-compatible-and-init.patch (renamed from configs/platform-v7a/patches/barebox-2018.12.0/0105-serial_ns16550-add-raspberry-pi-compatible-and-init.patch)43
-rw-r--r--configs/platform-v7a/patches/barebox-2019.01.0/0006-ARM-rpi-add-NS16550-support.patch (renamed from configs/platform-v7a/patches/barebox-2018.12.0/0106-ARM-rpi-add-NS16550-support.patch)4
-rw-r--r--configs/platform-v7a/patches/barebox-2019.01.0/0007-ARM-rpi-choose-miniuart-as-stdout.patch (renamed from configs/platform-v7a/patches/barebox-2018.12.0/0107-ARM-rpi-choose-miniuart-as-stdout.patch)0
-rw-r--r--configs/platform-v7a/patches/barebox-2019.01.0/0008-doc-bcm283x-remove-miniuart-overlay-instruction.patch (renamed from configs/platform-v7a/patches/barebox-2018.12.0/0108-doc-bcm283x-remove-miniuart-overlay-instruction.patch)0
-rw-r--r--configs/platform-v7a/patches/barebox-2019.01.0/0009-ARM-rpi-use-defines-for-uart-bases.patch46
-rw-r--r--configs/platform-v7a/patches/barebox-2019.01.0/0101-ARM-imx-add-support-for-Udoo-Neo-full.patch (renamed from configs/platform-v7a/patches/barebox-2018.12.0/0001-ARM-imx-add-support-for-Udoo-Neo-full.patch)66
-rw-r--r--configs/platform-v7a/patches/barebox-2019.01.0/0201-Release-2019.01.0-customers-pengutronix-multi_v7-201.patch (renamed from configs/platform-v7a/patches/barebox-2018.12.0/0201-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch)12
-rw-r--r--configs/platform-v7a/patches/barebox-2019.01.0/series23
-rw-r--r--configs/platform-v7a/rules/barebox-am335x-mlo.make4
-rw-r--r--configs/platform-v7a/rules/barebox-am335x.make4
-rw-r--r--configs/platform-v7a/rules/barebox-mx6.make4
-rw-r--r--configs/platform-v7a/rules/barebox-rpi2.make4
-rw-r--r--configs/platform-v7a/rules/barebox-vexpress.make4
23 files changed, 185 insertions, 98 deletions
diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config
index cf62675..e333059 100644
--- a/configs/platform-v7a/barebox-am335x-mlo.config
+++ b/configs/platform-v7a/barebox-am335x-mlo.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2018.12.0-20181213-1 Configuration
+# Barebox/arm 2019.01.0-20190118-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_USE_COMPRESSED_DTB=y
@@ -267,7 +267,12 @@ CONFIG_MCI=y
# CONFIG_MCI_DW is not set
CONFIG_MCI_OMAP_HSMMC=y
# CONFIG_MCI_SPI is not set
+
+#
+# Clocksource
+#
CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
+# CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set
#
# MFD
diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config
index 8b34f06..21902fd 100644
--- a/configs/platform-v7a/barebox-am335x.config
+++ b/configs/platform-v7a/barebox-am335x.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2018.12.0-20181213-1 Configuration
+# Barebox/arm 2019.01.0-20190118-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -548,7 +548,12 @@ CONFIG_MCI_WRITE=y
# CONFIG_MCI_DW is not set
CONFIG_MCI_OMAP_HSMMC=y
# CONFIG_MCI_SPI is not set
+
+#
+# Clocksource
+#
CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
+# CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set
#
# MFD
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index 50f8402..e40e335 100644
--- a/configs/platform-v7a/barebox-mx6.config
+++ b/configs/platform-v7a/barebox-mx6.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2018.12.0-20181213-1 Configuration
+# Barebox/arm 2019.01.0-20190118-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -653,9 +653,14 @@ CONFIG_HAVE_CLK=y
CONFIG_CLKDEV_LOOKUP=y
CONFIG_COMMON_CLK=y
CONFIG_COMMON_CLK_OF_PROVIDER=y
+
+#
+# Clocksource
+#
CONFIG_ARCH_HAS_IMX_GPT=y
CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
CONFIG_CLOCKSOURCE_IMX_GPT=y
+# CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set
#
# MFD
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index eee6ed4..13bf488 100644
--- a/configs/platform-v7a/barebox-rpi2.config
+++ b/configs/platform-v7a/barebox-rpi2.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2018.12.0-20181213-1 Configuration
+# Barebox/arm 2019.01.0-20190118-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -431,8 +431,13 @@ CONFIG_MCI_BCM283X=y
CONFIG_HAVE_CLK=y
CONFIG_CLKDEV_LOOKUP=y
CONFIG_COMMON_CLK=y
+
+#
+# Clocksource
+#
CONFIG_CLOCKSOURCE_BCM283X=y
CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
+# CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set
#
# MFD
diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config
index b8e02ff..71a9052 100644
--- a/configs/platform-v7a/barebox-vexpress.config
+++ b/configs/platform-v7a/barebox-vexpress.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2018.12.0-20181213-1 Configuration
+# Barebox/arm 2019.01.0-20190118-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -467,8 +467,13 @@ CONFIG_HAVE_CLK=y
CONFIG_CLKDEV_LOOKUP=y
CONFIG_COMMON_CLK=y
CONFIG_COMMON_CLK_OF_PROVIDER=y
+
+#
+# Clocksource
+#
CONFIG_AMBA_SP804=y
CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
+# CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set
#
# MFD
diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/series b/configs/platform-v7a/patches/barebox-2018.12.0/series
deleted file mode 100644
index 64d799d..0000000
--- a/configs/platform-v7a/patches/barebox-2018.12.0/series
+++ /dev/null
@@ -1,22 +0,0 @@
-# umpf-base: v2018.12.0
-# umpf-name: 2018.12.0/customers/pengutronix/multiv7
-# umpf-version: 2018.12.0/customers/pengutronix/multiv7/20181213-1
-# umpf-topic: v2018.11.0/customers/pengutronix/udoo-neo
-# umpf-hashinfo: c5f2e150d7e8d5439458df1a2cab71b25fc36e19
-# umpf-topic-range: 0b5361a328632e64c14a54306119093a0c7fecdf..6f54f9c6a2100a4c0fb8e9dff5250571de0c10b2
-0001-ARM-imx-add-support-for-Udoo-Neo-full.patch
-# umpf-topic: v2018.12.0/topic/rpi3_miniuart
-# umpf-hashinfo: 53f22789068554eaf5f42f32a662c4acd98d4b38
-# umpf-topic-range: 6f54f9c6a2100a4c0fb8e9dff5250571de0c10b2..883529b323acca020c42e7de342d00ff2d222fd8
-0101-ARM-rpi-fix-typo-in-rpi-common.c.patch
-0102-ARM-rpi-move-clks-into-board-specific-rpi-common.patch
-0103-ARM-rpi-retrieve-miniuart-clock-from-firmware.patch
-0104-serial_ns16550-handle-default-reg-io-width.patch
-0105-serial_ns16550-add-raspberry-pi-compatible-and-init.patch
-0106-ARM-rpi-add-NS16550-support.patch
-0107-ARM-rpi-choose-miniuart-as-stdout.patch
-0108-doc-bcm283x-remove-miniuart-overlay-instruction.patch
-# umpf-release: 2018.12.0/customers/pengutronix/multiv7/20181213-1
-# umpf-topic-range: 883529b323acca020c42e7de342d00ff2d222fd8..806fa2b1b5f2491cefb2a76e6dc4c775874ad866
-0201-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch
-# umpf-end
diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0101-ARM-rpi-fix-typo-in-rpi-common.c.patch b/configs/platform-v7a/patches/barebox-2019.01.0/0001-ARM-rpi-fix-typo-in-rpi-common.c.patch
index 9473e9b..b45621a 100644
--- a/configs/platform-v7a/patches/barebox-2018.12.0/0101-ARM-rpi-fix-typo-in-rpi-common.c.patch
+++ b/configs/platform-v7a/patches/barebox-2019.01.0/0001-ARM-rpi-fix-typo-in-rpi-common.c.patch
@@ -8,7 +8,7 @@ Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c
-index b7ce0ad425e8..9f0531fd05d9 100644
+index 650b26ce7dcc..840f525bbbf6 100644
--- a/arch/arm/boards/raspberry-pi/rpi-common.c
+++ b/arch/arm/boards/raspberry-pi/rpi-common.c
@@ -73,7 +73,7 @@ static int rpi_get_arm_mem(u32 *size)
@@ -20,7 +20,7 @@ index b7ce0ad425e8..9f0531fd05d9 100644
{
BCM2835_MBOX_STACK_ALIGN(struct msg_get_clock_rate, msg);
int ret;
-@@ -285,7 +285,7 @@ static int rpi_clock_init(void)
+@@ -286,7 +286,7 @@ static int rpi_clock_init(void)
{
struct clk *clk;
diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0102-ARM-rpi-move-clks-into-board-specific-rpi-common.patch b/configs/platform-v7a/patches/barebox-2019.01.0/0002-ARM-rpi-move-clks-into-board-specific-rpi-common.patch
index 38aa78e..8e72b19 100644
--- a/configs/platform-v7a/patches/barebox-2018.12.0/0102-ARM-rpi-move-clks-into-board-specific-rpi-common.patch
+++ b/configs/platform-v7a/patches/barebox-2019.01.0/0002-ARM-rpi-move-clks-into-board-specific-rpi-common.patch
@@ -16,10 +16,10 @@ Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c
-index 9f0531fd05d9..490aeef12306 100644
+index 840f525bbbf6..887f096f7e4e 100644
--- a/arch/arm/boards/raspberry-pi/rpi-common.c
+++ b/arch/arm/boards/raspberry-pi/rpi-common.c
-@@ -297,6 +297,25 @@ static int rpi_clock_init(void)
+@@ -298,6 +298,25 @@ static int rpi_clock_init(void)
}
postconsole_initcall(rpi_clock_init);
diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0103-ARM-rpi-retrieve-miniuart-clock-from-firmware.patch b/configs/platform-v7a/patches/barebox-2019.01.0/0003-ARM-rpi-retrieve-miniuart-clock-from-firmware.patch
index 95daa60..8c7a5f5 100644
--- a/configs/platform-v7a/patches/barebox-2018.12.0/0103-ARM-rpi-retrieve-miniuart-clock-from-firmware.patch
+++ b/configs/platform-v7a/patches/barebox-2019.01.0/0003-ARM-rpi-retrieve-miniuart-clock-from-firmware.patch
@@ -15,10 +15,10 @@ Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c
-index 490aeef12306..e29177d08e20 100644
+index 887f096f7e4e..f22239c7ccb6 100644
--- a/arch/arm/boards/raspberry-pi/rpi-common.c
+++ b/arch/arm/boards/raspberry-pi/rpi-common.c
-@@ -309,6 +309,13 @@ static int rpi_console_clock_init(void)
+@@ -310,6 +310,13 @@ static int rpi_console_clock_init(void)
clkdev_add_physbase(clk, 0x20201000, NULL);
clkdev_add_physbase(clk, 0x3f201000, NULL);
diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0104-serial_ns16550-handle-default-reg-io-width.patch b/configs/platform-v7a/patches/barebox-2019.01.0/0004-serial_ns16550-handle-default-reg-io-width.patch
index 568d74d..568d74d 100644
--- a/configs/platform-v7a/patches/barebox-2018.12.0/0104-serial_ns16550-handle-default-reg-io-width.patch
+++ b/configs/platform-v7a/patches/barebox-2019.01.0/0004-serial_ns16550-handle-default-reg-io-width.patch
diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0105-serial_ns16550-add-raspberry-pi-compatible-and-init.patch b/configs/platform-v7a/patches/barebox-2019.01.0/0005-serial_ns16550-add-raspberry-pi-compatible-and-init.patch
index 911a0e2..37a4df8 100644
--- a/configs/platform-v7a/patches/barebox-2018.12.0/0105-serial_ns16550-add-raspberry-pi-compatible-and-init.patch
+++ b/configs/platform-v7a/patches/barebox-2019.01.0/0005-serial_ns16550-add-raspberry-pi-compatible-and-init.patch
@@ -7,55 +7,58 @@ enables it via the aux register and configures the correct shift value.
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
- drivers/serial/serial_ns16550.c | 25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
+ drivers/serial/serial_ns16550.c | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
-index 8ddcfdbefc1d..7a4054a67e41 100644
+index 8ddcfdbefc1d..ccd082e495c3 100644
--- a/drivers/serial/serial_ns16550.c
+++ b/drivers/serial/serial_ns16550.c
-@@ -253,6 +253,20 @@ static void ns16550_jz_init_port(struct console_device *cdev)
+@@ -253,6 +253,23 @@ static void ns16550_jz_init_port(struct console_device *cdev)
ns16550_serial_init_port(cdev);
}
++#define BCM2836_AUX_CLOCK_ENB 0x3f215004 /* BCM2835 AUX Clock enable register */
++#define BCM2836_AUX_CLOCK_EN_UART BIT(0) /* Bit 0 enables the Miniuart */
++
+static void rpi_init_port(struct console_device *cdev)
+{
-+ struct ns16550_priv *priv = to_ns16550_priv(cdev);
++ struct ns16550_priv *priv = to_ns16550_priv(cdev);
+
-+ writeb(0x01, 0x3f215004);
-+ priv->plat.shift = 2;
-+ /*
-+ * We double the clock rate since the 16550 will divide by 16
-+ * (instead of 8 required by the BCM2835 peripheral manual)
-+ */
-+ priv->plat.clock = priv->plat.clock*2;
-+ ns16550_serial_init_port(cdev);
++ writeb(BCM2836_AUX_CLOCK_EN_UART, BCM2836_AUX_CLOCK_ENB);
++ priv->plat.shift = 2;
++ /*
++ * We double the clock rate since the 16550 will divide by 16
++ * (instead of 8 required by the BCM2835 peripheral manual)
++ */
++ priv->plat.clock = priv->plat.clock*2;
++ ns16550_serial_init_port(cdev);
+}
+
/*********** Exposed Functions **********************************/
/**
-@@ -353,6 +367,11 @@ static __maybe_unused struct ns16550_drvdata tegra_drvdata = {
+@@ -353,6 +370,11 @@ static __maybe_unused struct ns16550_drvdata tegra_drvdata = {
.linux_console_name = "ttyS",
};
-+static struct ns16550_drvdata rpi_drvdata = {
-+ .init_port = rpi_init_port,
-+ .linux_console_name = "ttyS",
++static __maybe_unused struct ns16550_drvdata rpi_drvdata = {
++ .init_port = rpi_init_port,
++ .linux_console_name = "ttyS",
+};
+
static int ns16550_init_iomem(struct device_d *dev, struct ns16550_priv *priv)
{
struct resource *iores;
-@@ -527,6 +546,12 @@ static struct of_device_id ns16550_serial_dt_ids[] = {
+@@ -527,6 +549,12 @@ static struct of_device_id ns16550_serial_dt_ids[] = {
.compatible = "ingenic,jz4740-uart",
.data = &jz_drvdata,
},
+#endif
+#if IS_ENABLED(CONFIG_MACH_RPI_COMMON)
+ {
-+ .compatible = "brcm,bcm2835-aux-uart",
-+ .data = &rpi_drvdata,
++ .compatible = "brcm,bcm2835-aux-uart",
++ .data = &rpi_drvdata,
+ },
#endif
{
diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0106-ARM-rpi-add-NS16550-support.patch b/configs/platform-v7a/patches/barebox-2019.01.0/0006-ARM-rpi-add-NS16550-support.patch
index 2e368cf..fed00ac 100644
--- a/configs/platform-v7a/patches/barebox-2018.12.0/0106-ARM-rpi-add-NS16550-support.patch
+++ b/configs/platform-v7a/patches/barebox-2019.01.0/0006-ARM-rpi-add-NS16550-support.patch
@@ -1,9 +1,9 @@
From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
-Date: Wed, 12 Dec 2018 14:33:43 +0100
+Date: Wed, 19 Dec 2018 12:09:23 +0100
Subject: [PATCH] ARM: rpi: add NS16550 support
Since the 16550 driver now supports the RPI3 miniuart, enable it in the default
-config.
+ config.
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0107-ARM-rpi-choose-miniuart-as-stdout.patch b/configs/platform-v7a/patches/barebox-2019.01.0/0007-ARM-rpi-choose-miniuart-as-stdout.patch
index 126fe01..126fe01 100644
--- a/configs/platform-v7a/patches/barebox-2018.12.0/0107-ARM-rpi-choose-miniuart-as-stdout.patch
+++ b/configs/platform-v7a/patches/barebox-2019.01.0/0007-ARM-rpi-choose-miniuart-as-stdout.patch
diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0108-doc-bcm283x-remove-miniuart-overlay-instruction.patch b/configs/platform-v7a/patches/barebox-2019.01.0/0008-doc-bcm283x-remove-miniuart-overlay-instruction.patch
index 9d43761..9d43761 100644
--- a/configs/platform-v7a/patches/barebox-2018.12.0/0108-doc-bcm283x-remove-miniuart-overlay-instruction.patch
+++ b/configs/platform-v7a/patches/barebox-2019.01.0/0008-doc-bcm283x-remove-miniuart-overlay-instruction.patch
diff --git a/configs/platform-v7a/patches/barebox-2019.01.0/0009-ARM-rpi-use-defines-for-uart-bases.patch b/configs/platform-v7a/patches/barebox-2019.01.0/0009-ARM-rpi-use-defines-for-uart-bases.patch
new file mode 100644
index 0000000..e2b3607
--- /dev/null
+++ b/configs/platform-v7a/patches/barebox-2019.01.0/0009-ARM-rpi-use-defines-for-uart-bases.patch
@@ -0,0 +1,46 @@
+From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
+Date: Tue, 18 Dec 2018 11:41:38 +0100
+Subject: [PATCH] ARM: rpi: use defines for uart bases
+
+Previously the clkdev_add_phybase was called on magic register values,
+add defines which clarify the device for which the phybase clkdev is created.
+
+Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
+---
+ arch/arm/boards/raspberry-pi/rpi-common.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c
+index f22239c7ccb6..219c9c7d2b9e 100644
+--- a/arch/arm/boards/raspberry-pi/rpi-common.c
++++ b/arch/arm/boards/raspberry-pi/rpi-common.c
+@@ -298,6 +298,10 @@ static int rpi_clock_init(void)
+ }
+ postconsole_initcall(rpi_clock_init);
+
++#define BCM2835_PL011_BASE 0x20201000
++#define BCM2836_PL011_BASE 0x3f201000
++#define BCM2836_MINIUART_BASE 0x3f215040
++
+ static int rpi_console_clock_init(void)
+ {
+ struct clk *clk;
+@@ -307,15 +311,15 @@ static int rpi_console_clock_init(void)
+
+ clk = clk_fixed("uart0-pl0110", 3 * 1000 * 1000);
+ clk_register_clkdev(clk, NULL, "uart0-pl0110");
+- clkdev_add_physbase(clk, 0x20201000, NULL);
+- clkdev_add_physbase(clk, 0x3f201000, NULL);
++ clkdev_add_physbase(clk, BCM2835_PL011_BASE, NULL);
++ clkdev_add_physbase(clk, BCM2836_PL011_BASE, NULL);
+
+ clk = rpi_register_firmware_clock(BCM2835_MBOX_CLOCK_ID_CORE,
+ "uart1-8250");
+ if (IS_ERR(clk))
+ return PTR_ERR(clk);
+
+- clkdev_add_physbase(clk, 0x3f215040, NULL);
++ clkdev_add_physbase(clk, BCM2836_MINIUART_BASE, NULL);
+
+ clk = clk_fixed("bcm2835-cs", 1 * 1000 * 1000);
+ clk_register_clkdev(clk, NULL, "bcm2835-cs");
diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0001-ARM-imx-add-support-for-Udoo-Neo-full.patch b/configs/platform-v7a/patches/barebox-2019.01.0/0101-ARM-imx-add-support-for-Udoo-Neo-full.patch
index b5b5f6f..293e09e 100644
--- a/configs/platform-v7a/patches/barebox-2018.12.0/0001-ARM-imx-add-support-for-Udoo-Neo-full.patch
+++ b/configs/platform-v7a/patches/barebox-2019.01.0/0101-ARM-imx-add-support-for-Udoo-Neo-full.patch
@@ -5,20 +5,25 @@ MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
+Original patch from Uwe Kleine-König, I fixed the
+review comments and the imxcfg file to use the udoo neo values.
+
+I also tested the support on the udoo neo full board.
+
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Forwarded: id:20170627190317.19253-1-uwe@kleine-koenig.org
+Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
arch/arm/boards/Makefile | 1 +
arch/arm/boards/udoo-neo/Makefile | 2 +
arch/arm/boards/udoo-neo/board.c | 27 +++++
- .../flash-header-mx6sx-udoo-neo_full.imxcfg | 124 +++++++++++++++++++++
- arch/arm/boards/udoo-neo/lowlevel.c | 39 +++++++
+ .../flash-header-mx6sx-udoo-neo_full.imxcfg | 131 +++++++++++++++++++++
+ arch/arm/boards/udoo-neo/lowlevel.c | 39 ++++++
arch/arm/dts/Makefile | 1 +
arch/arm/dts/imx6sx-udoo-neo-full.dts | 4 +
arch/arm/mach-imx/Kconfig | 4 +
arch/arm/mach-imx/include/mach/esdctl.h | 1 +
images/Makefile.imx | 5 +
- 10 files changed, 208 insertions(+)
+ 10 files changed, 215 insertions(+)
create mode 100644 arch/arm/boards/udoo-neo/Makefile
create mode 100644 arch/arm/boards/udoo-neo/board.c
create mode 100644 arch/arm/boards/udoo-neo/flash-header-mx6sx-udoo-neo_full.imxcfg
@@ -80,10 +85,17 @@ index 000000000000..9bf480305d70
+coredevice_initcall(imx6sx_udoneo_coredevices_init);
diff --git a/arch/arm/boards/udoo-neo/flash-header-mx6sx-udoo-neo_full.imxcfg b/arch/arm/boards/udoo-neo/flash-header-mx6sx-udoo-neo_full.imxcfg
new file mode 100644
-index 000000000000..176aff49b3ec
+index 000000000000..39f2a8a221f7
--- /dev/null
+++ b/arch/arm/boards/udoo-neo/flash-header-mx6sx-udoo-neo_full.imxcfg
-@@ -0,0 +1,124 @@
+@@ -0,0 +1,131 @@
++/*
++ * These values are taken from:
++ * repository: https://github.com/UDOOboard/uboot-imx
++ * branch: udoo/2015.04.imx
++ * file: board/udoo/udoo_neo/udoo_neo.cfg
++ */
++
+loadaddr 0x80000000
+soc imx6
+dcdofs 0x400
@@ -150,18 +162,18 @@ index 000000000000..176aff49b3ec
+/********************************************/
+
+/* write leveling */
-+wm 32 0x021b080c 0x001E0022
-+wm 32 0x021b0810 0x001C0019
++wm 32 0x021b080c 0x000E000B
++wm 32 0x021b0810 0x000E0010
+/********************************************/
+
+/* DQS Read Gate */
-+wm 32 0x021b083c 0x41540150
-+wm 32 0x021b0840 0x01440138
++wm 32 0x021b083c 0x41600158
++wm 32 0x021b0840 0x01500140
+/********************************************/
+
+/* Read/Write Delay */
-+wm 32 0x021b0848 0x403E4644
-+wm 32 0x021b0850 0x3C3A4038
++wm 32 0x021b0848 0x3A383E3E
++wm 32 0x021b0850 0x3A383C38
+/********************************************/
+
+/* read data bit delay */
@@ -210,7 +222,7 @@ index 000000000000..176aff49b3ec
+/********************************************/
diff --git a/arch/arm/boards/udoo-neo/lowlevel.c b/arch/arm/boards/udoo-neo/lowlevel.c
new file mode 100644
-index 000000000000..e78c2685fd78
+index 000000000000..bb6b7d833278
--- /dev/null
+++ b/arch/arm/boards/udoo-neo/lowlevel.c
@@ -0,0 +1,39 @@
@@ -249,15 +261,15 @@ index 000000000000..e78c2685fd78
+ if (IS_ENABLED(CONFIG_DEBUG_LL))
+ setup_uart();
+
-+ fdt = __dtb_imx6sx_udoo_neo_full_start - get_runtime_offset();
++ fdt = __dtb_imx6sx_udoo_neo_full_start + get_runtime_offset();
+
+ imx6sx_barebox_entry(fdt);
+}
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 503d9b18f9c1..eadffc7b7c44 100644
+index c08b35a10132..1c6bfd900b99 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
-@@ -98,6 +98,7 @@ pbl-dtb-$(CONFIG_MACH_TX6X) += imx6dl-tx6u.dtb.o
+@@ -99,6 +99,7 @@ pbl-dtb-$(CONFIG_MACH_TX6X) += imx6dl-tx6u.dtb.o
pbl-dtb-$(CONFIG_MACH_TX6X) += imx6q-tx6q.dtb.o
pbl-dtb-$(CONFIG_MACH_TURRIS_OMNIA) += armada-385-turris-omnia-bb.dtb.o
pbl-dtb-$(CONFIG_MACH_UDOO) += imx6q-udoo.dtb.o
@@ -276,10 +288,10 @@ index 000000000000..9203d40207c5
+/{
+};
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
-index edfc85113880..6f86175b24e9 100644
+index d9b60053db03..53226c55944f 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
-@@ -392,6 +392,10 @@ config MACH_UDOO
+@@ -384,6 +384,10 @@ config MACH_UDOO
bool "Freescale i.MX6 UDOO Board"
select ARCH_IMX6
@@ -303,18 +315,18 @@ index bc6c7339535e..18c4a2836007 100644
#endif
diff --git a/images/Makefile.imx b/images/Makefile.imx
-index 9b5cd577d285..257561464504 100644
+index 8b8a5452b770..4f6fd0489688 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
-@@ -271,6 +271,11 @@ CFG_start_imx6q_sabresd.pblx.imximg = $(board)/freescale-mx6-sabresd/flash-heade
- FILE_barebox-freescale-imx6q-sabresd.img = start_imx6q_sabresd.pblx.imximg
+@@ -254,6 +254,11 @@ CFG_start_imx6q_sabresd.pblb.imximg = $(board)/freescale-mx6-sabresd/flash-heade
+ FILE_barebox-freescale-imx6q-sabresd.img = start_imx6q_sabresd.pblb.imximg
image-$(CONFIG_MACH_SABRESD) += barebox-freescale-imx6q-sabresd.img
-+pblx-$(CONFIG_MACH_UDOO_NEO) += start_imx6sx_udoo_neo
-+CFG_start_imx6sx_udoo_neo.pblx.imximg = $(board)/udoo-neo/flash-header-mx6sx-udoo-neo_full.imxcfg
-+FILE_barebox-udoo-neo.img = start_imx6sx_udoo_neo.pblx.imximg
++pblb-$(CONFIG_MACH_UDOO_NEO) += start_imx6sx_udoo_neo
++CFG_start_imx6sx_udoo_neo.pblb.imximg = $(board)/udoo-neo/flash-header-mx6sx-udoo-neo_full.imxcfg
++FILE_barebox-udoo-neo.img = start_imx6sx_udoo_neo.pblb.imximg
+image-$(CONFIG_MACH_UDOO_NEO) += barebox-udoo-neo.img
+
- pblx-$(CONFIG_MACH_FREESCALE_IMX6SX_SABRESDB) += start_imx6sx_sabresdb
- CFG_start_imx6sx_sabresdb.pblx.imximg = $(board)/freescale-mx6sx-sabresdb/flash-header-mx6sx-sabresdb.imxcfg
- FILE_barebox-freescale-imx6sx-sabresdb.img = start_imx6sx_sabresdb.pblx.imximg
+ pblb-$(CONFIG_MACH_FREESCALE_IMX6SX_SABRESDB) += start_imx6sx_sabresdb
+ CFG_start_imx6sx_sabresdb.pblb.imximg = $(board)/freescale-mx6sx-sabresdb/flash-header-mx6sx-sabresdb.imxcfg
+ FILE_barebox-freescale-imx6sx-sabresdb.img = start_imx6sx_sabresdb.pblb.imximg
diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0201-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch b/configs/platform-v7a/patches/barebox-2019.01.0/0201-Release-2019.01.0-customers-pengutronix-multi_v7-201.patch
index 38f2a36..db1f38e 100644
--- a/configs/platform-v7a/patches/barebox-2018.12.0/0201-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch
+++ b/configs/platform-v7a/patches/barebox-2019.01.0/0201-Release-2019.01.0-customers-pengutronix-multi_v7-201.patch
@@ -1,21 +1,21 @@
From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
-Date: Thu, 13 Dec 2018 11:14:57 +0100
-Subject: [PATCH] Release 2018.12.0/customers/pengutronix/multiv7/20181213-1
+Date: Fri, 18 Jan 2019 11:36:33 +0100
+Subject: [PATCH] Release 2019.01.0/customers/pengutronix/multi_v7/20190118-1
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 1ce50d025e47..f378f3dc7adf 100644
+index d6423b84fef0..6617637ca045 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
- VERSION = 2018
- PATCHLEVEL = 12
+ VERSION = 2019
+ PATCHLEVEL = 01
SUBLEVEL = 0
-EXTRAVERSION =
-+EXTRAVERSION =-20181213-1
++EXTRAVERSION =-20190118-1
NAME = None
# *DOCUMENTATION*
diff --git a/configs/platform-v7a/patches/barebox-2019.01.0/series b/configs/platform-v7a/patches/barebox-2019.01.0/series
new file mode 100644
index 0000000..638a7d9
--- /dev/null
+++ b/configs/platform-v7a/patches/barebox-2019.01.0/series
@@ -0,0 +1,23 @@
+# umpf-base: v2019.01.0
+# umpf-name: 2019.01.0/customers/pengutronix/multi_v7
+# umpf-version: 2019.01.0/customers/pengutronix/multi_v7/20190118-1
+# umpf-topic: v2018.12.0/topic/rpi3_miniuart
+# umpf-hashinfo: 9320eb666c0057ffb3b7475108a16c76623a527d
+# umpf-topic-range: 60e12093cf3288086b62612bb3cf565a0b4320aa..d913f77a69b2fe9021c6b41266373e357aa1b598
+0001-ARM-rpi-fix-typo-in-rpi-common.c.patch
+0002-ARM-rpi-move-clks-into-board-specific-rpi-common.patch
+0003-ARM-rpi-retrieve-miniuart-clock-from-firmware.patch
+0004-serial_ns16550-handle-default-reg-io-width.patch
+0005-serial_ns16550-add-raspberry-pi-compatible-and-init.patch
+0006-ARM-rpi-add-NS16550-support.patch
+0007-ARM-rpi-choose-miniuart-as-stdout.patch
+0008-doc-bcm283x-remove-miniuart-overlay-instruction.patch
+0009-ARM-rpi-use-defines-for-uart-bases.patch
+# umpf-topic: v2019.01.0/customers/pengutronix/udoo-neo
+# umpf-hashinfo: 999a56255a0ddad3f9c5344b940987f63eec39b4
+# umpf-topic-range: d913f77a69b2fe9021c6b41266373e357aa1b598..69e5b7ada0621fe116216820ac4d1f04c3dad2c2
+0101-ARM-imx-add-support-for-Udoo-Neo-full.patch
+# umpf-release: 2019.01.0/customers/pengutronix/multi_v7/20190118-1
+# umpf-topic-range: 69e5b7ada0621fe116216820ac4d1f04c3dad2c2..8bb76e29ee661a3dfb57117bb8fe8cfe5e3cc617
+0201-Release-2019.01.0-customers-pengutronix-multi_v7-201.patch
+# umpf-end
diff --git a/configs/platform-v7a/rules/barebox-am335x-mlo.make b/configs/platform-v7a/rules/barebox-am335x-mlo.make
index 62a3483..272d3df 100644
--- a/configs/platform-v7a/rules/barebox-am335x-mlo.make
+++ b/configs/platform-v7a/rules/barebox-am335x-mlo.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BAREBOX_AM335X_MLO) += barebox-am335x-mlo
#
# Paths and names
#
-BAREBOX_AM335X_MLO_VERSION := 2018.12.0
-BAREBOX_AM335X_MLO_MD5 := f84d7d3562055c80c3eedce0b14d4a0d
+BAREBOX_AM335X_MLO_VERSION := 2019.01.0
+BAREBOX_AM335X_MLO_MD5 := 51fae9592ee453535b9b21ffdd50f775
BAREBOX_AM335X_MLO := barebox-$(BAREBOX_AM335X_MLO_VERSION)
BAREBOX_AM335X_MLO_SUFFIX := tar.bz2
BAREBOX_AM335X_MLO_DIR := $(BUILDDIR)/barebox-am335x-mlo-$(BAREBOX_AM335X_MLO_VERSION)
diff --git a/configs/platform-v7a/rules/barebox-am335x.make b/configs/platform-v7a/rules/barebox-am335x.make
index 2a38d3a..5114831 100644
--- a/configs/platform-v7a/rules/barebox-am335x.make
+++ b/configs/platform-v7a/rules/barebox-am335x.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BAREBOX_AM335X) += barebox-am335x
#
# Paths and names
#
-BAREBOX_AM335X_VERSION := 2018.12.0
-BAREBOX_AM335X_MD5 := f84d7d3562055c80c3eedce0b14d4a0d
+BAREBOX_AM335X_VERSION := 2019.01.0
+BAREBOX_AM335X_MD5 := 51fae9592ee453535b9b21ffdd50f775
BAREBOX_AM335X := barebox-$(BAREBOX_AM335X_VERSION)
BAREBOX_AM335X_SUFFIX := tar.bz2
BAREBOX_AM335X_DIR := $(BUILDDIR)/barebox-am335x-$(BAREBOX_AM335X_VERSION)
diff --git a/configs/platform-v7a/rules/barebox-mx6.make b/configs/platform-v7a/rules/barebox-mx6.make
index 7cda132..44631b2 100644
--- a/configs/platform-v7a/rules/barebox-mx6.make
+++ b/configs/platform-v7a/rules/barebox-mx6.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BAREBOX_MX6) += barebox-mx6
#
# Paths and names
#
-BAREBOX_MX6_VERSION := 2018.12.0
-BAREBOX_MX6_MD5 := f84d7d3562055c80c3eedce0b14d4a0d
+BAREBOX_MX6_VERSION := 2019.01.0
+BAREBOX_MX6_MD5 := 51fae9592ee453535b9b21ffdd50f775
BAREBOX_MX6 := barebox-$(BAREBOX_MX6_VERSION)
BAREBOX_MX6_SUFFIX := tar.bz2
BAREBOX_MX6_DIR := $(BUILDDIR)/barebox-mx6-$(BAREBOX_MX6_VERSION)
diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make
index 47ad43b..c4f1816 100644
--- a/configs/platform-v7a/rules/barebox-rpi2.make
+++ b/configs/platform-v7a/rules/barebox-rpi2.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BAREBOX_RPI2) += barebox-rpi2
#
# Paths and names
#
-BAREBOX_RPI2_VERSION := 2018.12.0
-BAREBOX_RPI2_MD5 := f84d7d3562055c80c3eedce0b14d4a0d
+BAREBOX_RPI2_VERSION := 2019.01.0
+BAREBOX_RPI2_MD5 := 51fae9592ee453535b9b21ffdd50f775
BAREBOX_RPI2 := barebox-$(BAREBOX_RPI2_VERSION)
BAREBOX_RPI2_SUFFIX := tar.bz2
BAREBOX_RPI2_DIR := $(BUILDDIR)/barebox-rpi2-$(BAREBOX_RPI2_VERSION)
diff --git a/configs/platform-v7a/rules/barebox-vexpress.make b/configs/platform-v7a/rules/barebox-vexpress.make
index afef7a9..6cd3246 100644
--- a/configs/platform-v7a/rules/barebox-vexpress.make
+++ b/configs/platform-v7a/rules/barebox-vexpress.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BAREBOX_VEXPRESS) += barebox-vexpress
#
# Paths and names
#
-BAREBOX_VEXPRESS_VERSION := 2018.12.0
-BAREBOX_VEXPRESS_MD5 := f84d7d3562055c80c3eedce0b14d4a0d
+BAREBOX_VEXPRESS_VERSION := 2019.01.0
+BAREBOX_VEXPRESS_MD5 := 51fae9592ee453535b9b21ffdd50f775
BAREBOX_VEXPRESS := barebox-$(BAREBOX_VEXPRESS_VERSION)
BAREBOX_VEXPRESS_SUFFIX := tar.bz2
BAREBOX_VEXPRESS_DIR := $(BUILDDIR)/barebox-vexpress-$(BAREBOX_VEXPRESS_VERSION)