From owner-p4-projects@FreeBSD.ORG Thu Feb 25 14:53:16 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 881561065674; Thu, 25 Feb 2010 14:53:16 +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 4BF2D106564A for ; Thu, 25 Feb 2010 14:53:16 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1F1A18FC1C for ; Thu, 25 Feb 2010 14:53:16 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1PErGVf080197 for ; Thu, 25 Feb 2010 14:53:16 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1PErFhD080195 for perforce@freebsd.org; Thu, 25 Feb 2010 14:53:15 GMT (envelope-from raj@freebsd.org) Date: Thu, 25 Feb 2010 14:53:15 GMT Message-Id: <201002251453.o1PErFhD080195@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 175075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Feb 2010 14:53:16 -0000 http://p4web.freebsd.org/chv.cgi?CH=175075 Change 175075 by raj@raj_fdt on 2010/02/25 14:53:13 Enable FDT support for SHEEVAPLUG kernel (and clean up) Affected files ... .. //depot/projects/fdt/sys/arm/conf/SHEEVAPLUG#2 edit .. //depot/projects/fdt/sys/arm/mv/kirkwood/sheevaplug.c#2 edit Differences ... ==== //depot/projects/fdt/sys/arm/conf/SHEEVAPLUG#2 (text+ko) ==== @@ -13,6 +13,7 @@ #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions WERROR="-Werror" +options FDT #Flattened Device Tree options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options INET6 #IPv6 communications protocols ==== //depot/projects/fdt/sys/arm/mv/kirkwood/sheevaplug.c#2 (text+ko) ==== @@ -94,50 +94,6 @@ { 0, 0, 0, 0, 0, } }; -const struct gpio_config mv_gpio_config[] = { - { -1, -1, -1 } -}; - -void -platform_mpp_init(void) -{ - - /* - * MPP configuration for Sheeva Plug - * - * MPP[0]: NF_IO[2] - * MPP[1]: NF_IO[3] - * MPP[2]: NF_IO[4] - * MPP[3]: NF_IO[5] - * MPP[4]: NF_IO[6] - * MPP[5]: NF_IO[7] - * MPP[6]: SYSRST_OUTn - * MPP[8]: UA0_RTS - * MPP[9]: UA0_CTS - * MPP[10]: UA0_TXD - * MPP[11]: UA0_RXD - * MPP[12]: SD_CLK - * MPP[13]: SD_CMD - * MPP[14]: SD_D[0] - * MPP[15]: SD_D[1] - * MPP[16]: SD_D[2] - * MPP[17]: SD_D[3] - * MPP[18]: NF_IO[0] - * MPP[19]: NF_IO[1] - * MPP[29]: TSMP[9] - * - * Others: GPIO - */ - - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL0, 0x01111111); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL1, 0x11113322); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL2, 0x00001111); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL3, 0x00100000); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL4, 0x00000000); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL5, 0x00000000); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL6, 0x00000000); -} - static void platform_identify(void *dummy) {