[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-28-g65d2d68c7
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-28-g65d2d68c7
|
From: SebR <se...@us...> - 2019-01-10 13:31:36
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 65d2d68c7055aa34f688646a75a7aeddad8dbbc0 (commit)
from 71fb1591358b555c0d3a1ed1f41700bfa14393a9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 65d2d68c7055aa34f688646a75a7aeddad8dbbc0
Author: Sebastien Royen <seb...@ar...>
Date: Thu Jan 10 14:23:23 2019 +0100
kernel 4.19.10 for apf6_sp
-----------------------------------------------------------------------
Summary of changes:
...-linux-4.0.config => apf6-linux-4.19.10.config} | 59 +++++++---------------
patches/linux/4.19.10 | 1 +
...50-armadeus-add_custom_drivers_to_kconfig.patch | 0
.../0700-armadeus-pcie_clk_defined_in_uboot.patch | 18 ++-----
.../linux/4.19/0701-armadeus-pcie_init_crash.patch | 37 ++++++++++++++
5 files changed, 62 insertions(+), 53 deletions(-)
copy buildroot/target/device/armadeus/apf6/{apf6-linux-4.0.config => apf6-linux-4.19.10.config} (91%)
create mode 120000 patches/linux/4.19.10
copy patches/linux/{3.10 => 4.19}/0050-armadeus-add_custom_drivers_to_kconfig.patch (100%)
copy patches/linux/{4.10 => 4.19}/0700-armadeus-pcie_clk_defined_in_uboot.patch (52%)
create mode 100644 patches/linux/4.19/0701-armadeus-pcie_init_crash.patch
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-4.0.config b/buildroot/target/device/armadeus/apf6/apf6-linux-4.19.10.config
similarity index 91%
copy from buildroot/target/device/armadeus/apf6/apf6-linux-4.0.config
copy to buildroot/target/device/armadeus/apf6/apf6-linux-4.19.10.config
index cbdbc485f..c37128e61 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-4.0.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-4.19.10.config
@@ -1,9 +1,8 @@
# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_KERNEL_LZO=y
CONFIG_SYSVIPC=y
-CONFIG_FHANDLE=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
+CONFIG_PREEMPT=y
CONFIG_LOG_BUF_SHIFT=18
CONFIG_CGROUPS=y
CONFIG_RELAY=y
@@ -12,26 +11,22 @@ CONFIG_EXPERT=y
CONFIG_PERF_EVENTS=y
# CONFIG_SLUB_DEBUG is not set
# CONFIG_COMPAT_BRK is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_BLK_DEV_BSG is not set
CONFIG_ARCH_MULTI_V6=y
CONFIG_ARCH_MXC=y
-CONFIG_MXC_DEBUG_BOARD=y
# CONFIG_MACH_MX31ADS is not set
# CONFIG_MACH_BUG is not set
CONFIG_SOC_IMX53=y
CONFIG_SOC_IMX6Q=y
CONFIG_SOC_IMX6SL=y
CONFIG_PCI=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
CONFIG_PCI_MSI=y
+CONFIG_PCI_DEBUG=y
+CONFIG_HOTPLUG_PCI=y
CONFIG_PCI_IMX6=y
CONFIG_SMP=y
CONFIG_VMSPLIT_2G=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
CONFIG_CMDLINE="noinitrd console=ttymxc3,115200"
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
@@ -41,10 +36,14 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
CONFIG_ARM_IMX6Q_CPUFREQ=y
CONFIG_VFP=y
CONFIG_NEON=y
-CONFIG_BINFMT_MISC=m
-CONFIG_PM_RUNTIME=y
CONFIG_PM_DEBUG=y
CONFIG_PM_TEST_SUSPEND=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_BINFMT_MISC=m
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
@@ -54,8 +53,6 @@ CONFIG_IP_PNP_DHCP=y
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-CONFIG_IPV6=y
CONFIG_NETFILTER=y
CONFIG_CAN=m
CONFIG_CAN_VCAN=m
@@ -70,7 +67,6 @@ CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_LL=y
CONFIG_CFG80211=y
CONFIG_NL80211_TESTMODE=y
CONFIG_CFG80211_WEXT=y
@@ -133,11 +129,9 @@ CONFIG_USB_NET_CDC_MBIM=y
# CONFIG_USB_NET_CDC_SUBSET is not set
# CONFIG_USB_NET_ZAURUS is not set
# CONFIG_RTL_CARDS is not set
-CONFIG_WL_TI=y
CONFIG_WL12XX=m
CONFIG_WLCORE_SDIO=m
# CONFIG_WILINK_PLATFORM_DATA is not set
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_EVBUG=m
CONFIG_KEYBOARD_GPIO=y
@@ -149,11 +143,9 @@ CONFIG_MOUSE_PS2=m
# CONFIG_MOUSE_PS2_CYPRESS is not set
# CONFIG_MOUSE_PS2_TRACKPOINT is not set
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_SX8674=y
CONFIG_INPUT_MISC=y
CONFIG_SERIO_SERPORT=m
# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
CONFIG_SERIAL_FSL_LPUART=y
@@ -193,14 +185,10 @@ CONFIG_SOC_CAMERA=y
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_CODA=y
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
-# CONFIG_DVB_AU8522_V4L is not set
-# CONFIG_DVB_TUNER_DIB0070 is not set
-# CONFIG_DVB_TUNER_DIB0090 is not set
# CONFIG_VGA_ARB is not set
CONFIG_IMX_IPUV3_CORE=y
CONFIG_DRM=y
CONFIG_DRM_IMX=y
-CONFIG_DRM_IMX_FB_HELPER=y
CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
CONFIG_DRM_IMX_LDB=y
CONFIG_DRM_IMX_HDMI=y
@@ -217,8 +205,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_LOGO=y
CONFIG_SOUND=y
CONFIG_SND=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
# CONFIG_SND_DRIVERS is not set
# CONFIG_SND_PCI is not set
# CONFIG_SND_ARM is not set
@@ -265,7 +251,6 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=y
CONFIG_LEDS_TRIGGER_GPIO=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_MCP7940X=y
CONFIG_RTC_DRV_SNVS=y
CONFIG_DMADEVICES=y
CONFIG_IMX_SDMA=y
@@ -275,15 +260,14 @@ CONFIG_UIO_PDRV_GENIRQ=y
CONFIG_UIO_DMEM_GENIRQ=y
CONFIG_STAGING=y
CONFIG_STAGING_MEDIA=y
-CONFIG_VIDEO_IMX6_CAMERA=m
-# CONFIG_IMX6_CAMERA_OV5642 is not set
-# CONFIG_IMX6_CAMERA_ADV7180 is not set
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_PWM=y
CONFIG_PWM_IMX=y
CONFIG_ARMADEUS_DRIVERS=y
CONFIG_ARMADEUS_FPGA_DRIVERS=y
CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
+CONFIG_FPGA=y
+CONFIG_FPGA_MGR_ALTERA_CVP=m
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
@@ -291,9 +275,6 @@ CONFIG_EXT2_FS_SECURITY=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=y
CONFIG_ISO9660_FS=y
@@ -313,21 +294,19 @@ CONFIG_NLS_CODEPAGE_850=y
CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_ISO8859_15=y
CONFIG_NLS_UTF8=y
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_SCHED_DEBUG is not set
-CONFIG_PROVE_LOCKING=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_FTRACE is not set
-# CONFIG_ARM_UNWIND is not set
CONFIG_SECURITYFS=y
CONFIG_CRYPTO_DEFLATE=y
CONFIG_CRYPTO_LZO=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
# CONFIG_CRYPTO_HW is not set
-CONFIG_CRC_CCITT=m
CONFIG_CRC_T10DIF=y
CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_PROVE_LOCKING=y
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_FTRACE is not set
+# CONFIG_ARM_UNWIND is not set
diff --git a/patches/linux/4.19.10 b/patches/linux/4.19.10
new file mode 120000
index 000000000..1ae015ed0
--- /dev/null
+++ b/patches/linux/4.19.10
@@ -0,0 +1 @@
+4.19
\ No newline at end of file
diff --git a/patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/4.19/0050-armadeus-add_custom_drivers_to_kconfig.patch
similarity index 100%
copy from patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch
copy to patches/linux/4.19/0050-armadeus-add_custom_drivers_to_kconfig.patch
diff --git a/patches/linux/4.10/0700-armadeus-pcie_clk_defined_in_uboot.patch b/patches/linux/4.19/0700-armadeus-pcie_clk_defined_in_uboot.patch
similarity index 52%
copy from patches/linux/4.10/0700-armadeus-pcie_clk_defined_in_uboot.patch
copy to patches/linux/4.19/0700-armadeus-pcie_clk_defined_in_uboot.patch
index 0e49f6007..7efb42e38 100644
--- a/patches/linux/4.10/0700-armadeus-pcie_clk_defined_in_uboot.patch
+++ b/patches/linux/4.19/0700-armadeus-pcie_clk_defined_in_uboot.patch
@@ -1,16 +1,8 @@
-Do not configure PCIe clock with Linux. PCIe Frequency clock is configured
-under U-Boot.
-Enable sata_ref_100M clock. It's needed to have PCIe registers access.
-
-Signed-off-by: Fabien Marteau <fab...@ar...>
-Signed-off-by: Sébastien Szymanski <seb...@ar...>
----
-
-Index: linux-4.10.13/drivers/clk/imx/clk-imx6q.c
-===================================================================
---- linux-4.10.13.orig/drivers/clk/imx/clk-imx6q.c
-+++ linux-4.10.13/drivers/clk/imx/clk-imx6q.c
-@@ -893,8 +893,13 @@ static void __init imx6q_clocks_init(str
+diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c
+index 8c7c2fcb8d94..fe989512abbe 100644
+--- a/drivers/clk/imx/clk-imx6q.c
++++ b/drivers/clk/imx/clk-imx6q.c
+@@ -890,8 +890,13 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
clk_set_parent(clk[IMX6QDL_CLK_SPDIF_SEL], clk[IMX6QDL_CLK_PLL3_PFD3_454M]);
/* All existing boards with PCIe use LVDS1 */
diff --git a/patches/linux/4.19/0701-armadeus-pcie_init_crash.patch b/patches/linux/4.19/0701-armadeus-pcie_init_crash.patch
new file mode 100644
index 000000000..9093df81c
--- /dev/null
+++ b/patches/linux/4.19/0701-armadeus-pcie_init_crash.patch
@@ -0,0 +1,37 @@
+Index: linux-4.19.10/drivers/pci/controller/dwc/pci-imx6.c
+===================================================================
+--- linux-4.19.10.orig/drivers/pci/controller/dwc/pci-imx6.c
++++ linux-4.19.10/drivers/pci/controller/dwc/pci-imx6.c
+@@ -282,6 +282,32 @@ static int imx6q_pcie_abort_handler(unsi
+ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)
+ {
+ struct device *dev = imx6_pcie->pci->dev;
++ u32 val, gpr1, gpr12;
++
++ /*
++ * If the bootloader already enabled the link we need some special
++ * handling to get the core back into a state where it is safe to
++ * touch it for configuration. As there is no dedicated reset signal
++ * wired up for MX6QDL, we need to manually force LTSSM into "detect"
++ * state before completely disabling LTSSM, which is a prerequisite
++ * for core configuration.
++ *
++ * If both LTSSM_ENABLE and REF_SSP_ENABLE are active we have a strong
++ * indication that the bootloader activated the link.
++ */
++ regmap_read(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1, &gpr1);
++ regmap_read(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, &gpr12);
++
++ if ((gpr1 & IMX6Q_GPR1_PCIE_REF_CLK_EN) &&
++ (gpr12 & IMX6Q_GPR12_PCIE_CTL_2)) {
++ val = dw_pcie_readl_dbi(imx6_pcie->pci, PCIE_PL_PFLR);
++ val &= ~PCIE_PL_PFLR_LINK_STATE_MASK;
++ val |= PCIE_PL_PFLR_FORCE_LINK;
++ dw_pcie_writel_dbi(imx6_pcie->pci, PCIE_PL_PFLR, val);
++
++ regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
++ IMX6Q_GPR12_PCIE_CTL_2, 0 << 10);
++ }
+
+ switch (imx6_pcie->variant) {
+ case IMX7D:
hooks/post-receive
--
armadeus
|