From owner-p4-projects@FreeBSD.ORG Wed Jan 14 20:00:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85D3E1065672; Wed, 14 Jan 2009 20:00:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F08A106564A for ; Wed, 14 Jan 2009 20:00:37 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 130A28FC1B for ; Wed, 14 Jan 2009 20:00:37 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0EK0a5u021828 for ; Wed, 14 Jan 2009 20:00:36 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0EK0aRG021826 for perforce@freebsd.org; Wed, 14 Jan 2009 20:00:36 GMT (envelope-from andrew@freebsd.org) Date: Wed, 14 Jan 2009 20:00:36 GMT Message-Id: <200901142000.n0EK0aRG021826@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 156172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jan 2009 20:00:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=156172 Change 156172 by andrew@andrew_bender on 2009/01/14 19:59:50 Add the support for LCD and I2C memory Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/neo1973_machdep.c#10 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#18 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410reg.h#5 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0var.h#8 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/neo1973_machdep.c#10 (text+ko) ==== @@ -165,6 +165,16 @@ }, { /* + * Map the LCD to VA == PA + */ + _A(S3C2410_LCDC_BASE), + _A(S3C2410_LCDC_BASE), + _S(S3C2410_LCDC_SIZE), + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + { + /* * Map the MMC/SD to VA == PA */ _A(S3C2410_SDI_BASE), @@ -174,6 +184,16 @@ PTE_NOCACHE, }, { + /* + * Map the IIC to VA == PA + */ + _A(S3C2410_IIC_BASE), + _A(S3C2410_IIC_BASE), + _S(S3C24X0_IIC_SIZE), + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + { 0, 0, 0, ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#18 (text+ko) ==== @@ -307,10 +307,18 @@ if (bus_space_map(iot, S3C2410_CLKMAN_BASE, S3C24X0_CLKMAN_SIZE, 0, &sc->sc_sx.sc_clkman_ioh)) panic("cannot map clock"); + /* LCD controller */ + if (bus_space_map(iot, S3C2410_LCDC_BASE, + S3C2410_LCDC_SIZE, 0, &sc->sc_sx.sc_lcd_ioh)) + panic("cannot map LCD"); /* MMC/SD */ if (bus_space_map(iot, S3C2410_SDI_BASE, S3C2410_SDI_SIZE, 0, &sc->sc_sx.sc_mci_ioh)) panic("cannot map MMC/SD"); + /* I2C */ + if (bus_space_map(iot, S3C2410_IIC_BASE, + S3C24X0_IIC_SIZE, 0, &sc->sc_sx.sc_iic_ioh)) + panic("cannot map IIC"); #if 0 /* Real time clock */ ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410reg.h#5 (text+ko) ==== @@ -61,6 +61,7 @@ #define S3C2410_DMAC_SIZE 0xe4 #define S3C2410_CLKMAN_BASE 0x4c000000 /* clock & power management */ #define S3C2410_LCDC_BASE 0x4d000000 /* LCD controller */ +#define S3C2410_LCDC_SIZE 0x60 #define S3C2410_NANDFC_BASE 0x4e000000 /* NAND Flash controller */ #define S3C2410_NANDFC_SIZE 0x18 #define S3C2410_UART0_BASE 0x50000000 ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0var.h#8 (text+ko) ==== @@ -47,8 +47,10 @@ bus_space_handle_t sc_memctl_ioh; /* Memory controller */ bus_space_handle_t sc_clkman_ioh; /* Clock manager */ bus_space_handle_t sc_gpio_ioh; /* GPIO */ + bus_space_handle_t sc_lcd_ioh; /* LCD */ bus_space_handle_t sc_rtc_ioh; /* real time clock */ bus_space_handle_t sc_mci_ioh; /* MMC/SD */ + bus_space_handle_t sc_iic_ioh; /* IIC */ bus_dma_tag_t sc_dmat;