Commit ae00fcc5 authored by Linus Walleij's avatar Linus Walleij Committed by Olof Johansson
Browse files

ARM: Delete netx a second time 

Commit ceb02dcf ARM: delete netx machine deleted
the mach-netx machine. Then eight days later
it was resurrected by SPDX tag fixes. I think.

Taking the liberty to fix some additional debug uart
cruft.

Link: https://lore.kernel.org/r/20190721224157.6597-1-linus.walleij@linaro.org


Fixes: ceb02dcf ("ARM: delete netx machine")
Acked-By: default avatarRobert Schwebel <r.schwebel@pengutronix.de>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 5f9e832c

arch/arm/Kconfig.debug

+0 −5
Original line number Diff line number Diff line
@@ -1535,7 +1535,6 @@ config DEBUG_LL_INCLUDE 
				 DEBUG_IMX7D_UART

	default "debug/ks8695.S" if DEBUG_KS8695_UART

	default "debug/msm.S" if DEBUG_QCOM_UARTDM

	default "debug/netx.S" if DEBUG_NETX_UART

	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART

	default "debug/renesas-scif.S" if DEBUG_R7S72100_SCIF2

	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN1_SCIF0
@@ -1575,7 +1574,6 @@ config DEBUG_UART_8250 


config DEBUG_UART_PHYS

	hex "Physical base address of debug UART"

	default 0x00100a00 if DEBUG_NETX_UART

	default 0x01c20000 if DEBUG_DAVINCI_DMx_UART0

	default 0x01c28000 if DEBUG_SUNXI_UART0

	default 0x01c28400 if DEBUG_SUNXI_UART1
@@ -1700,7 +1698,6 @@ config DEBUG_UART_PHYS 
	        DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \

		DEBUG_LL_UART_EFM32 || \

		DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \

		DEBUG_NETX_UART || \

		DEBUG_QCOM_UARTDM || DEBUG_R7S72100_SCIF2 || \

		DEBUG_RCAR_GEN1_SCIF0 || DEBUG_RCAR_GEN1_SCIF2 || \

		DEBUG_RCAR_GEN2_SCIF0 || DEBUG_RCAR_GEN2_SCIF1 || \
@@ -1717,7 +1714,6 @@ config DEBUG_UART_VIRT 
	default 0xc881f000 if DEBUG_RV1108_UART2

	default 0xc8821000 if DEBUG_RV1108_UART1

	default 0xc8912000 if DEBUG_RV1108_UART0

	default 0xe0000a00 if DEBUG_NETX_UART

	default 0xe0010fe0 if ARCH_RPC

	default 0xf0000be0 if ARCH_EBSA110

	default 0xf0010000 if DEBUG_ASM9260_UART
@@ -1822,7 +1818,6 @@ config DEBUG_UART_VIRT 
	default DEBUG_UART_PHYS if !MMU

	depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \

		DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \

		DEBUG_NETX_UART || \

		DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \

		DEBUG_S3C64XX_UART || \

		DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \

arch/arm/mach-netx/Kconfig

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

menu "NetX Implementations"

	depends on ARCH_NETX



config MACH_NXDKN

	bool "Enable Hilscher nxdkn Eval Board support"

	help

	  Board support for the Hilscher NetX Eval Board



config MACH_NXDB500

	bool "Enable Hilscher nxdb500 Eval Board support"

	select ARM_AMBA

	help

	  Board support for the Hilscher nxdb500 Eval Board



config MACH_NXEB500HMI

	bool "Enable Hilscher nxeb500hmi Eval Board support"

	select ARM_AMBA

	help

	  Board support for the Hilscher nxeb500hmi Eval Board



endmenu

arch/arm/mach-netx/Makefile

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

#

# Makefile for the linux kernel.

#



# Object file lists.



obj-y			+= time.o generic.o pfifo.o xc.o



# Specific board support

obj-$(CONFIG_MACH_NXDKN) += nxdkn.o

obj-$(CONFIG_MACH_NXDB500) += nxdb500.o fb.o

obj-$(CONFIG_MACH_NXEB500HMI) += nxeb500hmi.o fb.o

arch/arm/mach-netx/Makefile.boot

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

    zreladdr-y			+= 0x80008000

arch/arm/mach-netx/fb.c

deleted100644 → 0
+0 −65
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * arch/arm/mach-netx/fb.c

 *

 * Copyright (c) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix

 */



#include <linux/device.h>

#include <linux/init.h>

#include <linux/dma-mapping.h>

#include <linux/amba/bus.h>

#include <linux/amba/clcd.h>

#include <linux/err.h>

#include <linux/gfp.h>



#include <asm/irq.h>



#include <mach/netx-regs.h>

#include <mach/hardware.h>



static struct clcd_panel *netx_panel;



void netx_clcd_enable(struct clcd_fb *fb)

{

}



int netx_clcd_setup(struct clcd_fb *fb)

{

	dma_addr_t dma;



	fb->panel = netx_panel;



	fb->fb.screen_base = dma_alloc_wc(&fb->dev->dev, 1024 * 1024, &dma,

					  GFP_KERNEL);

	if (!fb->fb.screen_base) {

		printk(KERN_ERR "CLCD: unable to map framebuffer\n");

		return -ENOMEM;

	}



	fb->fb.fix.smem_start	= dma;

	fb->fb.fix.smem_len	= 1024*1024;



	return 0;

}



int netx_clcd_mmap(struct clcd_fb *fb, struct vm_area_struct *vma)

{

	return dma_mmap_wc(&fb->dev->dev, vma, fb->fb.screen_base,

			   fb->fb.fix.smem_start, fb->fb.fix.smem_len);

}



void netx_clcd_remove(struct clcd_fb *fb)

{

	dma_free_wc(&fb->dev->dev, fb->fb.fix.smem_len, fb->fb.screen_base,

		    fb->fb.fix.smem_start);

}



static AMBA_AHB_DEVICE(fb, "fb", 0, 0x00104000, { NETX_IRQ_LCD }, NULL);



int netx_fb_init(struct clcd_board *board, struct clcd_panel *panel)

{

	netx_panel = panel;

	fb_device.dev.platform_data = board;

	return amba_device_register(&fb_device, &iomem_resource);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE