Commit 7f17e390 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'socfpga_updates_for_v5.0' of... 

Merge tag 'socfpga_updates_for_v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/soc

SoCFPGA updates for v5.0
- Split Kconfig options for debug UART on Cyclone5
- Remove unused functions from socfpga platform code
- Turn on ARM and PL310 errata for SOCFPGA ARMv7 platform

* tag 'socfpga_updates_for_v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux

:
  ARM: socfpga: Turn on ARM errata for L2 cache
  ARM: socfpga: Clean unused functions
  ARM: debug: enable UART1 for socfpga Cyclone5

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d88bb418 fbc125af

arch/arm/Kconfig.debug

+16 −7
Original line number Diff line number Diff line
@@ -1087,14 +1087,21 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on SOCFPGA(Cyclone 5 and Arria 5) based platforms.



	config DEBUG_SOCFPGA_UART1

	config DEBUG_SOCFPGA_ARRIA10_UART1

		depends on ARCH_SOCFPGA

		bool "Use SOCFPGA UART1 for low-level debug"

		bool "Use SOCFPGA Arria10 UART1 for low-level debug"

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on SOCFPGA(Arria 10) based platforms.



	config DEBUG_SOCFPGA_CYCLONE5_UART1

		depends on ARCH_SOCFPGA

		bool "Use SOCFPGA Cyclone 5 UART1 for low-level debug"

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on SOCFPGA(Cyclone 5 and Arria 5) based platforms.



	config DEBUG_SUN9I_UART0

		bool "Kernel low-level debugging messages via sun9i UART0"
@@ -1682,7 +1689,8 @@ config DEBUG_UART_PHYS 
	default 0xfe800000 if ARCH_IOP32X

	default 0xff690000 if DEBUG_RK32_UART2

	default 0xffc02000 if DEBUG_SOCFPGA_UART0

	default 0xffc02100 if DEBUG_SOCFPGA_UART1

	default 0xffc02100 if DEBUG_SOCFPGA_ARRIA10_UART1

	default 0xffc03000 if DEBUG_SOCFPGA_CYCLONE5_UART1

	default 0xffd82340 if ARCH_IOP13XX

	default 0xffe40000 if DEBUG_RCAR_GEN1_SCIF0

	default 0xffe42000 if DEBUG_RCAR_GEN1_SCIF2
@@ -1789,7 +1797,8 @@ config DEBUG_UART_VIRT 
	default 0xfeb30c00 if DEBUG_KEYSTONE_UART0

	default 0xfeb31000 if DEBUG_KEYSTONE_UART1

	default 0xfec02000 if DEBUG_SOCFPGA_UART0

	default 0xfec02100 if DEBUG_SOCFPGA_UART1

	default 0xfec02100 if DEBUG_SOCFPGA_ARRIA10_UART1

	default 0xfec03000 if DEBUG_SOCFPGA_CYCLONE5_UART1

	default 0xfec12000 if (DEBUG_MVEBU_UART0 || DEBUG_MVEBU_UART0_ALTERNATE) && ARCH_MVEBU

	default 0xfec12100 if DEBUG_MVEBU_UART1_ALTERNATE

	default 0xfec10000 if DEBUG_SIRFATLAS7_UART0
@@ -1838,9 +1847,9 @@ config DEBUG_UART_8250_WORD 
	depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250

	depends on DEBUG_UART_8250_SHIFT >= 2

	default y if DEBUG_PICOXCELL_UART || \

		DEBUG_SOCFPGA_UART0 || DEBUG_SOCFPGA_UART1 || \

		DEBUG_KEYSTONE_UART0 || DEBUG_KEYSTONE_UART1 || \

		DEBUG_ALPINE_UART0 || \

		DEBUG_SOCFPGA_UART0 || DEBUG_SOCFPGA_ARRIA10_UART1 || \

		DEBUG_SOCFPGA_CYCLONE5_UART1 || DEBUG_KEYSTONE_UART0 || \

		DEBUG_KEYSTONE_UART1 || DEBUG_ALPINE_UART0 || \

		DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \

		DEBUG_DAVINCI_DA8XX_UART2 || DEBUG_BCM_IPROC_UART3 || \

		DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2

arch/arm/mach-socfpga/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -11,6 +11,13 @@ menuconfig ARCH_SOCFPGA 
	select HAVE_ARM_TWD if SMP

	select MFD_SYSCON

	select PCI_DOMAINS if PCI

	select ARM_ERRATA_754322

	select ARM_ERRATA_764369 if SMP

	select ARM_ERRATA_775420

	select PL310_ERRATA_588369

	select PL310_ERRATA_727915

	select PL310_ERRATA_753970 if PL310

	select PL310_ERRATA_769419



if ARCH_SOCFPGA

config SOCFPGA_SUSPEND

arch/arm/mach-socfpga/core.h

+0 −2
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ 


#define RSTMGR_MPUMODRST_CPU1		0x2     /* CPU1 Reset */



extern void socfpga_init_clocks(void);

extern void socfpga_sysmgr_init(void);

void socfpga_init_l2_ecc(void);

void socfpga_init_ocram_ecc(void);

void socfpga_init_arria10_l2_ecc(void);

arch/arm/mach-socfpga/socfpga.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ void __iomem *rst_manager_base_addr; 
void __iomem *sdr_ctl_base_addr;

unsigned long socfpga_cpu1start_addr;



void __init socfpga_sysmgr_init(void)

static void __init socfpga_sysmgr_init(void)

{

	struct device_node *np;

CRA Git | Maintained and supported by SUSTech CRA and CCSE