Permalink
Browse files

Merge branch 'master' of /build/cero2/src/openwrt

  • Loading branch information...
2 parents 7d990ca + 984d62d commit d33ae38aa1c25eb73f64a215d03bc9a64c4edbb2 Dave Taht committed Feb 23, 2014
Showing with 478 additions and 372 deletions.
  1. +2 −2 include/kernel-version.mk
  2. +2 −2 package/network/config/netifd/Makefile
  3. +1 −1 target/linux/ar7/Makefile
  4. +1 −1 target/linux/ar7/patches-3.10/500-serial_kludge.patch
  5. +1 −1 target/linux/ar71xx/Makefile
  6. +6 −0 target/linux/ar71xx/base-files/etc/diag.sh
  7. +12 −0 target/linux/ar71xx/base-files/lib/ar71xx.sh
  8. +135 −3 target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c
  9. +136 −114 target/linux/ar71xx/files/drivers/mtd/nand/rb91x_nand.c
  10. +16 −0 target/linux/ar71xx/files/include/linux/platform_data/rb91x_nand.h
  11. +1 −0 target/linux/ar71xx/mikrotik/config-default
  12. +1 −1 target/linux/ar71xx/patches-3.10/310-lib-add-rle-decompression.patch
  13. +74 −0 target/linux/ar71xx/patches-3.10/451-gpio-74x164-improve-platform-device-support.patch
  14. +2 −2 target/linux/ar71xx/patches-3.10/490-usb-ehci-add-quirks-for-qca-socs.patch
  15. +1 −1 target/linux/ar71xx/patches-3.10/703-MIPS-ath79-add-RB91x-support.patch
  16. +1 −1 target/linux/atheros/Makefile
  17. +1 −1 target/linux/avr32/Makefile
  18. +1 −1 target/linux/bcm53xx/Makefile
  19. +1 −1 target/linux/brcm2708/Makefile
  20. +1 −1 target/linux/brcm2708/patches-3.10/015-bcm2708-i2c-driver.patch
  21. +1 −1 target/linux/brcm47xx/Makefile
  22. +1 −1 target/linux/brcm63xx/Makefile
  23. +0 −26 target/linux/brcm63xx/patches-3.10/054-spi-bcm63xx-don-t-substract-prepend-length-from-tota.patch
  24. +1 −1 target/linux/cns21xx/Makefile
  25. +1 −1 target/linux/generic/patches-3.10/060-hso_devices.patch
  26. +1 −1 target/linux/generic/patches-3.10/100-overlayfs.patch
  27. +2 −2 target/linux/generic/patches-3.10/102-ehci_hcd_ignore_oc.patch
  28. +1 −1 target/linux/generic/patches-3.10/530-jffs2_make_lzma_available.patch
  29. +2 −2 target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
  30. +1 −1 target/linux/generic/patches-3.10/721-phy_packets.patch
  31. +1 −1 target/linux/imx6/Makefile
  32. +1 −1 target/linux/imx6/patches-3.10/0009-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch
  33. +1 −1 target/linux/ixp4xx/Makefile
  34. +2 −2 target/linux/ixp4xx/patches-3.10/160-delayed_uart_io.patch
  35. +2 −2 target/linux/ixp4xx/patches-3.10/600-skb_avoid_dmabounce.patch
  36. +1 −1 target/linux/kirkwood/Makefile
  37. +1 −1 target/linux/kirkwood/patches-3.10/0001-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch
  38. +1 −1 target/linux/lantiq/Makefile
  39. +1 −1 target/linux/lantiq/patches-3.10/0031-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch
  40. +1 −1 target/linux/lantiq/patches-3.10/0032-USB-fix-roothub-for-IFXHCD.patch
  41. +1 −6 target/linux/lantiq/patches-3.10/0035-pinctrl-lantiq-fix-typo.patch
  42. +1 −1 target/linux/malta/Makefile
  43. +1 −1 target/linux/mpc85xx/Makefile
  44. +1 −1 target/linux/mvebu/Makefile
  45. +1 −1 target/linux/mvebu/patches-3.10/0004-of-pci-Provide-support-for-parsing-PCI-DT-ranges-pro.patch
  46. +0 −46 target/linux/mvebu/patches-3.10/0085-irqchip-armada-370-xp-fix-IPI-race-condition.patch
  47. +2 −2 target/linux/mvebu/patches-3.10/0181-of-Fix-dereferencing-node-name-in-debug-output-to-be.patch
  48. +1 −1 target/linux/mvebu/patches-3.10/0183-of-irq-Rename-of_irq_map_-functions-to-of_irq_parse_.patch
  49. +0 −58 target/linux/mvebu/patches-3.10/0196-ata-sata_mv-setting-PHY-speed-according-to-SControl-.patch
  50. +3 −3 target/linux/mvebu/patches-3.10/0197-xhci-fix-dma-mask-setup-in-xhci.c.patch
  51. +1 −1 target/linux/octeon/Makefile
  52. +1 −1 target/linux/ppc40x/Makefile
  53. +1 −1 target/linux/ppc44x/Makefile
  54. +1 −1 target/linux/ramips/Makefile
  55. +1 −1 target/linux/ramips/patches-3.10/0116-i2c-MIPS-adds-ralink-I2C-driver.patch
  56. +19 −19 target/linux/ramips/patches-3.10/0512-USB-add-xhci-support-for-mt7621.patch
  57. +4 −6 target/linux/ramips/patches-3.10/999-pinctrl_fixes.patch
  58. +1 −1 target/linux/rb532/Makefile
  59. +1 −1 target/linux/realview/Makefile
  60. +1 −1 target/linux/sparc/Makefile
  61. +1 −1 target/linux/x86/alix2/target.mk
  62. +1 −1 target/linux/x86/generic/target.mk
  63. +0 −1 target/linux/x86/geos/{config-3.8 → config-3.10}
  64. +0 −25 target/linux/x86/geos/config-3.3
  65. +2 −2 target/linux/x86/geos/target.mk
  66. +1 −1 target/linux/x86/kvm_guest/target.mk
  67. 0 target/linux/x86/thincan/{config-3.3 → config-3.10}
  68. +2 −1 target/linux/x86/thincan/target.mk
  69. +7 −3 target/linux/x86/xen_domu/{config-3.3 → config-3.10}
  70. +2 −1 target/linux/x86/xen_domu/target.mk
  71. +1 −1 target/linux/xburst/Makefile
@@ -17,8 +17,8 @@ endif
ifeq ($(LINUX_VERSION),3.9.11)
LINUX_KERNEL_MD5SUM:=edbf88eb7f7d34dbd5d3887726790755
endif
-ifeq ($(LINUX_VERSION),3.10.28)
- LINUX_KERNEL_MD5SUM:=789a39e8a381a60e46fe922cb66d77e2
+ifeq ($(LINUX_VERSION),3.10.32)
+ LINUX_KERNEL_MD5SUM:=58bfaf95f4e23be2d658dab0a7fb9615
endif
ifeq ($(LINUX_VERSION),3.12.10)
LINUX_KERNEL_MD5SUM:=93325074b7b1d7bb76fb7d4348f0aa7a
@@ -1,13 +1,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=netifd
-PKG_VERSION:=2014-02-18
+PKG_VERSION:=2014-02-23
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://nbd.name/luci2/netifd.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=b5cfcfe34e6b44f2be90bf24e879dc25f0f07b9e
+PKG_SOURCE_VERSION:=9bf007985b20cb65147d8fd8ff59a6eb65ed22b8
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
# PKG_MIRROR_MD5SUM:=
@@ -13,7 +13,7 @@ FEATURES:=squashfs atm
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
SUBTARGETS:=generic ac49x
-LINUX_VERSION:=3.10.28
+LINUX_VERSION:=3.10.32
include $(INCLUDE_DIR)/target.mk
@@ -14,7 +14,7 @@
};
/* Uart divisor latch read */
-@@ -2839,7 +2846,11 @@ static void serial8250_console_putchar(s
+@@ -2843,7 +2850,11 @@ static void serial8250_console_putchar(s
struct uart_8250_port *up =
container_of(port, struct uart_8250_port, port);
@@ -13,7 +13,7 @@ FEATURES:=mips16
CPU_TYPE=34kc
SUBTARGETS:=generic nand mikrotik
-LINUX_VERSION:=3.10.28
+LINUX_VERSION:=3.10.32
include $(INCLUDE_DIR)/target.mk
@@ -113,6 +113,12 @@ get_status_led() {
rb-750)
status_led="rb750:green:act"
;;
+ rb-911g-2hpnd|\
+ rb-911g-5hpnd|\
+ rb-912uag-2hpnd|\
+ rb-912uag-5hpnd)
+ status_led="rb:green:user"
+ ;;
routerstation | routerstation-pro)
status_led="ubnt:green:rf"
;;
@@ -399,6 +399,18 @@ ar71xx_board_detect() {
*"RouterBOARD 751G")
name="rb-751g"
;;
+ *"RouterBOARD 911G-2HPnD")
+ name="rb-911g-2hpnd"
+ ;;
+ *"RouterBOARD 911G-5HPnD")
+ name="rb-911g-5hpnd"
+ ;;
+ *"RouterBOARD 912UAG-2HPnD")
+ name="rb-912uag-2hpnd"
+ ;;
+ *"RouterBOARD 912UAG-5HPnD")
+ name="rb-912uag-5hpnd"
+ ;;
*"RouterBOARD 951G-2HnD")
name="rb-951g-2hnd"
;;
@@ -23,6 +23,7 @@
#include <linux/routerboot.h>
#include <linux/gpio.h>
#include <linux/platform_data/gpio-latch.h>
+#include <linux/platform_data/rb91x_nand.h>
#include <asm/prom.h>
#include <asm/mach-ath79/ath79.h>
@@ -32,9 +33,9 @@
#include "common.h"
#include "dev-eth.h"
#include "dev-leds-gpio.h"
-#include "dev-m25p80.h"
#include "dev-nfc.h"
#include "dev-usb.h"
+#include "dev-spi.h"
#include "dev-wmac.h"
#include "machtypes.h"
#include "pci.h"
@@ -54,6 +55,37 @@
#define RB91X_LATCH_GPIO_BASE AR934X_GPIO_COUNT
#define RB91X_LATCH_GPIO(_x) (RB91X_LATCH_GPIO_BASE + (_x))
+#define RB91X_SSR_GPIO_BASE (RB91X_LATCH_GPIO_BASE + AR934X_GPIO_COUNT)
+#define RB91X_SSR_GPIO(_x) (RB91X_SSR_GPIO_BASE + (_x))
+
+#define RB91X_SSR_BIT_LED1 0
+#define RB91X_SSR_BIT_LED2 1
+#define RB91X_SSR_BIT_LED3 2
+#define RB91X_SSR_BIT_LED4 3
+#define RB91X_SSR_BIT_LED5 4
+#define RB91X_SSR_BIT_5 5
+#define RB91X_SSR_BIT_USB_POWER 6
+#define RB91X_SSR_BIT_PCIE_POWER 7
+
+#define RB91X_GPIO_SSR_STROBE RB91X_LATCH_GPIO(0)
+#define RB91X_GPIO_LED_POWER RB91X_LATCH_GPIO(1)
+#define RB91X_GPIO_LED_USER RB91X_LATCH_GPIO(2)
+#define RB91X_GPIO_NAND_READ RB91X_LATCH_GPIO(3)
+#define RB91X_GPIO_NAND_RDY RB91X_LATCH_GPIO(4)
+#define RB91X_GPIO_NLE RB91X_LATCH_GPIO(11)
+#define RB91X_GPIO_NAND_NRW RB91X_LATCH_GPIO(12)
+#define RB91X_GPIO_NAND_NCE RB91X_LATCH_GPIO(13)
+#define RB91X_GPIO_NAND_CLE RB91X_LATCH_GPIO(14)
+#define RB91X_GPIO_NAND_ALE RB91X_LATCH_GPIO(15)
+
+#define RB91X_GPIO_LED_1 RB91X_SSR_GPIO(RB91X_SSR_BIT_LED1)
+#define RB91X_GPIO_LED_2 RB91X_SSR_GPIO(RB91X_SSR_BIT_LED2)
+#define RB91X_GPIO_LED_3 RB91X_SSR_GPIO(RB91X_SSR_BIT_LED3)
+#define RB91X_GPIO_LED_4 RB91X_SSR_GPIO(RB91X_SSR_BIT_LED4)
+#define RB91X_GPIO_LED_5 RB91X_SSR_GPIO(RB91X_SSR_BIT_LED5)
+#define RB91X_GPIO_USB_POWER RB91X_SSR_GPIO(RB91X_SSR_BIT_USB_POWER)
+#define RB91X_GPIO_PCIE_POWER RB91X_SSR_GPIO(RB91X_SSR_BIT_PCIE_POWER)
+
struct rb_board_info {
const char *name;
u32 flags;
@@ -97,6 +129,100 @@ static struct gpio_latch_platform_data rb711gr100_gpio_latch_data __initdata = {
.le_active_low = true,
};
+static struct rb91x_nand_platform_data rb711gr100_nand_data __initdata = {
+ .gpio_nce = RB91X_GPIO_NAND_NCE,
+ .gpio_ale = RB91X_GPIO_NAND_ALE,
+ .gpio_cle = RB91X_GPIO_NAND_CLE,
+ .gpio_rdy = RB91X_GPIO_NAND_RDY,
+ .gpio_read = RB91X_GPIO_NAND_READ,
+ .gpio_nrw = RB91X_GPIO_NAND_NRW,
+ .gpio_nle = RB91X_GPIO_NLE,
+};
+
+static u8 rb711gr100_ssr_initdata[] __initdata = {
+ BIT(RB91X_SSR_BIT_PCIE_POWER) |
+ BIT(RB91X_SSR_BIT_USB_POWER) |
+ BIT(RB91X_SSR_BIT_5)
+};
+
+static struct gen_74x164_chip_platform_data rb711gr100_ssr_data = {
+ .base = RB91X_SSR_GPIO_BASE,
+ .num_registers = ARRAY_SIZE(rb711gr100_ssr_initdata),
+ .init_data = rb711gr100_ssr_initdata,
+};
+
+static struct ath79_spi_controller_data rb711gr100_spi0_cdata = {
+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
+ .cs_line = 0,
+ .is_flash = true,
+};
+
+static struct ath79_spi_controller_data rb711gr100_spi1_cdata = {
+ .cs_type = ATH79_SPI_CS_TYPE_GPIO,
+ .cs_line = RB91X_GPIO_SSR_STROBE,
+};
+
+static struct spi_board_info rb711gr100_spi_info[] = {
+ {
+ .bus_num = 0,
+ .chip_select = 0,
+ .max_speed_hz = 25000000,
+ .modalias = "m25p80",
+ .platform_data = &rb711gr100_spi_flash_data,
+ .controller_data = &rb711gr100_spi0_cdata
+ }, {
+ .bus_num = 0,
+ .chip_select = 1,
+ .max_speed_hz = 10000000,
+ .modalias = "74x164",
+ .platform_data = &rb711gr100_ssr_data,
+ .controller_data = &rb711gr100_spi1_cdata
+ }
+};
+
+static struct ath79_spi_platform_data rb711gr100_spi_data __initdata = {
+ .bus_num = 0,
+ .num_chipselect = 2,
+};
+
+static struct gpio_led rb711gr100_leds[] __initdata = {
+ {
+ .name = "rb:green:led1",
+ .gpio = RB91X_GPIO_LED_1,
+ .active_low = 0,
+ },
+ {
+ .name = "rb:green:led2",
+ .gpio = RB91X_GPIO_LED_2,
+ .active_low = 0,
+ },
+ {
+ .name = "rb:green:led3",
+ .gpio = RB91X_GPIO_LED_3,
+ .active_low = 0,
+ },
+ {
+ .name = "rb:green:led4",
+ .gpio = RB91X_GPIO_LED_4,
+ .active_low = 0,
+ },
+ {
+ .name = "rb:green:led5",
+ .gpio = RB91X_GPIO_LED_5,
+ .active_low = 0,
+ },
+ {
+ .name = "rb:green:user",
+ .gpio = RB91X_GPIO_LED_USER,
+ .active_low = 0,
+ },
+ {
+ .name = "rb:green:power",
+ .gpio = RB91X_GPIO_LED_POWER,
+ .active_low = 0,
+ },
+};
+
static void __init rb711gr100_init_partitions(const struct rb_info *info)
{
rb711gr100_spi_partitions[0].size = info->hard_cfg_offs;
@@ -163,7 +289,8 @@ static void __init rb711gr100_setup(void)
mips_set_machine_name(buf);
rb711gr100_init_partitions(info);
- ath79_register_m25p80(&rb711gr100_spi_flash_data);
+ ath79_register_spi(&rb711gr100_spi_data, rb711gr100_spi_info,
+ ARRAY_SIZE(rb711gr100_spi_info));
ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0 |
AR934X_ETH_CFG_SW_ONLY_MODE);
@@ -179,12 +306,17 @@ static void __init rb711gr100_setup(void)
rb711gr100_wlan_init();
- platform_device_register_simple("rb91x-nand", -1, NULL, 0);
+ platform_device_register_data(NULL, "rb91x-nand", -1,
+ &rb711gr100_nand_data,
+ sizeof(rb711gr100_nand_data));
platform_device_register_data(NULL, "gpio-latch", -1,
&rb711gr100_gpio_latch_data,
sizeof(rb711gr100_gpio_latch_data));
+ ath79_register_leds_gpio(-1, ARRAY_SIZE(rb711gr100_leds),
+ rb711gr100_leds);
+
flags = rb711gr100_get_flags(info);
if (flags & RB91X_FLAG_USB)
Oops, something went wrong.

0 comments on commit d33ae38

Please sign in to comment.