Commit 5db3f620 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'versatile-1' of... 

Merge tag 'versatile-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/cleanup

Merge "First pull request of Versatile family clean-ups for v3.17" from Linus
Walleij:

- Remove <mach/memory.h> from the Integrator, paving the
  road for multiplatform.
- Push the CLCD helper code down into the framebuffer subsystem,
  removing the last hook in plat-versatile for the Integrator,
  also paving the road for multiplatform.

Patches tested on Integrator/AP, Integrator/CP and Versatile AB
(all real hardware).

* tag 'versatile-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator

:
  video: move Versatile CLCD helpers
  ARM: integrator: get rid of <mach/memory.h>

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e12f739e 11c32d7b

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -320,7 +320,6 @@ config ARCH_INTEGRATOR 
	select HAVE_TCM

	select ICST

	select MULTI_IRQ_HANDLER

	select NEED_MACH_MEMORY_H

	select PLAT_VERSATILE

	select SPARSE_IRQ

	select USE_OF

arch/arm/boot/dts/integratorap.dts

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
/ {

	model = "ARM Integrator/AP";

	compatible = "arm,integrator-ap";

	dma-ranges = <0x80000000 0x0 0x80000000>;



	aliases {

		arm,timer-primary = &timer2;

arch/arm/mach-integrator/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ config ARCH_INTEGRATOR_CP 
	bool "Support Integrator/CP platform"

	select ARCH_CINTEGRATOR

	select ARM_TIMER_SP804

	select PLAT_VERSATILE_CLCD

	select SERIAL_AMBA_PL011 if TTY

	select SERIAL_AMBA_PL011_CONSOLE if TTY

	select SOC_BUS

arch/arm/mach-integrator/include/mach/memory.h

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
/*

 *  arch/arm/mach-integrator/include/mach/memory.h

 *

 *  Copyright (C) 1999 ARM Limited

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

#ifndef __ASM_ARCH_MEMORY_H

#define __ASM_ARCH_MEMORY_H



/*

 * Physical DRAM offset.

 */

#define PLAT_PHYS_OFFSET	UL(0x00000000)



#define BUS_OFFSET	UL(0x80000000)

#define __virt_to_bus(x)	((x) - PAGE_OFFSET + BUS_OFFSET)

#define __bus_to_virt(x)	((x) - BUS_OFFSET + PAGE_OFFSET)

#define __pfn_to_bus(x)		(__pfn_to_phys(x) + (BUS_OFFSET - PHYS_OFFSET))

#define __bus_to_pfn(x)		__phys_to_pfn((x) - (BUS_OFFSET - PHYS_OFFSET))



#endif

arch/arm/mach-integrator/integrator_cp.c

+1 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/amba/bus.h>

#include <linux/amba/kmi.h>

#include <linux/amba/clcd.h>

#include <linux/platform_data/video-clcd-versatile.h>

#include <linux/amba/mmci.h>

#include <linux/io.h>

#include <linux/irqchip/versatile-fpga.h>
@@ -36,8 +37,6 @@ 
#include <asm/mach/map.h>

#include <asm/mach/time.h>



#include <plat/clcd.h>



#include "hardware.h"

#include "cm.h"

#include "common.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE