From dfc91d42a7bb71f09919b8c6feddd4ed703bf646 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Tue, 16 Oct 2018 14:23:46 +0200
Subject: [PATCH] [arm64] Enable drivers for Xilinx ZynqMP

Enable ZynqMP architecture and sata(ceva), ethernet(macb),
uart(ps_uart), pcie(xilinx_nwl) and gpio drivers.

(cherry picked from commit 4bdb05f65df963a7e304ab62449be6d693c781ba)
[bwh: Replace CONFIG_NET_CADENCE with CONFIG_NET_VENDOR_CADENCE]
---
 debian/changelog           |  3 +++
 debian/config/arm64/config | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9b26849fa..4a6dbaaa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ linux (4.19.13-2) UNRELEASED; urgency=medium
   * ipv6: Consider sk_bound_dev_if when binding a socket to an address
     (Closes: #918103)
 
+  [ Michal Simek ]
+  * [arm64] Enable Xilinx ZynqMP SoC and drivers
+
  -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Sun, 30 Dec 2018 10:30:57 +0100
 
 linux (4.19.13-1) unstable; urgency=medium
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index d33a9ee56..9c8f3d01b 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -63,6 +63,7 @@ CONFIG_ARCH_THUNDER=y
 CONFIG_ARCH_THUNDER2=y
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_XGENE=y
+CONFIG_ARCH_ZYNQMP=y
 
 ##
 ## file: drivers/acpi/Kconfig
@@ -94,6 +95,7 @@ CONFIG_ANDROID=y
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_MVEBU=m
 CONFIG_AHCI_TEGRA=m
 CONFIG_AHCI_XGENE=m
@@ -246,6 +248,7 @@ CONFIG_GPIO_PL061=y
 CONFIG_GPIO_XGENE=y
 CONFIG_GPIO_XGENE_SB=m
 CONFIG_GPIO_XLP=y
+CONFIG_GPIO_ZYNQ=m
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_MAX77620=y
@@ -533,6 +536,12 @@ CONFIG_NET_XGENE=m
 ##
 CONFIG_NET_XGENE_V2=m
 
+##
+## file: drivers/net/ethernet/cadence/Kconfig
+##
+CONFIG_NET_VENDOR_CADENCE=y
+CONFIG_MACB=m
+
 ##
 ## file: drivers/net/ethernet/cavium/Kconfig
 ##
@@ -697,6 +706,7 @@ CONFIG_NVMEM_SUNXI_SID=m
 ## file: drivers/pci/controller/Kconfig
 ##
 CONFIG_PCI_AARDVARK=y
+CONFIG_PCIE_XILINX_NWL=y
 CONFIG_PCI_TEGRA=y
 CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCI_XGENE=y
@@ -1017,6 +1027,8 @@ CONFIG_SERIAL_MESON_CONSOLE=y
 CONFIG_SERIAL_TEGRA=y
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
+CONFIG_SERIAL_XILINX_PS_UART=y
+CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 CONFIG_SERIAL_MVEBU_UART=y
 CONFIG_SERIAL_MVEBU_CONSOLE=y