From 462841bcd0764c5a84c4f2a1f461532131dd40d5 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 17 Jul 2012 11:35:35 -0400 Subject: [PATCH 63/76] 602-MIPS-ath79-add-openwrt-stuff Import of the above patch from openwrt trunk, as of this commit: ---------- commit c1d79f64eed0a7ac36b5b9bca52275b397bec424 Author: nbd Date: Mon Jul 16 16:26:51 2012 +0000 uboot-ar71xx: fix compile on recent mac os x versions git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32750 3c298f89-4303-0410-b956-a3cf2f4a3e73 ---------- Path to patch in the repo is: target/linux/ar71xx/patches-3.3 Repo is: git://nbd.name/openwrt.git Signed-off-by: Paul Gortmaker --- arch/mips/ath79/Kconfig | 20 ++++++++++++++++++++ arch/mips/ath79/Makefile | 10 ++++++++++ arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 8 ++++++++ 3 files changed, 38 insertions(+) diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig index 3995e31..d0ed27f 100644 --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig @@ -106,6 +106,20 @@ config SOC_QCA955X select PCI_AR724X if PCI def_bool n +config ATH79_DEV_M25P80 + select ATH79_DEV_SPI + def_bool n + +config ATH79_DEV_AP9X_PCI + select ATH79_PCI_ATH9K_FIXUP + def_bool n + +config ATH79_DEV_DSA + def_bool n + +config ATH79_DEV_ETH + def_bool n + config PCI_AR724X def_bool n @@ -125,4 +139,10 @@ config ATH79_DEV_WMAC depends on (SOC_AR913X || SOC_AR933X || SOC_AR934X || SOC_QCA955X) def_bool n +config ATH79_NVRAM + def_bool n + +config ATH79_PCI_ATH9K_FIXUP + def_bool n + endif diff --git a/arch/mips/ath79/Makefile b/arch/mips/ath79/Makefile index 5c9ff69..ae6db83 100644 --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile @@ -17,13 +17,23 @@ obj-$(CONFIG_PCI) += pci.o # Devices # obj-y += dev-common.o +obj-$(CONFIG_ATH79_DEV_AP9X_PCI) += dev-ap9x-pci.o +obj-$(CONFIG_ATH79_DEV_DSA) += dev-dsa.o +obj-$(CONFIG_ATH79_DEV_ETH) += dev-eth.o obj-$(CONFIG_ATH79_DEV_GPIO_BUTTONS) += dev-gpio-buttons.o obj-$(CONFIG_ATH79_DEV_LEDS_GPIO) += dev-leds-gpio.o +obj-$(CONFIG_ATH79_DEV_M25P80) += dev-m25p80.o obj-$(CONFIG_ATH79_DEV_SPI) += dev-spi.o obj-$(CONFIG_ATH79_DEV_USB) += dev-usb.o obj-$(CONFIG_ATH79_DEV_WMAC) += dev-wmac.o # +# Miscellaneous objects +# +obj-$(CONFIG_ATH79_NVRAM) += nvram.o +obj-$(CONFIG_ATH79_PCI_ATH9K_FIXUP) += pci-ath9k-fixup.o + +# # Machines # obj-$(CONFIG_ATH79_MACH_AP121) += mach-ap121.o diff --git a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h index 37048b8..d4098e3 100644 --- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h +++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h @@ -601,6 +601,14 @@ #define AR934X_GPIO_REG_FUNC 0x6c +#define AR934X_GPIO_REG_OUT_FUNC0 0x2c +#define AR934X_GPIO_REG_OUT_FUNC1 0x30 +#define AR934X_GPIO_REG_OUT_FUNC2 0x34 +#define AR934X_GPIO_REG_OUT_FUNC3 0x38 +#define AR934X_GPIO_REG_OUT_FUNC4 0x3c +#define AR934X_GPIO_REG_OUT_FUNC5 0x40 +#define AR934X_GPIO_REG_FUNC 0x6c + #define AR71XX_GPIO_COUNT 16 #define AR7240_GPIO_COUNT 18 #define AR7241_GPIO_COUNT 20 -- 1.7.10.4