Commit 0361c7e5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: ep93xx: multiplatform support 



With the clock support and the interrupts out of the way, ep93xx can be
compiled into the same kernel image as the other ARMv4/v5 platforms. The
last obstacle are the two workarounds for broken boot loaders that
require us to re-initialize the ethernet controller and/or the watchdog
on certain machines.

Move this code into the decompressor sources directly, checking for
each possibly affected machine individually.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 4e5f36f8

arch/arm/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -347,22 +347,6 @@ config ARCH_MULTIPLATFORM 
	select SPARSE_IRQ

	select USE_OF



config ARCH_EP93XX

	bool "EP93xx-based"

	select ARCH_SPARSEMEM_ENABLE

	select ARM_AMBA

	imply ARM_PATCH_PHYS_VIRT

	select ARM_VIC

	select AUTO_ZRELADDR

	select CLKSRC_MMIO

	select CPU_ARM920T

	select GPIOLIB

	select COMMON_CLK

	select IRQ_DOMAIN

	select SPARSE_IRQ

	help

	  This enables support for the Cirrus EP93xx series of CPUs.



config ARCH_FOOTBRIDGE

	bool "FootBridge"

	select CPU_SA110

arch/arm/mach-ep93xx/include/mach/uncompress.h→arch/arm/boot/compressed/misc-ep93xx.h

+33 −36
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/*

 * arch/arm/mach-ep93xx/include/mach/uncompress.h

 *

 * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org>

 */



#include <asm/mach-types.h>



static unsigned char __raw_readb(unsigned int ptr)

{

	return *((volatile unsigned char *)ptr);

}



static unsigned int __raw_readl(unsigned int ptr)

static inline unsigned int __raw_readl(unsigned int ptr)

{

	return *((volatile unsigned int *)ptr);

}



static void __raw_writeb(unsigned char value, unsigned int ptr)

static inline void __raw_writeb(unsigned char value, unsigned int ptr)

{

	*((volatile unsigned char *)ptr) = value;

}



static void __raw_writel(unsigned int value, unsigned int ptr)

static inline void __raw_writel(unsigned int value, unsigned int ptr)

{

	*((volatile unsigned int *)ptr) = value;

}



#define PHYS_UART_DATA		(CONFIG_DEBUG_UART_PHYS + 0x00)

#define PHYS_UART_FLAG		(CONFIG_DEBUG_UART_PHYS + 0x18)

#define UART_FLAG_TXFF		0x20



static inline void putc(int c)

{

	int i;



	for (i = 0; i < 10000; i++) {

		/* Transmit fifo not full? */

		if (!(__raw_readb(PHYS_UART_FLAG) & UART_FLAG_TXFF))

			break;

	}



	__raw_writeb(c, PHYS_UART_DATA);

}



static inline void flush(void)

{

}





/*

 * Some bootloaders don't turn off DMA from the ethernet MAC before

 * jumping to linux, which means that we might end up with bits of RX
@@ -58,7 +29,7 @@ static inline void flush(void) 
#define PHYS_ETH_SELF_CTL		0x80010020

#define ETH_SELF_CTL_RESET		0x00000001



static void ethernet_reset(void)

static inline void ep93xx_ethernet_reset(void)

{

	unsigned int v;
@@ -75,15 +46,41 @@ static void ethernet_reset(void) 
#define TS72XX_WDT_FEED_PHYS_BASE	0x23c00000

#define TS72XX_WDT_FEED_VAL		0x05



static void __maybe_unused ts72xx_watchdog_disable(void)

static inline void __maybe_unused ts72xx_watchdog_disable(void)

{

	__raw_writeb(TS72XX_WDT_FEED_VAL, TS72XX_WDT_FEED_PHYS_BASE);

	__raw_writeb(0, TS72XX_WDT_CONTROL_PHYS_BASE);

}



static void arch_decomp_setup(void)

static inline void ep93xx_decomp_setup(void)

{

	if (machine_is_ts72xx())

		ts72xx_watchdog_disable();

	ethernet_reset();



	if (machine_is_adssphere() ||

	    machine_is_edb9301() ||

	    machine_is_edb9302() ||

	    machine_is_edb9302a() ||

	    machine_is_edb9302a() ||

	    machine_is_edb9307() ||

	    machine_is_edb9307a() ||

	    machine_is_edb9307a() ||

	    machine_is_edb9312() ||

	    machine_is_edb9315() ||

	    machine_is_edb9315a() ||

	    machine_is_edb9315a() ||

	    machine_is_gesbc9312() ||

	    machine_is_micro9() ||

	    machine_is_micro9l() ||

	    machine_is_micro9m() ||

	    machine_is_micro9s() ||

	    machine_is_micro9m() ||

	    machine_is_micro9l() ||

	    machine_is_micro9s() ||

	    machine_is_sim_one() ||

	    machine_is_snapper_cl15() ||

	    machine_is_ts72xx() ||

	    machine_is_bk3() ||

	    machine_is_vision_ep9307())

		ep93xx_ethernet_reset();

}

arch/arm/boot/compressed/misc.c

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ unsigned int __machine_arch_type; 
#include <linux/types.h>

#include <linux/linkage.h>

#include "misc.h"

#include "misc-ep93xx.h"



static void putstr(const char *ptr);
@@ -143,6 +144,9 @@ decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p, 
	free_mem_end_ptr	= free_mem_ptr_end_p;

	__machine_arch_type	= arch_id;



#ifdef CONFIG_ARCH_EP93XX

	ep93xx_decomp_setup();

#endif

	arch_decomp_setup();



	putstr("Uncompressing Linux...");

arch/arm/configs/ep93xx_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_MODULE_FORCE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

CONFIG_ARCH_MULTI_V4T=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_EP93XX=y

CONFIG_MACH_ADSSPHERE=y

CONFIG_MACH_EDB9301=y

arch/arm/mach-ep93xx/Kconfig

+12 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

menuconfig ARCH_EP93XX

	bool "EP93xx-based"

	depends on ARCH_MULTI_V4T

	select ARCH_SPARSEMEM_ENABLE

	select ARM_AMBA

	select ARM_VIC

	select CLKSRC_MMIO

	select CPU_ARM920T

	select GPIOLIB

	help

	  This enables support for the Cirrus EP93xx series of CPUs.



if ARCH_EP93XX



menu "Cirrus EP93xx Implementation Options"