mirror of
https://github.com/armbian/build.git
synced 2025-08-11 21:56:58 +02:00
* Initial Mvebu RFC https://github.com/armbian/build/issues/1426 Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com> * mvebu: add missing patches Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com> * mvebu: change making u-boot targets to standard way, adjust patches and config Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com> * helios4: set default branch to use U-Boot 2018.11 Switch over to U-Boot 2018.11 that has been used for some time in next branch. Signed-off-by: Aditya Prayoga <aditya@kobol.io> * mvebu: helios4: Enable DEV branch Signed-off-by: Aditya Prayoga <aditya@kobol.io> * u-boot: Add RTC support on Clearfog and Helios4 Added DM driver for mvebu RTC and enable it on Clearfog and Helios4 configuration. Signed-off-by: Aditya Prayoga <aditya@kobol.io> * add boot-marvell.cmd backward compatibility The patches added missing variable that used on boot-marvell.cmd and also adjust the some memory addresses to prevent crash due to usage of fdt_high and initrd_high. Signed-off-by: Aditya Prayoga <aditya@kobol.io> * helios4: Added SPI NOR flash target Build bootable SPI NOR flash image. Change the boot order to USB -> SATA -> MMC Signed-off-by: Aditya Prayoga <aditya@kobol.io> * Restore SPI support on U-Boot 2019.04 * mvebu: kernel: Added Wake-On-GPIO and WoL support The patch set was missing during transition. Signed-off-by: Aditya Prayoga <aditya@kobol.io> * [#1429] SolidRun's ARMADA A388 SOM U-Boot ODT Update Old versions of U-Boot did not configure correctly the ODT on data signals of DDR RAM on SolidRun's ARMADA A388 SOMs. According to SolidRun Knowledge Base, the changes already pushed to mainline U-Boot. But then it was overwritten when Marvell DDR Training Tool updated [URL] https://developer.solid-run.com/knowledge-base/armada-38x-som-u-boot-odt-update/ Signed-off-by: Aditya Prayoga <aditya@kobol.io> * [#1429] mvebu: u-boot: Add revision id for Armada 38x B0 Added patch for SolidRun U-Boot v2018.01 and for Helios4 U-Boot v2018.11 Signed-off-by: Aditya Prayoga <aditya@kobol.io> * clearfog: Added SPI NOR flash target Build bootable SPI NOR flash image. Signed-off-by: Aditya Prayoga <aditya@kobol.io> * mvebu: clearfog: DEV branch use mainline U-Boot Also move clearfog base patch into its own board folder. Signed-off-by: Aditya Prayoga <aditya@kobol.io> * mvebu: enable U-Boot uart target Normal MMC image can be used for uart boot using following command: ./tools/kwboot -b u-boot-spl.kwb /dev/ttyUSBX But on Helios4, the SPL failed to continue the booting process if ECC is enabled, so disable it. Since the usage of uart boot is more for rescue/debug, disable autoboot. Signed-off-by: Aditya Prayoga <aditya@kobol.io> * mvebu: NEXT branch use mainline U-Boot Signed-off-by: Aditya Prayoga <aditya@kobol.io> * mvebu: helios4: fix fancontrol related bug during buster testing - On kernel 4.19, cpu thermal sensor changed the name from armada_thermal into f10e4078.thermal. Added this new name to udev rules - Since DEFAULT branch now use kernel 4.14, update fancontrol configuration - Load lm75 kernel module - On kernel 4.19, cpu temp reading about 20 degree C lower, update fancontrol configuration. [URL] https://forum.armbian.com/topic/10214-clearfogpro-possible-change-in-temperature-reporting-between-414next-and-419dev Signed-off-by: Aditya Prayoga <aditya@kobol.io> * mvebu: helios4: Override vendor provided fancontrol unit systemd emit following message on dmesg systemd[1]: /lib/systemd/system/fancontrol.service:9: PIDFile= references path below legacy directory /var/run/, updating /var/run/fancontrol.pid \xe2\x86\x92 /run/fancontrol.pid; please update the unit file accordingly. Override and change the value in the unit file to remove the message. Signed-off-by: Aditya Prayoga <aditya@kobol.io> * mvebu: DEV branch use its own u-boot patch folder The patches are copied over from u-boot-mvebu-next Signed-off-by: Aditya Prayoga <aditya@kobol.io> * mvebu: u-boot: Make clearfog model distinction more obvious While at it, also change SerDes LANE4 into USB 3.0 on Clearfog Base. Signed-off-by: Aditya Prayoga <aditya@kobol.io> * lib: Use apt-get install instead of dpkg on install_deb_chroot() dpkg -i does not install dependencies required by the package. This is needed if the BSP package requires other package that is not installed during debootstrap. Signed-off-by: Aditya Prayoga <aditya@kobol.io> * config: mvebu: helios4: Move various tweak to family_tweak_bsp() Various tweak in family_tweaks_s() only applied to SD card image. Move it to family_tweaks_bsp() so it will also included on the BSP package and applied to existing user. Signed-off-by: Aditya Prayoga <aditya@kobol.io> * config: mvebu: helios4: Add /etc/modules to BSP On kernel 4.19, user need to modify the /etc/modules to add lm75 kernel module. Pack the file into BSP so user no longer needed to modify it. Signed-off-by: Aditya Prayoga <aditya@kobol.io> * mvebu: kernel: Make zbud as built-in module To remove the following error: [ 1.705485] zswap: default zpool zbud not available [ 1.705488] zswap: pool creation failed Signed-off-by: Aditya Prayoga <aditya@kobol.io> * bootscripts: mvebu: Add default value for spi_workaround Signed-off-by: Aditya Prayoga <aditya@kobol.io> * mvebu: kernel: Backport armada_thermal changes to 4.14 (#1452) On kernel 4.19, armada_thermal driver has been fixed to address Marvell's Errata #132698 (The changes first appear on LK 4.16). The result is temperature reading is around 20 degree Celsius lower. Currently armbian-motd apply -20C tweak for both LK 4.14 and LK 4.19 which is incorrect. Instead of adding some logic on what condition to apply the tweak, it is better to remove the tweak and patch the kernel instead. Revert commitb3dd4e9
("[ mvebu ] Put back Armada temperature tweak in motd") which is part of #1421 solution. [URL] https://forum.armbian.com/topic/10214-clearfogpro-possible-change-in-temperature-reporting-between-414next-and-419dev/ Signed-off-by: Aditya Prayoga <aditya@kobol.io> * mvebu: helios4: unified fancontrol config Since LK 4.14 on DEFAULT branch already patched and the temp reading is same as LK 4.19 on NEXT branch, it is no longer needed to separate fancontrol configuration file. Signed-off-by: Aditya Prayoga <aditya@kobol.io> * u-boot: helios4: Remove rev id patch The patch is already applied in helios4 repo, no need to have it in armbian. This revert helios4 part of commit7411c55
Signed-off-by: Aditya Prayoga <aditya@kobol.io> * u-boot: clearfog: enable PCIe support and PCIe reset Signed-off-by: Aditya Prayoga <aditya@kobol.io> * u-boot: clearfog: add boot-marvell.cmd backward compatibility The patches added missing variable that used on boot-marvell.cmd and also adjust the some memory addresses to prevent crash due to usage of fdt_high and initrd_high. Signed-off-by: Aditya Prayoga <aditya@kobol.io> * mvebu: helios4: tweak regarding temperature setting Make fan speed similar compared to pre-patched armada-thermal. Target PWM value around 70 during idle. Signed-off-by: Aditya Prayoga <aditya@kobol.io> * config: sources: clearfog to use u-boot 2018.01 for NEXT branch This changes also affect Helios4. Moved the shared U-Boot source setting back to Helios4 for NEXT branch. Signed-off-by: Aditya Prayoga <aditya@kobol.io> * config: boards: build Stretch image for Clearfog and Helios4 Also remove DEV from Helios4 CLI_TARGET Signed-off-by: Aditya Prayoga <aditya@kobol.io> * kernel: mvebu-next: Disable access to SPI Flash User need to set spi_workaround=yes to enable SPI Flash access and lost access to internal SATA. Signed-off-by: Aditya Prayoga <aditya@kobol.io> * mvebu-next: adjust kernel config * mvebu-dev: bump to 5.2 and adjust kernel configuraion. Tested for building. * Adjust kernel config, add AUFS Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com> * mvebu-next: Adjust kernel config, add debug GPIO Signed-off-by: Aditya Prayoga <aditya@kobol.io> * mvebu-dev: separate Clearfog Base U-boot configuration file and patch Signed-off-by: Aditya Prayoga <aditya@kobol.io>
211 lines
6.2 KiB
Diff
211 lines
6.2 KiB
Diff
From 187573405d9fd1d070f035806769cfee52224ac9 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <187573405d9fd1d070f035806769cfee52224ac9.1540752056.git.aditya@kobol.io>
|
|
In-Reply-To: <3eb15c0c6a0f26e418074cf3be9490a36f9161fd.1540752056.git.aditya@kobol.io>
|
|
References: <3eb15c0c6a0f26e418074cf3be9490a36f9161fd.1540752056.git.aditya@kobol.io>
|
|
From: Jon Nettleton <jon@solid-run.com>
|
|
Date: Thu, 24 Aug 2017 22:28:06 +0200
|
|
Subject: [PATCH 03/11] mvebu: rtc: Add DM driver for mvebu rtc
|
|
|
|
This is heavily based on the linux kernel driver. Please note the
|
|
long timeout I have added. I have found that adding this additional
|
|
time fixes a lot of the other timing problems that were worked around
|
|
with various delays and repeated commands.
|
|
|
|
Signed-off-by: Jon Nettleton <jon@solid-run.com>
|
|
---
|
|
drivers/rtc/Kconfig | 7 +++
|
|
drivers/rtc/Makefile | 1 +
|
|
drivers/rtc/mvebu_rtc.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++++
|
|
3 files changed, 159 insertions(+)
|
|
|
|
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
|
|
index bcc01b1..59b3d2c 100644
|
|
--- a/drivers/rtc/Kconfig
|
|
+++ b/drivers/rtc/Kconfig
|
|
@@ -31,6 +31,13 @@ config TPL_DM_RTC
|
|
drivers to perform the actual functions. See rtc.h for a
|
|
description of the API.
|
|
|
|
+config RTC_MVEBU
|
|
+ bool "Armada 38x Marvell SoC RTC"
|
|
+ depends on DM_RTC
|
|
+ help
|
|
+ If you say yes here you will get support for the in-chip RTC
|
|
+ that can be found in the Armada 38x Marvell's SoC device
|
|
+
|
|
config RTC_PCF2127
|
|
bool "Enable PCF2127 driver"
|
|
depends on DM_RTC
|
|
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
|
|
index 1724602..0e23190 100644
|
|
--- a/drivers/rtc/Makefile
|
|
+++ b/drivers/rtc/Makefile
|
|
@@ -38,6 +38,7 @@ obj-$(CONFIG_RTC_MCP79411) += ds1307.o
|
|
obj-$(CONFIG_MCFRTC) += mcfrtc.o
|
|
obj-$(CONFIG_RTC_MK48T59) += mk48t59.o
|
|
obj-$(CONFIG_RTC_MV) += mvrtc.o
|
|
+obj-$(CONFIG_RTC_MVEBU) += mvebu_rtc.o
|
|
obj-$(CONFIG_RTC_MX27) += mx27rtc.o
|
|
obj-$(CONFIG_RTC_MXS) += mxsrtc.o
|
|
obj-$(CONFIG_RTC_PCF8563) += pcf8563.o
|
|
diff --git a/drivers/rtc/mvebu_rtc.c b/drivers/rtc/mvebu_rtc.c
|
|
new file mode 100644
|
|
index 0000000..b04d8e6
|
|
--- /dev/null
|
|
+++ b/drivers/rtc/mvebu_rtc.c
|
|
@@ -0,0 +1,151 @@
|
|
+/*
|
|
+ * (C) Copyright 2015 Solid Run Ltd.
|
|
+ * Author: Jon Nettleton <jon@solid-run.com>
|
|
+ *
|
|
+ * Based on Linux Kernel driver rtc-armada38x.c
|
|
+ * Copyright (C) 2015 Marvell
|
|
+ * Gregory Clement <gregory.clement@free-electrons.com>
|
|
+ *
|
|
+ * SPDX-License-Identifier: GPL-2.0+
|
|
+ */
|
|
+
|
|
+#include <common.h>
|
|
+#include <asm/io.h>
|
|
+#include <dm.h>
|
|
+#include <rtc.h>
|
|
+
|
|
+DECLARE_GLOBAL_DATA_PTR;
|
|
+
|
|
+#define RTC_NOMINAL_TIMING 0x2000
|
|
+
|
|
+#define RTC_STATUS 0x0
|
|
+#define RTC_STATUS_ALARM1 BIT(0)
|
|
+#define RTC_STATUS_ALARM2 BIT(1)
|
|
+#define RTC_TIME 0xC
|
|
+#define RTC_ALARM1 0x10
|
|
+#define RTC_CLOCK_CORR 0x18
|
|
+#define RTC_TEST_CONF 0x1C
|
|
+
|
|
+/* armada38x SoC registers */
|
|
+#define RTC_38X_BRIDGE_TIMING_CTRL_REG_OFFS 0x0
|
|
+#define RTC_38X_WRCLK_PERIOD_OFFS 0
|
|
+#define RTC_38X_WRCLK_PERIOD_MASK (0x3FF << RTC_38X_WRCLK_PERIOD_OFFS)
|
|
+#define RTC_38X_READ_OUTPUT_DELAY_OFFS 26
|
|
+#define RTC_38X_READ_OUTPUT_DELAY_MASK (0x1F << RTC_38X_READ_OUTPUT_DELAY_OFFS)
|
|
+
|
|
+struct mvebu_rtc_platdata {
|
|
+ fdt_addr_t base;
|
|
+ fdt_addr_t soc_base;
|
|
+};
|
|
+
|
|
+/*
|
|
+ * According to the datasheet, the OS should wait 5us after every
|
|
+ * register write to the RTC hard macro so that the required update
|
|
+ * can occur without holding off the system bus
|
|
+ * According to errata FE-3124064, Write to any RTC register
|
|
+ * may fail. As a workaround, before writing to RTC
|
|
+ * register, issue a dummy write of 0x0 twice to RTC Status
|
|
+ * register.
|
|
+ */
|
|
+
|
|
+static void rtc_delayed_write(u32 val, struct mvebu_rtc_platdata *rtc, int offset)
|
|
+{
|
|
+ writel(0, rtc->base + RTC_STATUS);
|
|
+ writel(0, rtc->base + RTC_STATUS);
|
|
+ writel(val, rtc->base + offset);
|
|
+ mdelay(10);
|
|
+}
|
|
+
|
|
+static unsigned long read_rtc_reg(struct mvebu_rtc_platdata *rtc, uint8_t rtc_reg)
|
|
+{
|
|
+ unsigned long value = readl(rtc->base + rtc_reg);
|
|
+
|
|
+ return value;
|
|
+}
|
|
+
|
|
+static void rtc_update_38x_mbus_timing_params(struct mvebu_rtc_platdata *rtc)
|
|
+{
|
|
+ uint32_t reg;
|
|
+
|
|
+ reg = readl(rtc->soc_base + RTC_38X_BRIDGE_TIMING_CTRL_REG_OFFS);
|
|
+ reg &= ~RTC_38X_WRCLK_PERIOD_MASK;
|
|
+ reg |= 0x3FF << RTC_38X_WRCLK_PERIOD_OFFS; /*Maximum value*/
|
|
+ reg &= ~RTC_38X_READ_OUTPUT_DELAY_MASK;
|
|
+ reg |= 0x1F << RTC_38X_READ_OUTPUT_DELAY_OFFS; /*Maximum value*/
|
|
+ writel(reg, rtc->soc_base + RTC_38X_BRIDGE_TIMING_CTRL_REG_OFFS);
|
|
+}
|
|
+
|
|
+static int mvebu_rtc_get(struct udevice *dev, struct rtc_time *tm)
|
|
+{
|
|
+ struct mvebu_rtc_platdata *rtc = dev_get_platdata(dev);
|
|
+
|
|
+ rtc_to_tm(read_rtc_reg(rtc, RTC_TIME), tm);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int mvebu_rtc_set(struct udevice *dev, const struct rtc_time *tm)
|
|
+{
|
|
+ struct mvebu_rtc_platdata *rtc = dev_get_platdata(dev);
|
|
+ unsigned long time;
|
|
+
|
|
+ time = rtc_mktime(tm);
|
|
+ rtc_delayed_write(time, rtc, RTC_TIME);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int mvebu_rtc_reset(struct udevice *dev)
|
|
+{
|
|
+ struct mvebu_rtc_platdata *rtc = dev_get_platdata(dev);
|
|
+
|
|
+ rtc_delayed_write(0, rtc, RTC_TEST_CONF);
|
|
+ rtc_delayed_write(0, rtc, RTC_TIME);
|
|
+ rtc_delayed_write((RTC_STATUS_ALARM1 | RTC_STATUS_ALARM2), rtc, RTC_STATUS);
|
|
+ rtc_delayed_write(RTC_NOMINAL_TIMING, rtc, RTC_CLOCK_CORR);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int mvebu_rtc_read8(struct udevice *dev, unsigned int reg)
|
|
+{
|
|
+ return -ENOSYS;
|
|
+}
|
|
+
|
|
+static int mvebu_rtc_write8(struct udevice *dev, unsigned int reg, int val)
|
|
+{
|
|
+ return -ENOSYS;
|
|
+}
|
|
+
|
|
+static int mvebu_rtc_probe(struct udevice *dev)
|
|
+{
|
|
+ struct mvebu_rtc_platdata *rtc = dev_get_platdata(dev);
|
|
+
|
|
+ rtc->base = devfdt_get_addr(dev);
|
|
+ rtc->soc_base = devfdt_get_addr_name(dev, "rtc-soc");
|
|
+
|
|
+ rtc_update_38x_mbus_timing_params(rtc);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static const struct rtc_ops mvebu_rtc_ops = {
|
|
+ .get = mvebu_rtc_get,
|
|
+ .set = mvebu_rtc_set,
|
|
+ .reset = mvebu_rtc_reset,
|
|
+ .read8 = mvebu_rtc_read8,
|
|
+ .write8 = mvebu_rtc_write8,
|
|
+};
|
|
+
|
|
+static const struct udevice_id mvebu_rtc_ids[] = {
|
|
+ { .compatible = "marvell,armada-380-rtc" },
|
|
+ { }
|
|
+};
|
|
+
|
|
+U_BOOT_DRIVER(rtc_mvebu) = {
|
|
+ .name = "rtc-mvebu",
|
|
+ .id = UCLASS_RTC,
|
|
+ .of_match = mvebu_rtc_ids,
|
|
+ .probe = mvebu_rtc_probe,
|
|
+ .ops = &mvebu_rtc_ops,
|
|
+};
|
|
--
|
|
2.7.4
|
|
|