From owner-svn-soc-all@FreeBSD.ORG Sat Jun 30 14:05:23 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 18355106566B for ; Sat, 30 Jun 2012 14:05:21 +0000 (UTC) (envelope-from aleek@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sat, 30 Jun 2012 14:05:21 +0000 Date: Sat, 30 Jun 2012 14:05:21 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120630140521.18355106566B@hub.freebsd.org> Cc: Subject: socsvn commit: r238631 - in soc2012/aleek/beaglexm-armv6/sys: arm/conf arm/ti arm/ti/am37x boot/fdt/dts X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2012 14:05:23 -0000 Author: aleek Date: Sat Jun 30 14:05:20 2012 New Revision: 238631 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238631 Log: added gpio support fot am37x SoC Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_prcm.c soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_gpio.c soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Modified: soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Sat Jun 30 13:17:21 2012 (r238630) +++ soc2012/aleek/beaglexm-armv6/sys/arm/conf/BEAGLEBOARD-XM Sat Jun 30 14:05:20 2012 (r238631) @@ -77,8 +77,8 @@ # MMC/SD/SDIO card slot support -#device mmc # mmc/sd bus -#device mmcsd # mmc/sd flash cards +device mmc # mmc/sd bus +device mmcsd # mmc/sd flash cards # Boot device is 2nd slice on MMC/SD card #options ROOTDEVNAME=\"ufs:mmcsd0s2\" @@ -99,7 +99,7 @@ #device am37x_pmic # AM335x Power Management IC (TPC65217) # GPIO -#device gpio +device gpio # USB support #device usb Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_prcm.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_prcm.c Sat Jun 30 13:17:21 2012 (r238630) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_prcm.c Sat Jun 30 14:05:20 2012 (r238631) @@ -286,16 +286,16 @@ OMAP3_GPTIMER_CLOCK_DEV(GPTIMER9_CLK), OMAP3_GPTIMER_CLOCK_DEV(GPTIMER10_CLK), OMAP3_GPTIMER_CLOCK_DEV(GPTIMER11_CLK), -#if 0 /* MMC device clocks (MMC1 and MMC2 can have different input clocks) */ OMAP3_GENERIC_CLOCK_DEV(MMC1_CLK), +#if 0 OMAP3_GENERIC_CLOCK_DEV(MMC2_CLK), OMAP3_GENERIC_CLOCK_DEV(MMC3_CLK), /* USB HS (high speed TLL, EHCI and OHCI) */ OMAP3_GENERIC_CLOCK_DEV(USBTLL_CLK), OMAP3_HSUSBHOST_CLOCK_DEV(USBHSHOST_CLK), - +#endif /* GPIO */ OMAP3_GENERIC_CLOCK_DEV(GPIO1_CLK), OMAP3_GENERIC_CLOCK_DEV(GPIO2_CLK), @@ -303,7 +303,7 @@ OMAP3_GENERIC_CLOCK_DEV(GPIO4_CLK), OMAP3_GENERIC_CLOCK_DEV(GPIO5_CLK), OMAP3_GENERIC_CLOCK_DEV(GPIO6_CLK), - +#if 0 /* I2C */ OMAP3_GENERIC_CLOCK_DEV(I2C1_CLK), OMAP3_GENERIC_CLOCK_DEV(I2C2_CLK), Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_gpio.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_gpio.c Sat Jun 30 13:17:21 2012 (r238630) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/ti_gpio.c Sat Jun 30 14:05:20 2012 (r238631) @@ -69,7 +69,7 @@ /* Register definitions */ #define TI_GPIO_REVISION 0x0000 #define TI_GPIO_SYSCONFIG 0x0010 -#if defined(SOC_OMAP3) +#if defined(SOC_OMAP3) || defined(SOC_TI_AM37X) #define TI_GPIO_REVISION 0x0000 #define TI_GPIO_SYSCONFIG 0x0010 #define TI_GPIO_SYSSTATUS 0x0014 @@ -136,7 +136,7 @@ #endif /*Other SoC Specific definitions*/ -#if defined(SOC_OMAP3) +#if defined(SOC_OMAP3) || defined(SOC_TI_AM37X) #define MAX_GPIO_BANKS 6 #define FIRST_GPIO_BANK 1 #define PINS_PER_BANK 32 Modified: soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Sat Jun 30 13:17:21 2012 (r238630) +++ soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Sat Jun 30 14:05:20 2012 (r238631) @@ -144,6 +144,15 @@ interrupt-parent = <&AINTC>; }; + mmchs@4809c000 { + compatible = "ti,mmchs"; + reg =<0x4809c000 0x1000 >; + interrupts = <83>; + interrupt-parent = <&AINTC>; + mmchs-device-id = <0>; + }; + + i2c0: i2c@48070000 {