From owner-svn-src-head@freebsd.org Sat Jun 3 20:14:48 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8A93EBF8748; Sat, 3 Jun 2017 20:14:48 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3D1A87CDB2; Sat, 3 Jun 2017 20:14:48 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v53KElLS003842; Sat, 3 Jun 2017 20:14:47 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v53KElLw003839; Sat, 3 Jun 2017 20:14:47 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201706032014.v53KElLw003839@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Sat, 3 Jun 2017 20:14:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r319554 - in head/sys/arm: conf freescale/vybrid X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Jun 2017 20:14:48 -0000 Author: andrew Date: Sat Jun 3 20:14:46 2017 New Revision: 319554 URL: https://svnweb.freebsd.org/changeset/base/319554 Log: Port the Vybrid code to PLATFORM to help move it into GENERIC. Deleted: head/sys/arm/freescale/vybrid/vf_common.c Modified: head/sys/arm/conf/VYBRID head/sys/arm/freescale/vybrid/files.vybrid head/sys/arm/freescale/vybrid/vf_machdep.c Modified: head/sys/arm/conf/VYBRID ============================================================================== --- head/sys/arm/conf/VYBRID Sat Jun 3 20:02:12 2017 (r319553) +++ head/sys/arm/conf/VYBRID Sat Jun 3 20:14:46 2017 (r319554) @@ -25,6 +25,7 @@ include "../freescale/vybrid/std.vybrid" makeoptions WERROR="-Werror" options SCHED_4BSD # 4BSD scheduler +options PLATFORM # Platform based SoC #options NANDFS # NAND Filesystem #options SMP # Enable multiple cores Modified: head/sys/arm/freescale/vybrid/files.vybrid ============================================================================== --- head/sys/arm/freescale/vybrid/files.vybrid Sat Jun 3 20:02:12 2017 (r319553) +++ head/sys/arm/freescale/vybrid/files.vybrid Sat Jun 3 20:14:46 2017 (r319554) @@ -3,7 +3,6 @@ kern/kern_clocksource.c standard arm/freescale/vybrid/vf_machdep.c standard -arm/freescale/vybrid/vf_common.c standard arm/freescale/vybrid/vf_ccm.c standard arm/freescale/vybrid/vf_anadig.c standard arm/freescale/vybrid/vf_iomuxc.c standard Modified: head/sys/arm/freescale/vybrid/vf_machdep.c ============================================================================== --- head/sys/arm/freescale/vybrid/vf_machdep.c Sat Jun 3 20:02:12 2017 (r319553) +++ head/sys/arm/freescale/vybrid/vf_machdep.c Sat Jun 3 20:14:46 2017 (r319554) @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include "opt_ddb.h" #include "opt_platform.h" #include @@ -32,46 +31,56 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include -#include +#include + #include -#include +#include #include +#include -vm_offset_t -platform_lastaddr(void) -{ +#include - return (devmap_lastaddr()); -} +#include "platform_if.h" -void -platform_probe_and_attach(void) +static int +vf_devmap_init(platform_t plat) { + devmap_add_entry(0x40000000, 0x100000); + + return (0); } -void -platform_gpio_init(void) +static void +vf_cpu_reset(platform_t plat) { + phandle_t src; + uint32_t paddr; + bus_addr_t vaddr; -} + if (src_swreset() == 0) + goto end; -void -platform_late_init(void) -{ + src = OF_finddevice("src"); + if ((src != 0) && (OF_getencprop(src, "reg", &paddr, sizeof(paddr))) > 0) { + if (bus_space_map(fdtbus_bs_tag, paddr, 0x10, 0, &vaddr) == 0) { + bus_space_write_4(fdtbus_bs_tag, vaddr, 0x00, SW_RST); + } + } +end: + while (1); } -int -platform_devmap_init(void) -{ +static platform_method_t vf_methods[] = { + PLATFORMMETHOD(platform_devmap_init, vf_devmap_init), + PLATFORMMETHOD(platform_cpu_reset, vf_cpu_reset), - devmap_add_entry(0x40000000, 0x100000); + PLATFORMMETHOD_END, +}; - return (0); -} +FDT_PLATFORM_DEF(vf, "vybrid", 0, "freescale,vybrid", 0);