Merge "Merge android-4.14.54 (a6d6913) into msm-4.14" (29b44549) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/devicetree/bindings/net/dsa/b53.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ Required properties:
		"brcm,bcm53128"
		"brcm,bcm5365"
		"brcm,bcm5395"
		"brcm,bcm5389"
		"brcm,bcm5397"
		"brcm,bcm5398"

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 14
		SUBLEVEL = 53
		SUBLEVEL = 54
		EXTRAVERSION =
		NAME = Petit Gorille

arch/arm/boot/dts/imx6q.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -96,7 +96,7 @@
		clocks = <&clks IMX6Q_CLK_ECSPI5>,
		<&clks IMX6Q_CLK_ECSPI5>;
		clock-names = "ipg", "per";
		dmas = <&sdma 11 7 1>, <&sdma 12 7 2>;
		dmas = <&sdma 11 8 1>, <&sdma 12 8 2>;
		dma-names = "rx", "tx";
		status = "disabled";
		};

drivers/acpi/osl.c

+72 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,8 @@
		#include <linux/uaccess.h>
		#include <linux/io-64-nonatomic-lo-hi.h>

		#include "acpica/accommon.h"
		#include "acpica/acnamesp.h"
		#include "internal.h"

		#define _COMPONENT ACPI_OS_SERVICES
		@@ -1477,6 +1479,76 @@ int acpi_check_region(resource_size_t start, resource_size_t n,
		}
		EXPORT_SYMBOL(acpi_check_region);

		static acpi_status acpi_deactivate_mem_region(acpi_handle handle, u32 level,
		void _res, void *return_value)
		{
		struct acpi_mem_space_context **mem_ctx;
		union acpi_operand_object *handler_obj;
		union acpi_operand_object *region_obj2;
		union acpi_operand_object *region_obj;
		struct resource *res = _res;
		acpi_status status;

		region_obj = acpi_ns_get_attached_object(handle);
		if (!region_obj)
		return AE_OK;

		handler_obj = region_obj->region.handler;
		if (!handler_obj)
		return AE_OK;

		if (region_obj->region.space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)
		return AE_OK;

		if (!(region_obj->region.flags & AOPOBJ_SETUP_COMPLETE))
		return AE_OK;

		region_obj2 = acpi_ns_get_secondary_object(region_obj);
		if (!region_obj2)
		return AE_OK;

		mem_ctx = (void *)&region_obj2->extra.region_context;

		if (!(mem_ctx[0]->address >= res->start &&
		mem_ctx[0]->address < res->end))
		return AE_OK;

		status = handler_obj->address_space.setup(region_obj,
		ACPI_REGION_DEACTIVATE,
		NULL, (void **)mem_ctx);
		if (ACPI_SUCCESS(status))
		region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE);

		return status;
		}

		/**
		* acpi_release_memory - Release any mappings done to a memory region
		* @handle: Handle to namespace node
		* @res: Memory resource
		* @level: A level that terminates the search
		*
		* Walks through @handle and unmaps all SystemMemory Operation Regions that
		* overlap with @res and that have already been activated (mapped).
		*
		* This is a helper that allows drivers to place special requirements on memory
		* region that may overlap with operation regions, primarily allowing them to
		* safely map the region as non-cached memory.
		*
		* The unmapped Operation Regions will be automatically remapped next time they
		* are called, so the drivers do not need to do anything else.
		*/
		acpi_status acpi_release_memory(acpi_handle handle, struct resource *res,
		u32 level)
		{
		if (!(res->flags & IORESOURCE_MEM))
		return AE_TYPE;

		return acpi_walk_namespace(ACPI_TYPE_REGION, handle, level,
		acpi_deactivate_mem_region, NULL, res, NULL);
		}
		EXPORT_SYMBOL_GPL(acpi_release_memory);

		/*
		* Let drivers know whether the resource checks are effective
		*/

drivers/atm/zatm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1151,8 +1151,8 @@ static void eprom_get_byte(struct zatm_dev zatm_dev, unsigned char byte,
		}


		static unsigned char eprom_try_esi(struct atm_dev *dev, unsigned short cmd,
		int offset, int swap)
		static int eprom_try_esi(struct atm_dev *dev, unsigned short cmd, int offset,
		int swap)
		{
		unsigned char buf[ZEPROM_SIZE];
		struct zatm_dev *zatm_dev;