 @@ -1,14 +1,14 @@
-/* $NetBSD: amlogic_board.c,v 1.6 2015/03/01 15:06:09 jmcneill Exp $ */
+/* $NetBSD: amlogic_board.c,v 1.7 2015/03/04 12:36:12 jmcneill Exp $ */
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "opt_amlogic.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_board.c,v 1.6 2015/03/01 15:06:09 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_board.c,v 1.7 2015/03/04 12:36:12 jmcneill Exp $");
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <uvm/uvm_extern.h>
 #include <arm/bootconfig.h>
 #include <arm/cpufunc.h>
 #include <arm/amlogic/amlogic_reg.h>
 @@ -147,26 +147,33 @@ amlogic_get_rate_a9(void)
 	return rate;
+}
 uint32_t
 amlogic_get_rate_a9periph(void)
+{
 	const uint32_t cntl1 = CBUS_READ(HHI_SYS_CPU_CLK_CNTL1_REG);
 	const u_int div = __SHIFTOUT(cntl1,
 				     HHI_SYS_CPU_CLK_CNTL1_PERIPH_CLK_MUX) + 2;
 	return amlogic_get_rate_a9() / div;
+}
 void
 amlogic_eth_init(void)
+{
 	CBUS_WRITE(EE_CLK_GATING1_REG,
 	    CBUS_READ(EE_CLK_GATING1_REG) | EE_CLK_GATING1_ETHERNET);
+}
 static void
 amlogic_usbphy_clkgate_enable(int port)
+{
 	switch (port) {
 	case 0:
 		CBUS_WRITE(EE_CLK_GATING1_REG,
 		    CBUS_READ(EE_CLK_GATING1_REG) |
 		    EE_CLK_GATING1_USB_GENERAL |
 		    EE_CLK_GATING1_USB0);
 		CBUS_WRITE(EE_CLK_GATING2_REG,
 		    CBUS_READ(EE_CLK_GATING2_REG) |
 		    EE_CLK_GATING2_USB0_TO_DDR);
 		break;

 @@ -1,14 +1,14 @@
-/* $NetBSD: amlogic_crureg.h,v 1.4 2015/02/28 18:50:57 jmcneill Exp $ */
+/* $NetBSD: amlogic_crureg.h,v 1.5 2015/03/04 12:36:12 jmcneill Exp $ */
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,29 +29,32 @@
 #ifndef _ARM_AMLOGIC_CRUREG_H
 #define _ARM_AMLOGIC_CRUREG_H
 #define CBUS_REG(n)	((n) << 2)
 #define EE_CLK_GATING0_REG		CBUS_REG(0x1050)
 #define EE_CLK_GATING1_REG		CBUS_REG(0x1051)
 #define EE_CLK_GATING2_REG		CBUS_REG(0x1052)
 #define EE_CLK_GATING3_REG		CBUS_REG(0x1054)
 #define EE_CLK_GATING1_USB_GENERAL	__BIT(26)
 #define EE_CLK_GATING1_USB1		__BIT(22)
 #define EE_CLK_GATING1_USB0		__BIT(21)
 #define EE_CLK_GATING1_ETHERNET		__BIT(3)
 #define EE_CLK_GATING2_USB0_TO_DDR	__BIT(9)
 #define EE_CLK_GATING2_USB1_TO_DDR	__BIT(8)
 #define HHI_SYS_CPU_CLK_CNTL1_REG	CBUS_REG(0x1057)
 #define HHI_SYS_CPU_CLK_CNTL1_SDIV	__BITS(29,20)
 #define HHI_SYS_CPU_CLK_CNTL1_PERIPH_CLK_MUX __BITS(8,6)
 #define HHI_SYS_CPU_CLK_CNTL0_REG	CBUS_REG(0x1067)
 #define HHI_SYS_CPU_CLK_CNTL0_CLKSEL	__BIT(7)
 #define HHI_SYS_CPU_CLK_CNTL0_SOUTSEL	__BITS(3,2)
 #define HHI_SYS_CPU_CLK_CNTL0_PLLSEL	__BITS(1,0)
 #define HHI_SYS_PLL_CNTL_REG		CBUS_REG(0x10c0)
 #define HHI_SYS_PLL_CNTL_MUL		__BITS(8,0)
 #define HHI_SYS_PLL_CNTL_DIV		__BITS(14,9)
 #define HHI_SYS_PLL_CNTL_OD		__BITS(17,16)

 @@ -1,14 +1,14 @@
-/* $NetBSD: amlogic_intr.h,v 1.3 2015/02/28 15:20:43 jmcneill Exp $ */
+/* $NetBSD: amlogic_intr.h,v 1.4 2015/03/04 12:36:12 jmcneill Exp $ */
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -25,19 +25,21 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef _ARM_AMLOGIC_INTR_H
 #define _ARM_AMLOGIC_INTR_H
 #define PIC_MAXSOURCES		256
 #define PIC_MAXMAXSOURCES	282
 #include <arm/cortex/gic_intr.h>
 #include <arm/cortex/a9tmr_intr.h>
 #define AMLOGIC_INTR_GMAC	40
 #define AMLOGIC_INTR_MMC	60
 #define AMLOGIC_INTR_USB0	62
 #define AMLOGIC_INTR_USB1	63
 #define AMLOGIC_INTR_UART2AO	70
 #define AMLOGIC_INTR_UART0AO	122
 #endif /* _ARM_AMLOGIC_INTR_H */

 @@ -1,14 +1,14 @@
-/* $NetBSD: amlogic_io.c,v 1.3 2015/02/28 15:20:43 jmcneill Exp $ */
+/* $NetBSD: amlogic_io.c,v 1.4 2015/03/04 12:36:12 jmcneill Exp $ */
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,61 +19,65 @@
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "opt_amlogic.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_io.c,v 1.3 2015/02/28 15:20:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_io.c,v 1.4 2015/03/04 12:36:12 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/cpu.h>
 #include <sys/bus.h>
 #include <arm/mainbus/mainbus.h>
 #include <arm/amlogic/amlogic_reg.h>
 #include <arm/amlogic/amlogic_var.h>
 #include "locators.h"
 static int	amlogicio_match(device_t, cfdata_t, void *);
 static void	amlogicio_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(amlogic_io, 0,
     amlogicio_match, amlogicio_attach, NULL, NULL);
 static int	amlogicio_print(void *, const char *);
 static int	amlogicio_find(device_t, cfdata_t, const int *, void *);
 static bool amlogicio_found = false;
 #define NOPORT	AMLOGICIOCF_PORT_DEFAULT
 static const struct amlogic_locators amlogic_locators[] = {
   { "amlogiccom",
     AMLOGIC_UART0AO_OFFSET, AMLOGIC_UART_SIZE, 0, AMLOGIC_INTR_UART0AO },
   { "amlogiccom",
     AMLOGIC_UART2AO_OFFSET, AMLOGIC_UART_SIZE, 2, AMLOGIC_INTR_UART2AO },
   { "dwctwo",
     AMLOGIC_USB0_OFFSET, AMLOGIC_USB_SIZE, 0, AMLOGIC_INTR_USB0 },
   { "dwctwo",
     AMLOGIC_USB1_OFFSET, AMLOGIC_USB_SIZE, 1, AMLOGIC_INTR_USB1 },
   { "awge",
     AMLOGIC_GMAC_OFFSET, AMLOGIC_GMAC_SIZE, NOPORT, AMLOGIC_INTR_GMAC },
 #if notyet
   { "amlogicmmc",
     AMLOGIC_MMC_OFFSET, AMLOGIC_MMC_SIZE, 0, AMLOGIC_INTR_MMC },
 #endif
 };
 int
 amlogicio_match(device_t parent, cfdata_t cf, void *aux)
+{
 	if (amlogicio_found)
 		return 0;
 	return 1;
+}

 @@ -1,14 +1,14 @@
-#	$NetBSD: files.amlogic,v 1.3 2015/02/28 15:20:43 jmcneill Exp $
+#	$NetBSD: files.amlogic,v 1.4 2015/03/04 12:36:12 jmcneill Exp $
+#
 # Configuration info for Amlogic ARM Peripherals
+#
 include "arch/arm/pic/files.pic"
 include "arch/arm/cortex/files.cortex"
 file	arch/arm/arm32/arm32_boot.c
 file	arch/arm/arm32/arm32_kvminit.c
 file	arch/arm/arm32/arm32_reboot.c
 file	arch/arm/arm32/irq_dispatch.S
 file	arch/arm/amlogic/amlogic_board.c
 @@ -24,20 +24,24 @@ file	arch/arm/amlogic/amlogic_io.c		amlo
 device	amlogiccom
 attach	amlogiccom at amlogicio with amlogic_com
 file	arch/arm/amlogic/amlogic_com.c		amlogic_com needs-flag
 # mmc/sd/sdio
 device	amlogicmmc: sdmmcbus
 attach	amlogicmmc at amlogicio with amlogic_mmc
 file	arch/arm/amlogic/amlogic_mmc.c		amlogic_mmc
 # usb otg
 attach	dwctwo at amlogicio with amlogic_dwctwo
 file	arch/arm/amlogic/amlogic_dwctwo.c	amlogic_dwctwo
 # ethernet mac
 attach	awge at amlogicio with amlogic_gmac
 file	arch/arm/amlogic/amlogic_gmac.c		amlogic_gmac
 # Console parameters
 defparam opt_amlogic.h			CONADDR
 defparam opt_amlogic.h			CONSPEED
 defparam opt_amlogic.h			CONMODE
 # Memory parameters
 defparam opt_amlogic.h			MEMSIZE

 @@ -1,14 +1,14 @@
-/* $NetBSD: amlogic_reg.h,v 1.5 2015/03/01 15:37:26 jmcneill Exp $ */
+/* $NetBSD: amlogic_reg.h,v 1.6 2015/03/04 12:36:12 jmcneill Exp $ */
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -27,47 +27,47 @@
  */
 #ifndef _ARM_AMLOGIC_REG_H
 #define _ARM_AMLOGIC_REG_H
 #define CONSADDR_VA	(CONSADDR - AMLOGIC_CORE_BASE + AMLOGIC_CORE_VBASE)
 #define AMLOGIC_CORE_BASE	0xc0000000
 #define AMLOGIC_CORE_SIZE	0x1b000000
 #define AMLOGIC_CORE_VBASE	0xe0000000
 #define AMLOGIC_CBUS_OFFSET	0x01100000
 #define AMLOGIC_UART0_OFFSET	0x01102130
 #define AMLOGIC_UART1_OFFSET	0x01102137
 #define AMLOGIC_UART2_OFFSET	0x011021c0
 #define AMLOGIC_UART0AO_OFFSET	0x081004c0
 #define AMLOGIC_UART2AO_OFFSET	0x081004e0
 #define AMLOGIC_UART_SIZE	0x20
 #define AMLOGIC_UART_FREQ	24000000
 #define AMLOGIC_MMC_OFFSET	0x01108e00
 #define AMLOGIC_MMC_SIZE	0x30
 #define AMLOGIC_PL310_OFFSET	0x04200000
 #define AMLOGIC_AOBUS_OFFSET	0x08100000
 #define AMLOGIC_GPIOAO_OFFSET	0x08100024
 #define AMLOGIC_USB0_OFFSET	0x09040000
 #define AMLOGIC_USB1_OFFSET	0x090c0000
 #define AMLOGIC_USB_SIZE	0x40000
 #define AMLOGIC_GMAC_OFFSET	0x09410000
 #define AMLOGIC_GMAC_SIZE	0x10000
 #define AMLOGIC_SRAM_OFFSET	0x19000000
 #define AMLOGIC_CPUCONF_OFFSET	0x1901ff80
 #define AMLOGIC_CBUS_CPU_CLK_CNTL_REG	0x419c
 #define AMLOGIC_AOBUS_PWR_CTRL0_REG	0xe0
 #define AMLOGIC_AOBUS_PWR_CTRL1_REG	0xe4
 #define AMLOGIC_AOBUS_PWR_MEM_PD0_REG	0xf4
 #define AMLOGIC_CPUCONF_CTRL_REG	0x00
 #define AMLOGIC_CPUCONF_CPU_ADDR_REG(n)	(0x04 * (n))

 @@ -1,14 +1,14 @@
-/* $NetBSD: amlogic_var.h,v 1.2 2015/02/28 15:20:43 jmcneill Exp $ */
+/* $NetBSD: amlogic_var.h,v 1.3 2015/03/04 12:36:12 jmcneill Exp $ */
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -47,20 +47,21 @@ struct amlogicio_attach_args {
 	bus_space_tag_t aio_core_a4x_bst;
 	bus_space_handle_t aio_bsh;
 	bus_dma_tag_t aio_dmat;
 };
 extern struct bus_space amlogic_bs_tag;
 extern struct bus_space amlogic_a4x_bs_tag;
 extern bus_space_handle_t amlogic_core_bsh;
 extern struct arm32_bus_dma_tag amlogic_dma_tag;
 void	amlogic_bootstrap(void);
 void	amlogic_usbphy_init(int);
 void	amlogic_eth_init(void);
 uint32_t amlogic_get_rate_xtal(void);
 uint32_t amlogic_get_rate_sys(void);
 uint32_t amlogic_get_rate_a9(void);
 uint32_t amlogic_get_rate_a9periph(void);
 #endif /* _ARM_AMLOGIC_VAR_H */

 @@ -1,15 +1,15 @@
+#
-#	$NetBSD: ODROID-C1,v 1.5 2015/03/01 15:37:26 jmcneill Exp $
+#	$NetBSD: ODROID-C1,v 1.6 2015/03/04 12:36:12 jmcneill Exp $
+#
 #	Odroid-C1 (Amlogic S805) based SBC (Single Board Computer)
+#
 include	"arch/evbarm/conf/std.amlogic"
 # estimated number of users
 maxusers	32
 # Standard system options
 options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
 @@ -165,26 +165,31 @@ armgic0		at armperiph?				# Interrupt Co
 a9tmr0		at armperiph?				# Global Timer
 a9wdt0		at armperiph?				# Watchdog
 # Specify the memory size in megabytes.
 #options 	MEMSIZE=1024
 # On-board I/O
 amlogicio0	at mainbus?
 # On-board UARTs
 amlogiccom0	at amlogicio0 port 0
 options 	CONSADDR=0xc81004c0, CONSPEED=115200
 # Gigabit ethernet
 awge0		at amlogicio0
 rgephy*		at mii? phy ?
 ukphy*		at mii? phy ?
 # USB
 dwctwo0		at amlogicio0 port 0
 dwctwo1		at amlogicio0 port 1
 usb*		at dwctwo?
 include "dev/usb/usbdevices.config"
 midi*		at midibus?
 ## USB debugging options
 #options 	USBVERBOSE
 #options 	USB_DEBUG
 #options 	UHUB_DEBUG
 #options 	DWC2_DEBUG