core/linux-mmp to 3.18.69-2

core/linux-mmp/0001-clk-mmp-Adding-clocks-of-pxa168-peripherals-for-gplu.patch

@@ -1,7 +1,7 @@
-From 9317631a8cbe150cbbe175bf3b1f5fc5d8e1e02f Mon Sep 17 00:00:00 2001
+From bea2c36629ed9c4c2ca35977331dc3479396aee7 Mon Sep 17 00:00:00 2001
 From: Ashokkumar G <0xfee1dead.sa@gmail.com>
 Date: Mon, 26 Jan 2015 11:03:08 -0700
-Subject: [PATCH 1/8] clk:mmp: Adding clocks of pxa168 peripherals for gplugd
+Subject: [PATCH 1/9] clk:mmp: Adding clocks of pxa168 peripherals for gplugd
 
 1. Adding peripherals register address information
 2. Changing clock names for sd driver reference sdhci-pxav2
@@ -335,5 +335,5 @@ index 014396b028a2..39a80fb2aefa 100644
 +	clk_register_clkdev(clk, NULL, "pxa168-eth");
  }
 -- 
-2.11.1
+2.14.1
 

core/linux-mmp/0002-arch-arm-mmp-initialize-gpio-driver-before-other-dri.patch

@@ -1,7 +1,7 @@
-From 26da78dc5a7b8b35ff6abbdca10f77b08c972a1c Mon Sep 17 00:00:00 2001
+From 7797bb206e2f41653422cd93f0773090e8b7b830 Mon Sep 17 00:00:00 2001
 From: Ashokkumar G <0xfee1dead.sa@gmail.com>
 Date: Mon, 27 Jan 2014 09:26:20 -0700
-Subject: [PATCH 2/8] arch:arm:mmp: initialize gpio driver before other drivers
+Subject: [PATCH 2/9] arch:arm:mmp: initialize gpio driver before other drivers
 
 Add gpio driver for pxa168 based gplugd before adding other
 peripheral drivers to boot properly.
@@ -49,5 +49,5 @@ index d81b2475e67e..83a7019b14f9 100644
  	pxa168_add_eth(&gplugd_eth_platform_data);
  }
 -- 
-2.11.1
+2.14.1
 

core/linux-mmp/0003-arch-arm-mmp-Adding-spi-master-and-mtd-dataflash-for.patch

@@ -1,7 +1,7 @@
-From ec43224b350802d1e5aa2e6254534ee4605fb6dc Mon Sep 17 00:00:00 2001
+From 9d30bb9e947f0a97fe9d96090d2bc001faf99e75 Mon Sep 17 00:00:00 2001
 From: Ashokkumar G <0xfee1dead.sa@gmail.com>
 Date: Mon, 27 Jan 2014 09:47:06 -0700
-Subject: [PATCH 3/8] arch:arm:mmp: Adding spi master and mtd dataflash for
+Subject: [PATCH 3/9] arch:arm:mmp: Adding spi master and mtd dataflash for
  gplugd
 
 1. Adding SPI master for gplugd
@@ -89,5 +89,5 @@ index 83a7019b14f9..9c441e1b3159 100644
  
  MACHINE_START(GPLUGD, "PXA168-based GuruPlug Display (gplugD) Platform")
 -- 
-2.11.1
+2.14.1
 

core/linux-mmp/0004-drivers-spi-Adding-mmp-dependency-for-SPI_PXA2XX.patch

@@ -1,7 +1,7 @@
-From 51513e290a1df59f6fc59086dfab5b34c5a54c3c Mon Sep 17 00:00:00 2001
+From 3808257bfc402bc170581f2151959846d80996be Mon Sep 17 00:00:00 2001
 From: Ashokkumar G <0xfee1dead.sa@gmail.com>
 Date: Mon, 26 Jan 2015 11:08:19 -0700
-Subject: [PATCH 4/8] drivers:spi: Adding mmp dependency for SPI_PXA2XX
+Subject: [PATCH 4/9] drivers:spi: Adding mmp dependency for SPI_PXA2XX
 
 adding arch_mmp dependency for SPI_PXA2XX as pxa168 based gplugd
 uses SPI_PXA2XX
@@ -30,5 +30,5 @@ index 84e7c9e6ccef..caa969f64ff4 100644
  	  This enables using a PXA2xx or Sodaville SSP port as a SPI master
  	  controller. The driver can be configured to use any SSP port and
 -- 
-2.11.1
+2.14.1
 

core/linux-mmp/0005-mmp-ethernet-Adding-ethernet-MAC-address-reading-for.patch

@@ -1,7 +1,7 @@
-From 337a000bdf03d6c9bc093ca29c47c86777367b03 Mon Sep 17 00:00:00 2001
+From d4c023f35d95eb676b0dce610e35b0c2cce274ca Mon Sep 17 00:00:00 2001
 From: Ashokkumar G <0xfee1dead.sa@gmail.com>
 Date: Mon, 26 Jan 2015 11:28:52 -0700
-Subject: [PATCH 5/8] mmp:ethernet: Adding ethernet MAC address reading for
+Subject: [PATCH 5/9] mmp:ethernet: Adding ethernet MAC address reading for
  gplugd
 
 Currently Marvell's pxa168 ethernet driver uses random MAC address
@@ -219,5 +219,5 @@ index 18d75e795606..ca941555d9b8 100644
  
  #endif /* __LINUX_PXA168_ETH_H */
 -- 
-2.11.1
+2.14.1
 

core/linux-mmp/0006-mmp-mmc-adding-sdhc-support-for-pxa168-based-gplugd.patch

@@ -1,7 +1,7 @@
-From c579ae912ed07193048f88c4fb77df5bf9f96e9e Mon Sep 17 00:00:00 2001
+From 3175fb4aa7624e068ebca34ca4a7bb2f659a0b34 Mon Sep 17 00:00:00 2001
 From: Ashokkumar G <0xfee1dead.sa@gmail.com>
 Date: Mon, 26 Jan 2015 11:40:41 -0700
-Subject: [PATCH 6/8] mmp:mmc: adding sdhc support for pxa168 based gplugd
+Subject: [PATCH 6/9] mmp:mmc: adding sdhc support for pxa168 based gplugd
 
 Fixing can't talk to controller for sdhci PXAV2
 
@@ -177,5 +177,5 @@ index b4c23e983baf..f0f36c9a803a 100644
  		dev_err(dev, "failed to get io clock\n");
  		ret = PTR_ERR(clk);
 -- 
-2.11.1
+2.14.1
 

core/linux-mmp/0007-arch-arm-mmp-Adding-USB-Host-and-OTG-peripheral-for-.patch

@@ -1,7 +1,7 @@
-From a6f38febc45ec93258617efd526d82b6a11996a2 Mon Sep 17 00:00:00 2001
+From 4e64f8fe95dd310cd234ed4d191f312e704ab19d Mon Sep 17 00:00:00 2001
 From: Ashokkumar G <0xfee1dead.sa@gmail.com>
 Date: Mon, 26 Jan 2015 11:51:13 -0700
-Subject: [PATCH 7/8] arch:arm:mmp: Adding USB Host and OTG peripheral for
+Subject: [PATCH 7/9] arch:arm:mmp: Adding USB Host and OTG peripheral for
  pxa168
 
 Adding USB host, USB OTG peripherals memory, register information
@@ -160,5 +160,5 @@ index def8f462943d..feed849620c1 100644
  extern int __init pxa168_add_usb_host(struct mv_usb_platform_data *pdata);
  
 -- 
-2.11.1
+2.14.1
 

core/linux-mmp/0008-arch-arm-mmp-gplugd-Fix-gPlugD-reboot-issue.patch

@@ -1,7 +1,7 @@
-From a61956a6d7e63a2870151dd434b1236a189ad31a Mon Sep 17 00:00:00 2001
+From 05b2373ebb352f497015281f3251481fba1d0a41 Mon Sep 17 00:00:00 2001
 From: Ashokkumar G <0xfee1dead.sa@gmail.com>
 Date: Mon, 26 Jan 2015 12:08:26 -0700
-Subject: [PATCH 8/8] arch:arm:mmp:gplugd: Fix gPlugD reboot issue
+Subject: [PATCH 8/9] arch:arm:mmp:gplugd: Fix gPlugD reboot issue
 
 Board hangs in u-boot after issuing reboot related
 commands from Linux console due to not resetting
@@ -143,5 +143,5 @@ index 000000000000..91ecb7899ff0
 +
 +#endif /* __ASM_MACH_REGS_APMU_H */
 -- 
-2.11.1
+2.14.1
 

core/linux-mmp/0009-Revert-net-phy-Do-not-perform-software-reset-for-Gen.patch

@@ -0,0 +1,43 @@
+From 6f2f971a88aa929add4db7c0060d97d5b68c7dd1 Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Sun, 3 Sep 2017 13:42:51 -0600
+Subject: [PATCH 9/9] Revert "net: phy: Do not perform software reset for
+ Generic PHY"
+
+This reverts commit aa3a735de9c9999da16b189424ca000a5bae5244.
+---
+ drivers/net/phy/phy_device.c | 2 +-
+ include/linux/phy.h          | 4 ----
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
+index a1c0d6986148..9a648fdfbf19 100644
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -1343,7 +1343,7 @@ static struct phy_driver genphy_driver[] = {
+ 	.phy_id		= 0xffffffff,
+ 	.phy_id_mask	= 0xffffffff,
+ 	.name		= "Generic PHY",
+-	.soft_reset	= genphy_no_soft_reset,
++	.soft_reset	= genphy_soft_reset,
+ 	.config_init	= genphy_config_init,
+ 	.features	= PHY_GBIT_FEATURES | SUPPORTED_MII |
+ 			  SUPPORTED_AUI | SUPPORTED_FIBRE |
+diff --git a/include/linux/phy.h b/include/linux/phy.h
+index fbdacd1278e3..d090cfcaa167 100644
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -737,10 +737,6 @@ int genphy_read_status(struct phy_device *phydev);
+ int genphy_suspend(struct phy_device *phydev);
+ int genphy_resume(struct phy_device *phydev);
+ int genphy_soft_reset(struct phy_device *phydev);
+-static inline int genphy_no_soft_reset(struct phy_device *phydev)
+-{
+-	return 0;
+-}
+ void phy_driver_unregister(struct phy_driver *drv);
+ void phy_drivers_unregister(struct phy_driver *drv, int n);
+ int phy_driver_register(struct phy_driver *new_driver);
+-- 
+2.14.1
+

core/linux-mmp/PKGBUILD

@@ -8,7 +8,7 @@ _srcname=linux-3.18
 _kernelname=${pkgbase#linux}
 _desc="Marvell PXA168/MMP platforms"
 pkgver=3.18.69
-pkgrel=1
+pkgrel=2
 arch=('arm')
 url="https://github.com/Marvell-Semi/PXA168_kernel/tree/gplugd-dev"
 license=('GPL2')
@@ -24,17 +24,19 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
         '0006-mmp-mmc-adding-sdhc-support-for-pxa168-based-gplugd.patch'
         '0007-arch-arm-mmp-Adding-USB-Host-and-OTG-peripheral-for-.patch'
         '0008-arch-arm-mmp-gplugd-Fix-gPlugD-reboot-issue.patch'
+        '0009-Revert-net-phy-Do-not-perform-software-reset-for-Gen.patch'
         'config')
 md5sums=('9e854df51ca3fef8bfe566dbd7b89241'
          '164ffd417595572ab5cce2624ef1f6f0'
-         'a862b5c347732e805e783f9c91c42a1b'
+         'bfd81313763714222a0ba84d51ad12bc'
-         '9f8a35ab6d94fde54316f6b6d5c7c0d5'
+         'f2b57a976904e07acc637a963691b588'
-         '19cdd5b19a776324bf090ca5f9751191'
+         'a1746d9678717d18eb57ea318f68be6d'
-         '58a3e2d8b80af4a4756a4eb21a84dd29'
+         'a21ed5340db1142508637bd6f4740b1d'
-         'c9613a74ce8b96dbe4a58e977bf0ef36'
+         'c306eb2920e2665bc80b48c1bdf5d826'
-         '9563d0258c1ccfe1efb8857b25cb59c3'
+         '8a36b07eb503c946fe3ad4b5cf0d5e07'
-         'a6ecde1aedf42fc4ffb79f72c920bcec'
+         '132bd1fc48bf35847ff6998050673733'
-         '58c4cf02f9cbfcb423dedf424f8aa12f'
+         '9b04a627cf70d3d69eb02c2544170b06'
+         '7bb7483b63e8f348cb8981f0b04cf3cc'
          'e5c99e5793a51c97bbebd4340b36ed8a')
 
 prepare() {
@@ -52,6 +54,7 @@ prepare() {
   git apply ../0006-mmp-mmc-adding-sdhc-support-for-pxa168-based-gplugd.patch
   git apply ../0007-arch-arm-mmp-Adding-USB-Host-and-OTG-peripheral-for-.patch
   git apply ../0008-arch-arm-mmp-gplugd-Fix-gPlugD-reboot-issue.patch
+  git apply ../0009-Revert-net-phy-Do-not-perform-software-reset-for-Gen.patch
 
   cat "${srcdir}/config" > ./.config