Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 868b60e0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'component-for-driver' of... 

Merge branch 'component-for-driver' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into driver-core-next

Russell writes:

These updates fix one bug in the component helper where the matched
components are not properly cleaned up when the master fails to bind.
I'll provide a version of this for stable trees if it's deemed that
we need to backport it.

The second patch causes the component helper to ignore duplicate
matches when adding components - this is something that was originally
needed for imx-drm, but since that has now been updated, we no longer
need to skip over a component which has already been matched.

The final patch starts the process of updating the component helper
API to achieve two goals: to allow the API to be more efficient when
deferred probing occurs, and to allow for future improvements to the
component helper without having a major impact on the users.

This represents groundwork for some other changes; once this has been
merged, I will then send two further pull requests (one for the staging
tree, and one for the DRM tree) to update the drivers to the new API.
This will result in these three commits being shared with those trees.
parents c9d53c0f 6955b582

CREDITS

+4 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,10 @@ 
			Linus

			Linus

----------

----------





M: Matt Mackal

E: mpm@selenic.com

D: SLOB slab allocator



N: Matti Aarnio

N: Matti Aarnio

E: mea@nic.funet.fi

E: mea@nic.funet.fi

D: Alpha systems hacking, IPv6 and other network related stuff

D: Alpha systems hacking, IPv6 and other network related stuff

Documentation/DocBook/media/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -202,8 +202,8 @@ $(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64 




$(MEDIA_OBJ_DIR)/v4l2.xml: $(OBJIMGFILES)

$(MEDIA_OBJ_DIR)/v4l2.xml: $(OBJIMGFILES)

	@$($(quiet)gen_xml)

	@$($(quiet)gen_xml)

	@(ln -sf $(MEDIA_SRC_DIR)/v4l/*xml $(MEDIA_OBJ_DIR)/)

	@(ln -sf `cd $(MEDIA_SRC_DIR) && /bin/pwd`/v4l/*xml $(MEDIA_OBJ_DIR)/)

	@(ln -sf $(MEDIA_SRC_DIR)/dvb/*xml $(MEDIA_OBJ_DIR)/)

	@(ln -sf `cd $(MEDIA_SRC_DIR) && /bin/pwd`/dvb/*xml $(MEDIA_OBJ_DIR)/)





$(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/uapi/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml

$(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/uapi/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml

	@$($(quiet)gen_xml)

	@$($(quiet)gen_xml)

Documentation/accounting/getdelays.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -314,6 +314,7 @@ int main(int argc, char *argv[]) 
			break;

			break;

		case 'm':

		case 'm':

			strncpy(cpumask, optarg, sizeof(cpumask));

			strncpy(cpumask, optarg, sizeof(cpumask));

			cpumask[sizeof(cpumask) - 1] = '\0';

			maskset = 1;

			maskset = 1;

			printf("cpumask %s maskset %d\n", cpumask, maskset);

			printf("cpumask %s maskset %d\n", cpumask, maskset);

			break;

			break;

Documentation/devicetree/bindings/arm/armada-38x.txt

+12 −2
Original line number Original line Diff line number Diff line
@@ -6,5 +6,15 @@ following property: 




Required root node property:

Required root node property:





 - compatible: must contain either "marvell,armada380" or

 - compatible: must contain "marvell,armada380"

   "marvell,armada385" depending on the variant of the SoC being used.
 


In addition, boards using the Marvell Armada 385 SoC shall have the

following property before the previous one:



Required root node property:



compatible: must contain "marvell,armada385"



Example:



compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";

Documentation/devicetree/bindings/arm/l2cc.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,9 @@ Optional properties: 
- arm,filter-ranges : <start length> Starting address and length of window to

- arm,filter-ranges : <start length> Starting address and length of window to

  filter. Addresses in the filter window are directed to the M1 port. Other

  filter. Addresses in the filter window are directed to the M1 port. Other

  addresses will go to the M0 port.

  addresses will go to the M0 port.

- arm,io-coherent : indicates that the system is operating in an hardware

  I/O coherent mode. Valid only when the arm,pl310-cache compatible

  string is used.

- interrupts : 1 combined interrupt.

- interrupts : 1 combined interrupt.

- cache-id-part: cache id part number to be used if it is not present

- cache-id-part: cache id part number to be used if it is not present

  on hardware

  on hardware