Commit 8ebe624a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'reset/for-4.8-2' into next/dt64 

This is required to avoid a 'make dtbs' failure:

arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi:47:56: fatal error: dt-bindings/reset/amlogic,meson-gxbb-reset.h: No such file or directory

The dependency was not handled right earlier, I'm fixing up the branch here
to minimize the bisection problem.

* reset/for-4.8-2:
  dt-bindings: reset: Add bindings for the Meson SoC Reset Controller
  reset: Add support for the Amlogic Meson SoC Reset Controller
  reset: Return -ENOTSUPP when not configured
  reset: oxnas: Use devm register API and get rid of platform remove
  reset: fix Kconfig menu to include reset drivers in sub-menu
  reset: zynq: use devm_reset_controller_register()
  reset: socfpga: use devm_reset_controller_register()
  reset: sunxi: use devm_reset_controller_register()
  reset: pistachio: use devm_reset_controller_register()
  reset: ath79: use devm_reset_controller_register()
  reset: add devm_reset_controller_register API
parents ad22ac34 79795e20

Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt

0 → 100644
+18 −0
Original line number Original line Diff line number Diff line 
Amlogic Meson SoC Reset Controller

=======================================



Please also refer to reset.txt in this directory for common reset

controller binding usage.



Required properties:

- compatible: Should be "amlogic,meson8b-reset" or "amlogic,meson-gxbb-reset"

- reg: should contain the register address base

- #reset-cells: 1, see below



example:



reset: reset-controller {

	compatible = "amlogic,meson-gxbb-reset";

	reg = <0x0 0x04404 0x0 0x20>;

	#reset-cells = <1>;

};

Documentation/driver-model/devres.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -352,6 +352,10 @@ REGULATOR 
  devm_regulator_put()

  devm_regulator_put()

  devm_regulator_register()

  devm_regulator_register()





RESET

  devm_reset_control_get()

  devm_reset_controller_register()



SLAVE DMA ENGINE

SLAVE DMA ENGINE

  devm_acpi_dma_controller_register()

  devm_acpi_dma_controller_register()

drivers/reset/Kconfig

+4 −0
Original line number Original line Diff line number Diff line
@@ -12,8 +12,12 @@ menuconfig RESET_CONTROLLER 




	  If unsure, say no.

	  If unsure, say no.





if RESET_CONTROLLER



config RESET_OXNAS

config RESET_OXNAS

	bool

	bool





source "drivers/reset/sti/Kconfig"

source "drivers/reset/sti/Kconfig"

source "drivers/reset/hisilicon/Kconfig"

source "drivers/reset/hisilicon/Kconfig"



endif

drivers/reset/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -3,6 +3,7 @@ obj-$(CONFIG_ARCH_LPC18XX) += reset-lpc18xx.o 
obj-$(CONFIG_ARCH_SOCFPGA) += reset-socfpga.o

obj-$(CONFIG_ARCH_SOCFPGA) += reset-socfpga.o

obj-$(CONFIG_ARCH_BERLIN) += reset-berlin.o

obj-$(CONFIG_ARCH_BERLIN) += reset-berlin.o

obj-$(CONFIG_MACH_PISTACHIO) += reset-pistachio.o

obj-$(CONFIG_MACH_PISTACHIO) += reset-pistachio.o

obj-$(CONFIG_ARCH_MESON) += reset-meson.o

obj-$(CONFIG_ARCH_SUNXI) += reset-sunxi.o

obj-$(CONFIG_ARCH_SUNXI) += reset-sunxi.o

obj-$(CONFIG_ARCH_STI) += sti/

obj-$(CONFIG_ARCH_STI) += sti/

obj-$(CONFIG_ARCH_HISI) += hisilicon/

obj-$(CONFIG_ARCH_HISI) += hisilicon/

drivers/reset/core.c

+37 −0
Original line number Original line Diff line number Diff line
@@ -93,6 +93,43 @@ void reset_controller_unregister(struct reset_controller_dev *rcdev) 
}

}

EXPORT_SYMBOL_GPL(reset_controller_unregister);

EXPORT_SYMBOL_GPL(reset_controller_unregister);





static void devm_reset_controller_release(struct device *dev, void *res)

{

	reset_controller_unregister(*(struct reset_controller_dev **)res);

}



/**

 * devm_reset_controller_register - resource managed reset_controller_register()

 * @dev: device that is registering this reset controller

 * @rcdev: a pointer to the initialized reset controller device

 *

 * Managed reset_controller_register(). For reset controllers registered by

 * this function, reset_controller_unregister() is automatically called on

 * driver detach. See reset_controller_register() for more information.

 */

int devm_reset_controller_register(struct device *dev,

				   struct reset_controller_dev *rcdev)

{

	struct reset_controller_dev **rcdevp;

	int ret;



	rcdevp = devres_alloc(devm_reset_controller_release, sizeof(*rcdevp),

			      GFP_KERNEL);

	if (!rcdevp)

		return -ENOMEM;



	ret = reset_controller_register(rcdev);

	if (!ret) {

		*rcdevp = rcdev;

		devres_add(dev, rcdevp);

	} else {

		devres_free(rcdevp);

	}



	return ret;

}

EXPORT_SYMBOL_GPL(devm_reset_controller_register);



/**

/**

 * reset_control_reset - reset the controlled device

 * reset_control_reset - reset the controlled device

 * @rstc: reset controller

 * @rstc: reset controller

CRA Git | Maintained and supported by SUSTech CRA and CCSE