3.12: update to latest mainline, fix merge conflicts

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
beagleboard · Oct 18, 2013 · 866c3f3 · 866c3f3
1 parent 54b23d8
commit 866c3f3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 25 deletions.
diff --git a/configs/beaglebone b/configs/beaglebone
@@ -1329,7 +1329,6 @@ CONFIG_OF_IRQ=y
 CONFIG_OF_NET=y
 CONFIG_OF_MDIO=y
 CONFIG_OF_MTD=y
-CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
 # CONFIG_PARPORT is not set

diff --git a/patch.sh b/patch.sh
@@ -22,7 +22,7 @@ EXTRATAG=""
 
 EXTERNAL_TREE="git://github.com/torvalds/linux.git"
 EXTERNAL_BRANCH="master"
-EXTERNAL_SHA="61e6cfa80de5760bbe406f4e815b7739205754d2"
+EXTERNAL_SHA="04919afb85c8f007b7326c4da5eb61c52e91b9c7"
 
 PATCHSET="omap-next-dt dma-devel general-fixes dtc-fixes dtc-overlays of-fixes pdev-fixes mmc-fixes dts-fixes i2c-fixes pinctrl-fixes capemgr reset capes lcdc-fixes net deassert-hard-reset"
 

diff --git a/patches/of-fixes/0007-OF-Introduce-Device-Tree-resolve-support.patch b/patches/of-fixes/0007-OF-Introduce-Device-Tree-resolve-support.patch
@@ -1,4 +1,4 @@
-From 67d9524fc9058819530bd02bdb84bfd75c6cfafe Mon Sep 17 00:00:00 2001
+From f83816a2d6bb73c01eac7219e40e02bba25f344f Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Thu, 3 Jan 2013 12:18:25 +0200
 Subject: [PATCH 7/8] OF: Introduce Device Tree resolve support.
@@ -51,12 +51,12 @@ index 0000000..0b396c4
 +5. For each fixup in the property locate the node:property:offset location
 +   and replace it with the phandle value.
 diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
-index 9d2009a..6f9cdc3 100644
+index 78cc760..2a00ae5 100644
 --- a/drivers/of/Kconfig
 +++ b/drivers/of/Kconfig
-@@ -80,4 +80,13 @@ config OF_RESERVED_MEM
- 	help
- 	  Initialization code for DMA reserved memory
+@@ -74,4 +74,13 @@ config OF_MTD
+ 	depends on MTD
+ 	def_bool y
 
 +config OF_RESOLVE
 +	bool "OF Dynamic resolution support"
@@ -69,13 +69,13 @@ index 9d2009a..6f9cdc3 100644
 +
  endmenu # OF
 diff --git a/drivers/of/Makefile b/drivers/of/Makefile
-index 26de2ed..c241e79 100644
+index 9bc6d8c..93da457 100644
 --- a/drivers/of/Makefile
 +++ b/drivers/of/Makefile
-@@ -10,3 +10,4 @@ obj-$(CONFIG_OF_PCI)	+= of_pci.o
+@@ -9,3 +9,4 @@ obj-$(CONFIG_OF_MDIO)	+= of_mdio.o
+ obj-$(CONFIG_OF_PCI)	+= of_pci.o
  obj-$(CONFIG_OF_PCI_IRQ)  += of_pci_irq.o
  obj-$(CONFIG_OF_MTD)	+= of_mtd.o
- obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
 +obj-$(CONFIG_OF_RESOLVE)  += resolver.o
 diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c
 new file mode 100644
@@ -505,5 +505,5 @@ index 9d69bd2..22d42e5 100644
 +
  #endif /* _LINUX_OF_H */
 -- 
-1.8.2.1
+1.8.4.rc3
 
diff --git a/patches/of-fixes/0008-OF-Introduce-DT-overlay-support.patch b/patches/of-fixes/0008-OF-Introduce-DT-overlay-support.patch
@@ -1,4 +1,4 @@
-From fc842c6958ec8e0c60032593be8d5ad3ed2b9266 Mon Sep 17 00:00:00 2001
+From 58070f11cf5174d31e8884f2e2771a42890886ad Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Thu, 3 Jan 2013 12:23:07 +0200
 Subject: [PATCH 8/8] OF: Introduce DT overlay support.
@@ -19,15 +19,15 @@ Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
  Documentation/devicetree/overlay-notes.txt | 179 ++++++
  drivers/of/Kconfig                         |  10 +
  drivers/of/Makefile                        |   1 +
- drivers/of/overlay.c                       | 870 +++++++++++++++++++++++++++++
+ drivers/of/overlay.c                       | 869 +++++++++++++++++++++++++++++
  include/linux/of.h                         | 113 ++++
- 5 files changed, 1173 insertions(+)
+ 5 files changed, 1172 insertions(+)
  create mode 100644 Documentation/devicetree/overlay-notes.txt
  create mode 100644 drivers/of/overlay.c
 
 diff --git a/Documentation/devicetree/overlay-notes.txt b/Documentation/devicetree/overlay-notes.txt
 new file mode 100644
-index 0000000..5289cbb
+index 0000000..6b43a28
 --- /dev/null
 +++ b/Documentation/devicetree/overlay-notes.txt
 @@ -0,0 +1,179 @@
@@ -209,12 +209,12 @@ index 0000000..5289cbb
 +It should be noted that the DT overlay format described is the one expected
 +by the of_build_overlay_info() function, which is a helper function. There
 +is nothing stopping someone coming up with his own DTS format and that will
-+end up filling in the fields of the of_overlay_info array. 
++end up filling in the fields of the of_overlay_info array.
 diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
-index 6f9cdc3..96216ec 100644
+index 2a00ae5..c2d5596 100644
 --- a/drivers/of/Kconfig
 +++ b/drivers/of/Kconfig
-@@ -89,4 +89,14 @@ config OF_RESOLVE
+@@ -83,4 +83,14 @@ config OF_RESOLVE
  	  Enable OF dynamic resolution support. This allows you to
  	  load Device Tree object fragments are run time.
 
@@ -230,20 +230,20 @@ index 6f9cdc3..96216ec 100644
 +
  endmenu # OF
 diff --git a/drivers/of/Makefile b/drivers/of/Makefile
-index c241e79..d2a6e0d 100644
+index 93da457..ca466e4 100644
 --- a/drivers/of/Makefile
 +++ b/drivers/of/Makefile
-@@ -11,3 +11,4 @@ obj-$(CONFIG_OF_PCI_IRQ)  += of_pci_irq.o
+@@ -10,3 +10,4 @@ obj-$(CONFIG_OF_PCI)	+= of_pci.o
+ obj-$(CONFIG_OF_PCI_IRQ)  += of_pci_irq.o
  obj-$(CONFIG_OF_MTD)	+= of_mtd.o
- obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
  obj-$(CONFIG_OF_RESOLVE)  += resolver.o
 +obj-$(CONFIG_OF_OVERLAY) += overlay.o
 diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
 new file mode 100644
-index 0000000..5d0c531
+index 0000000..61bcfcc
 --- /dev/null
 +++ b/drivers/of/overlay.c
-@@ -0,0 +1,870 @@
+@@ -0,0 +1,869 @@
 +/*
 + * Functions for working with device tree overlays
 + *
@@ -1113,7 +1113,6 @@ index 0000000..5d0c531
 +
 +	return 0;
 +}
-+
 diff --git a/include/linux/of.h b/include/linux/of.h
 index 22d42e5..d9c8130 100644
 --- a/include/linux/of.h
@@ -1244,5 +1243,5 @@ index 22d42e5..d9c8130 100644
 +
  #endif /* _LINUX_OF_H */
 -- 
-1.8.2.1
+1.8.4.rc3