aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-08-17 06:18:30 +0000
committerJohn Crispin <john@openwrt.org>2015-08-17 06:18:30 +0000
commitaa4c6e27b42b4c4be07462c7e951a694fe38f500 (patch)
treeb463a0a8cb4d81b35986046050a3b068d2f31054 /target/linux
parentb0b59a8e75242f1b9715dabf834df97d48d42cbc (diff)
downloadupstream-aa4c6e27b42b4c4be07462c7e951a694fe38f500.tar.gz
upstream-aa4c6e27b42b4c4be07462c7e951a694fe38f500.tar.bz2
upstream-aa4c6e27b42b4c4be07462c7e951a694fe38f500.zip
ramips: reorder patches
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 46659
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ramips/patches-3.18/0037-USB-phy-add-ralink-SoC-driver.patch8
-rw-r--r--target/linux/ramips/patches-3.18/0064-MIPS-ralink-fix-clearing-the-illegal-access-interrup.patch (renamed from target/linux/ramips/patches-3.18/064-MIPS-ralink-fix-clearing-the-illegal-access-interrup.patch)0
-rw-r--r--target/linux/ramips/patches-3.18/0066-cevt.patch (renamed from target/linux/ramips/patches-3.18/999-cevt.patch)0
-rw-r--r--target/linux/ramips/patches-3.18/0067-disable_illacc.patch (renamed from target/linux/ramips/patches-3.18/999-disable_illacc.patch)0
-rw-r--r--target/linux/ramips/patches-3.18/0068-non-pci-mt7620.patch (renamed from target/linux/ramips/patches-3.18/999-non-pci-mt7620.patch)0
-rw-r--r--target/linux/ramips/patches-3.18/0069-no-pm_poweroff.patch (renamed from target/linux/ramips/patches-3.18/999-no-pm_poweroff.patch)0
-rw-r--r--target/linux/ramips/patches-3.18/0070-pci-reset.patch (renamed from target/linux/ramips/patches-3.18/999-pci-reset.patch)0
-rw-r--r--target/linux/ramips/patches-3.18/0071-mt7621-add-cpu-feature-overrides.patch (renamed from target/linux/ramips/patches-3.18/100-mt7621-add-cpu-feature-overrides.patch)0
-rw-r--r--target/linux/ramips/patches-3.18/0072-mt7621-add-highmem.patch (renamed from target/linux/ramips/patches-3.18/110-mt7621-add-highmem.patch)0
-rw-r--r--target/linux/ramips/patches-3.18/0073-fix_bootargs_handling.patch (renamed from target/linux/ramips/patches-3.18/0110-fix_bootargs_handling.patch)0
-rw-r--r--target/linux/ramips/patches-3.18/0074-i2c-MIPS-add-mt7621-I2C-driver.patch (renamed from target/linux/ramips/patches-3.18/0111-i2c-MIPS-add-mt7621-I2C-driver.patch)0
11 files changed, 3 insertions, 5 deletions
diff --git a/target/linux/ramips/patches-3.18/0037-USB-phy-add-ralink-SoC-driver.patch b/target/linux/ramips/patches-3.18/0037-USB-phy-add-ralink-SoC-driver.patch
index 1dd866103a..5a7d416726 100644
--- a/target/linux/ramips/patches-3.18/0037-USB-phy-add-ralink-SoC-driver.patch
+++ b/target/linux/ramips/patches-3.18/0037-USB-phy-add-ralink-SoC-driver.patch
@@ -1,6 +1,6 @@
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
-@@ -239,6 +239,11 @@ config PHY_XGENE
+@@ -239,6 +239,11 @@
help
This option enables support for APM X-Gene SoC multi-purpose PHY.
@@ -14,14 +14,14 @@
depends on RESET_CONTROLLER
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
-@@ -31,3 +31,4 @@ obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY) +=
+@@ -31,3 +31,4 @@
obj-$(CONFIG_PHY_XGENE) += phy-xgene.o
obj-$(CONFIG_PHY_STIH407_USB) += phy-stih407-usb.o
obj-$(CONFIG_PHY_STIH41X_USB) += phy-stih41x-usb.o
+obj-$(CONFIG_PHY_RALINK_USB) += phy-ralink-usb.o
--- /dev/null
+++ b/drivers/phy/phy-ralink-usb.c
-@@ -0,0 +1,177 @@
+@@ -0,0 +1,175 @@
+/*
+ * Allwinner ralink USB phy driver
+ *
@@ -168,7 +168,6 @@
+ struct phy_provider *phy_provider;
+ const struct of_device_id *match;
+
-+ printk("%s:%s[%d]\n", __FILE__, __func__, __LINE__);
+ match = of_match_device(ralink_usb_phy_of_match, &pdev->dev);
+ phy_clk = (int) match->data;
+
@@ -182,7 +181,6 @@
+ }
+
+ phy_provider = devm_of_phy_provider_register(dev, ralink_usb_phy_xlate);
-+printk("%s:%s[%d]\n", __FILE__, __func__, __LINE__);
+
+ return PTR_ERR_OR_ZERO(phy_provider);
+}
diff --git a/target/linux/ramips/patches-3.18/064-MIPS-ralink-fix-clearing-the-illegal-access-interrup.patch b/target/linux/ramips/patches-3.18/0064-MIPS-ralink-fix-clearing-the-illegal-access-interrup.patch
index 8153272308..8153272308 100644
--- a/target/linux/ramips/patches-3.18/064-MIPS-ralink-fix-clearing-the-illegal-access-interrup.patch
+++ b/target/linux/ramips/patches-3.18/0064-MIPS-ralink-fix-clearing-the-illegal-access-interrup.patch
diff --git a/target/linux/ramips/patches-3.18/999-cevt.patch b/target/linux/ramips/patches-3.18/0066-cevt.patch
index 192afe4b8a..192afe4b8a 100644
--- a/target/linux/ramips/patches-3.18/999-cevt.patch
+++ b/target/linux/ramips/patches-3.18/0066-cevt.patch
diff --git a/target/linux/ramips/patches-3.18/999-disable_illacc.patch b/target/linux/ramips/patches-3.18/0067-disable_illacc.patch
index 590b501bf2..590b501bf2 100644
--- a/target/linux/ramips/patches-3.18/999-disable_illacc.patch
+++ b/target/linux/ramips/patches-3.18/0067-disable_illacc.patch
diff --git a/target/linux/ramips/patches-3.18/999-non-pci-mt7620.patch b/target/linux/ramips/patches-3.18/0068-non-pci-mt7620.patch
index ce56ae2002..ce56ae2002 100644
--- a/target/linux/ramips/patches-3.18/999-non-pci-mt7620.patch
+++ b/target/linux/ramips/patches-3.18/0068-non-pci-mt7620.patch
diff --git a/target/linux/ramips/patches-3.18/999-no-pm_poweroff.patch b/target/linux/ramips/patches-3.18/0069-no-pm_poweroff.patch
index fedfe37154..fedfe37154 100644
--- a/target/linux/ramips/patches-3.18/999-no-pm_poweroff.patch
+++ b/target/linux/ramips/patches-3.18/0069-no-pm_poweroff.patch
diff --git a/target/linux/ramips/patches-3.18/999-pci-reset.patch b/target/linux/ramips/patches-3.18/0070-pci-reset.patch
index 6055731822..6055731822 100644
--- a/target/linux/ramips/patches-3.18/999-pci-reset.patch
+++ b/target/linux/ramips/patches-3.18/0070-pci-reset.patch
diff --git a/target/linux/ramips/patches-3.18/100-mt7621-add-cpu-feature-overrides.patch b/target/linux/ramips/patches-3.18/0071-mt7621-add-cpu-feature-overrides.patch
index f6f94f0383..f6f94f0383 100644
--- a/target/linux/ramips/patches-3.18/100-mt7621-add-cpu-feature-overrides.patch
+++ b/target/linux/ramips/patches-3.18/0071-mt7621-add-cpu-feature-overrides.patch
diff --git a/target/linux/ramips/patches-3.18/110-mt7621-add-highmem.patch b/target/linux/ramips/patches-3.18/0072-mt7621-add-highmem.patch
index 0a98151113..0a98151113 100644
--- a/target/linux/ramips/patches-3.18/110-mt7621-add-highmem.patch
+++ b/target/linux/ramips/patches-3.18/0072-mt7621-add-highmem.patch
diff --git a/target/linux/ramips/patches-3.18/0110-fix_bootargs_handling.patch b/target/linux/ramips/patches-3.18/0073-fix_bootargs_handling.patch
index 9f76aa1f5b..9f76aa1f5b 100644
--- a/target/linux/ramips/patches-3.18/0110-fix_bootargs_handling.patch
+++ b/target/linux/ramips/patches-3.18/0073-fix_bootargs_handling.patch
diff --git a/target/linux/ramips/patches-3.18/0111-i2c-MIPS-add-mt7621-I2C-driver.patch b/target/linux/ramips/patches-3.18/0074-i2c-MIPS-add-mt7621-I2C-driver.patch
index b34581ed63..b34581ed63 100644
--- a/target/linux/ramips/patches-3.18/0111-i2c-MIPS-add-mt7621-I2C-driver.patch
+++ b/target/linux/ramips/patches-3.18/0074-i2c-MIPS-add-mt7621-I2C-driver.patch