From aa4c6e27b42b4c4be07462c7e951a694fe38f500 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 17 Aug 2015 06:18:30 +0000 Subject: [PATCH] ramips: reorder patches Signed-off-by: John Crispin SVN-Revision: 46659 --- .../patches-3.18/0037-USB-phy-add-ralink-SoC-driver.patch | 8 +++----- ...ralink-fix-clearing-the-illegal-access-interrup.patch} | 0 .../patches-3.18/{999-cevt.patch => 0066-cevt.patch} | 0 ...999-disable_illacc.patch => 0067-disable_illacc.patch} | 0 ...999-non-pci-mt7620.patch => 0068-non-pci-mt7620.patch} | 0 ...999-no-pm_poweroff.patch => 0069-no-pm_poweroff.patch} | 0 .../{999-pci-reset.patch => 0070-pci-reset.patch} | 0 ....patch => 0071-mt7621-add-cpu-feature-overrides.patch} | 0 ...21-add-highmem.patch => 0072-mt7621-add-highmem.patch} | 0 ...gs_handling.patch => 0073-fix_bootargs_handling.patch} | 0 ...er.patch => 0074-i2c-MIPS-add-mt7621-I2C-driver.patch} | 0 11 files changed, 3 insertions(+), 5 deletions(-) rename target/linux/ramips/patches-3.18/{064-MIPS-ralink-fix-clearing-the-illegal-access-interrup.patch => 0064-MIPS-ralink-fix-clearing-the-illegal-access-interrup.patch} (100%) rename target/linux/ramips/patches-3.18/{999-cevt.patch => 0066-cevt.patch} (100%) rename target/linux/ramips/patches-3.18/{999-disable_illacc.patch => 0067-disable_illacc.patch} (100%) rename target/linux/ramips/patches-3.18/{999-non-pci-mt7620.patch => 0068-non-pci-mt7620.patch} (100%) rename target/linux/ramips/patches-3.18/{999-no-pm_poweroff.patch => 0069-no-pm_poweroff.patch} (100%) rename target/linux/ramips/patches-3.18/{999-pci-reset.patch => 0070-pci-reset.patch} (100%) rename target/linux/ramips/patches-3.18/{100-mt7621-add-cpu-feature-overrides.patch => 0071-mt7621-add-cpu-feature-overrides.patch} (100%) rename target/linux/ramips/patches-3.18/{110-mt7621-add-highmem.patch => 0072-mt7621-add-highmem.patch} (100%) rename target/linux/ramips/patches-3.18/{0110-fix_bootargs_handling.patch => 0073-fix_bootargs_handling.patch} (100%) rename target/linux/ramips/patches-3.18/{0111-i2c-MIPS-add-mt7621-I2C-driver.patch => 0074-i2c-MIPS-add-mt7621-I2C-driver.patch} (100%) 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 similarity index 100% rename from target/linux/ramips/patches-3.18/064-MIPS-ralink-fix-clearing-the-illegal-access-interrup.patch rename to 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 similarity index 100% rename from target/linux/ramips/patches-3.18/999-cevt.patch rename to 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 similarity index 100% rename from target/linux/ramips/patches-3.18/999-disable_illacc.patch rename to 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 similarity index 100% rename from target/linux/ramips/patches-3.18/999-non-pci-mt7620.patch rename to 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 similarity index 100% rename from target/linux/ramips/patches-3.18/999-no-pm_poweroff.patch rename to 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 similarity index 100% rename from target/linux/ramips/patches-3.18/999-pci-reset.patch rename to 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 similarity index 100% rename from target/linux/ramips/patches-3.18/100-mt7621-add-cpu-feature-overrides.patch rename to 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 similarity index 100% rename from target/linux/ramips/patches-3.18/110-mt7621-add-highmem.patch rename to 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 similarity index 100% rename from target/linux/ramips/patches-3.18/0110-fix_bootargs_handling.patch rename to 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 similarity index 100% rename from target/linux/ramips/patches-3.18/0111-i2c-MIPS-add-mt7621-I2C-driver.patch rename to target/linux/ramips/patches-3.18/0074-i2c-MIPS-add-mt7621-I2C-driver.patch