From patchwork Wed Apr 15 21:37:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Yeryomin X-Patchwork-Id: 461655 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 58E931400DE for ; Thu, 16 Apr 2015 07:37:38 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=sJJDFEM3; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 0346328068C; Wed, 15 Apr 2015 23:36:36 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 305DC2802B3 for ; Wed, 15 Apr 2015 23:36:31 +0200 (CEST) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-la0-f52.google.com (mail-la0-f52.google.com [209.85.215.52]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 15 Apr 2015 23:36:25 +0200 (CEST) Received: by laat2 with SMTP id t2so42878238laa.1 for ; Wed, 15 Apr 2015 14:37:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=60/J9qJQRnTf1pGWKir/ipNYoJ5gyjpPcM+xT2tc6QY=; b=sJJDFEM3LD4hAskXIdXwaZR9nSsUw+QiVi7Qux+HqNVvajp1BSTuUyKq9GGJXf/kAY KWo+5mPt3b1fg76kYt3CATjaEjE64ad90GIIwrJiLi/GCX1LekEDDklFrJygGhNzsrP/ Ph7LkWgOVWtsewsb4TkHpiDUGfx8+lrDENDVtcAFCvd/Kf1p+2SIj1GsNWOFSjDpKt7r eM5u7BH6S6sHZlNZ8AvbU7G7MET79nq5W77gFFeSbVjeGV/yxnjQXOkRowBXRvSj/CNr bWQ9HHfdipJkTxTZFqa8eGGqR0HIxvfCXrHWFa/IbPVQukv7AJfOJGrHvLB2fDq4iUoQ DK1Q== X-Received: by 10.152.6.71 with SMTP id y7mr25509564lay.116.1429133837720; Wed, 15 Apr 2015 14:37:17 -0700 (PDT) Received: from localhost.localdomain ([213.175.90.142]) by mx.google.com with ESMTPSA id lc8sm1198238lbc.33.2015.04.15.14.37.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Apr 2015 14:37:16 -0700 (PDT) From: Roman Yeryomin X-Google-Original-From: Roman Yeryomin To: OpenWrt Development List Date: Thu, 16 Apr 2015 00:37:06 +0300 Message-Id: <1429133826-31296-1-git-send-email-roman@advem.lv> X-Mailer: git-send-email 2.1.0 Subject: [OpenWrt-Devel] [PATCH 1/2] ar71xx: merge ap81 patches into one X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Signed-off-by: Roman Yeryomin --- ...ath79-make-chipselect-logic-more-flexible.patch | 21 --------- .../patches-3.18/604-MIPS-ath79-ap81-fixes.patch | 50 ++-------------------- ...614-MIPS-ath79-ap81-remove-mtd-partitions.patch | 49 --------------------- 3 files changed, 3 insertions(+), 117 deletions(-) delete mode 100644 target/linux/ar71xx/patches-3.18/614-MIPS-ath79-ap81-remove-mtd-partitions.patch diff --git a/target/linux/ar71xx/patches-3.18/206-spi-ath79-make-chipselect-logic-more-flexible.patch b/target/linux/ar71xx/patches-3.18/206-spi-ath79-make-chipselect-logic-more-flexible.patch index 1d38986..1cf4c23 100644 --- a/target/linux/ar71xx/patches-3.18/206-spi-ath79-make-chipselect-logic-more-flexible.patch +++ b/target/linux/ar71xx/patches-3.18/206-spi-ath79-make-chipselect-logic-more-flexible.patch @@ -57,27 +57,6 @@ Signed-off-by: Gabor Juhos } }; ---- a/arch/mips/ath79/mach-ap81.c -+++ b/arch/mips/ath79/mach-ap81.c -@@ -67,12 +67,18 @@ static struct gpio_keys_button ap81_gpio - } - }; - -+static struct ath79_spi_controller_data ap81_spi0_data = { -+ .cs_type = ATH79_SPI_CS_TYPE_INTERNAL, -+ .cs_line = 0, -+}; -+ - static struct spi_board_info ap81_spi_info[] = { - { - .bus_num = 0, - .chip_select = 0, - .max_speed_hz = 25000000, - .modalias = "m25p64", -+ .controller_data = &ap81_spi0_data, - } - }; - --- a/arch/mips/ath79/mach-db120.c +++ b/arch/mips/ath79/mach-db120.c @@ -76,12 +76,18 @@ static struct gpio_keys_button db120_gpi diff --git a/target/linux/ar71xx/patches-3.18/604-MIPS-ath79-ap81-fixes.patch b/target/linux/ar71xx/patches-3.18/604-MIPS-ath79-ap81-fixes.patch index bbfdd49..2817453 100644 --- a/target/linux/ar71xx/patches-3.18/604-MIPS-ath79-ap81-fixes.patch +++ b/target/linux/ar71xx/patches-3.18/604-MIPS-ath79-ap81-fixes.patch @@ -20,60 +20,16 @@ #define AP81_GPIO_LED_STATUS 1 #define AP81_GPIO_LED_AOSS 3 -@@ -29,6 +33,37 @@ - - #define AP81_CAL_DATA_ADDR 0x1fff1000 - -+static struct mtd_partition ap81_partitions[] = { -+ { -+ .name = "u-boot", -+ .offset = 0, -+ .size = 0x040000, -+ .mask_flags = MTD_WRITEABLE, -+ }, { -+ .name = "u-boot-env", -+ .offset = 0x040000, -+ .size = 0x010000, -+ }, { -+ .name = "rootfs", -+ .offset = 0x050000, -+ .size = 0x500000, -+ }, { -+ .name = "uImage", -+ .offset = 0x550000, -+ .size = 0x100000, -+ }, { -+ .name = "ART", -+ .offset = 0x650000, -+ .size = 0x1b0000, -+ .mask_flags = MTD_WRITEABLE, -+ } -+}; -+ -+static struct flash_platform_data ap81_flash_data = { -+ .parts = ap81_partitions, -+ .nr_parts = ARRAY_SIZE(ap81_partitions), -+}; -+ - static struct gpio_led ap81_leds_gpio[] __initdata = { - { - .name = "ap81:green:status", -@@ -67,26 +102,6 @@ static struct gpio_keys_button ap81_gpio +@@ -67,20 +102,6 @@ static struct gpio_keys_button ap81_gpio } }; --static struct ath79_spi_controller_data ap81_spi0_data = { -- .cs_type = ATH79_SPI_CS_TYPE_INTERNAL, -- .cs_line = 0, --}; -- -static struct spi_board_info ap81_spi_info[] = { - { - .bus_num = 0, - .chip_select = 0, - .max_speed_hz = 25000000, - .modalias = "m25p64", -- .controller_data = &ap81_spi0_data, - } -}; - @@ -85,13 +41,13 @@ static void __init ap81_setup(void) { u8 *cal_data = (u8 *) KSEG1ADDR(AP81_CAL_DATA_ADDR); -@@ -96,10 +111,24 @@ static void __init ap81_setup(void) +@@ -90,10 +105,24 @@ static void __init ap81_setup(void) ath79_register_gpio_keys_polled(-1, AP81_KEYS_POLL_INTERVAL, ARRAY_SIZE(ap81_gpio_keys), ap81_gpio_keys); - ath79_register_spi(&ap81_spi_data, ap81_spi_info, - ARRAY_SIZE(ap81_spi_info)); -+ ath79_register_m25p80(&ap81_flash_data); ++ ath79_register_m25p80(NULL); ath79_register_wmac(cal_data, NULL); ath79_register_usb(); + diff --git a/target/linux/ar71xx/patches-3.18/614-MIPS-ath79-ap81-remove-mtd-partitions.patch b/target/linux/ar71xx/patches-3.18/614-MIPS-ath79-ap81-remove-mtd-partitions.patch deleted file mode 100644 index 6d403ab..0000000 --- a/target/linux/ar71xx/patches-3.18/614-MIPS-ath79-ap81-remove-mtd-partitions.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/arch/mips/ath79/mach-ap81.c -+++ b/arch/mips/ath79/mach-ap81.c -@@ -33,37 +33,6 @@ - - #define AP81_CAL_DATA_ADDR 0x1fff1000 - --static struct mtd_partition ap81_partitions[] = { -- { -- .name = "u-boot", -- .offset = 0, -- .size = 0x040000, -- .mask_flags = MTD_WRITEABLE, -- }, { -- .name = "u-boot-env", -- .offset = 0x040000, -- .size = 0x010000, -- }, { -- .name = "rootfs", -- .offset = 0x050000, -- .size = 0x500000, -- }, { -- .name = "uImage", -- .offset = 0x550000, -- .size = 0x100000, -- }, { -- .name = "ART", -- .offset = 0x650000, -- .size = 0x1b0000, -- .mask_flags = MTD_WRITEABLE, -- } --}; -- --static struct flash_platform_data ap81_flash_data = { -- .parts = ap81_partitions, -- .nr_parts = ARRAY_SIZE(ap81_partitions), --}; -- - static struct gpio_led ap81_leds_gpio[] __initdata = { - { - .name = "ap81:green:status", -@@ -111,7 +80,7 @@ static void __init ap81_setup(void) - ath79_register_gpio_keys_polled(-1, AP81_KEYS_POLL_INTERVAL, - ARRAY_SIZE(ap81_gpio_keys), - ap81_gpio_keys); -- ath79_register_m25p80(&ap81_flash_data); -+ ath79_register_m25p80(NULL); - ath79_register_wmac(cal_data, NULL); - ath79_register_usb(); -