Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0025835c authored by Paul Mundt's avatar Paul Mundt Committed by Linus Torvalds
Browse files

[PATCH] sh: consolidate hp620/hp680/hp690 targets into hp6xx 



Most of the reasons for keeping these separate before was due to hp690
discontig, and since we have a workaround for that now (abusing some shadow
space so everything is magically contiguous), there's no reason to keep the
targets separate.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5ebdce72

arch/sh/boards/hp6xx/hp620/Makefile→arch/sh/boards/hp6xx/Makefile

+6 −0
Original line number Diff line number Diff line 
#

# Makefile for the HP620 specific parts of the kernel

# Makefile for the HP6xx specific parts of the kernel

#



obj-y	 := mach.o setup.o

arch/sh/boards/hp6xx/hp620/mach.c

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

 * linux/arch/sh/boards/hp6xx/hp620/mach.c

 * 

 * Copyright (C) 2000 Stuart Menefy (stuart.menefy@st.com)

 * 

 * May be copied or modified under the terms of the GNU General Public

 * License.  See linux/COPYING for more information.

 *

 * Machine vector for the HP620

 */



#include <linux/init.h>



#include <asm/machvec.h>

#include <asm/rtc.h>

#include <asm/machvec_init.h>



#include <asm/io.h>

#include <asm/hd64461/hd64461.h>

#include <asm/irq.h>



/*

 * The Machine Vector

 */



struct sh_machine_vector mv_hp620 __initmv = {

        .mv_nr_irqs             = HD64461_IRQBASE+HD64461_IRQ_NUM,



        .mv_inb                 = hd64461_inb,

        .mv_inw                 = hd64461_inw,

        .mv_inl                 = hd64461_inl,

        .mv_outb                = hd64461_outb,

        .mv_outw                = hd64461_outw,

        .mv_outl                = hd64461_outl,



        .mv_inb_p               = hd64461_inb_p,

        .mv_inw_p               = hd64461_inw,

        .mv_inl_p               = hd64461_inl,

        .mv_outb_p              = hd64461_outb_p,

        .mv_outw_p              = hd64461_outw,

        .mv_outl_p              = hd64461_outl,



        .mv_insb                = hd64461_insb,

        .mv_insw                = hd64461_insw,

        .mv_insl                = hd64461_insl,

        .mv_outsb               = hd64461_outsb,

        .mv_outsw               = hd64461_outsw,

        .mv_outsl               = hd64461_outsl,



        .mv_irq_demux           = hd64461_irq_demux,

};

ALIAS_MV(hp620)

arch/sh/boards/hp6xx/hp620/setup.c

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

 * linux/arch/sh/boards/hp6xx/hp620/setup.c

 *

 * Copyright (C) 2002 Andriy Skulysh, 2005 Kristoffer Ericson

 *

 * May be copied or modified under the terms of the GNU General Public

 * License. See Linux/COPYING for more information.

 *

 * Setup code for an HP620.

 * Due to similiarity with hp680/hp690 same inits are done (for now)

 */



#include <linux/config.h>

#include <linux/init.h>

#include <asm/hd64461/hd64461.h>

#include <asm/io.h>

#include <asm/hp6xx/hp6xx.h>

#include <asm/cpu/dac.h>



const char *get_system_type(void)

{

	return "HP620";

}



int __init platform_setup(void)

{

	u16 v;



	v  = inw(HD64461_STBCR);

	v |= HD64461_STBCR_SURTST | HD64461_STBCR_SIRST  |

	     HD64461_STBCR_STM1ST | HD64461_STBCR_STM0ST |

	     HD64461_STBCR_SAFEST | HD64461_STBCR_SPC0ST |

	     HD64461_STBCR_SMIAST | HD64461_STBCR_SAFECKE_OST |

	     HD64461_STBCR_SAFECKE_IST;

	outw(v, HD64461_STBCR);



	v  = inw(HD64461_GPADR);

	v |= HD64461_GPADR_SPEAKER | HD64461_GPADR_PCMCIA0;

	outw(v, HD64461_GPADR);



	sh_dac_disable(DAC_SPEAKER_VOLUME);



	return 0;

}

arch/sh/boards/hp6xx/hp680/Makefile

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#

# Makefile for the HP680 specific parts of the kernel

#



obj-y	 := mach.o setup.o

arch/sh/boards/hp6xx/hp690/Makefile

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#

# Makefile for the HP690 specific parts of the kernel

#



obj-y	 := mach.o