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

Commit 0e2ce9d3 authored by Brian Norris's avatar Brian Norris
Browse files

Merge tag 'nand/fixes-for-4.9-rc3' of github.com:linux-nand/linux 



From Boris:
"""
Three simple fixes:

- the first one is fixing a non-critical bug in the gpmi driver
- the second one is fixing a bug in the 'automatic NAND timings
  selection' feature introduced in 4.9-rc1
- the last one is fixing a false positive uninitialized-var warning
"""

Acked-by: default avatarMarek Vasut <marex@denx.de>
parents 30656167 8ff0513b

Documentation/ABI/testing/sysfs-class-cxl

+5 −2
Original line number Diff line number Diff line
@@ -220,8 +220,11 @@ What: /sys/class/cxl/<card>/reset 
Date:           October 2014

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    write only

                Writing 1 will issue a PERST to card which may cause the card

                to reload the FPGA depending on load_image_on_perst.

                Writing 1 will issue a PERST to card provided there are no

                contexts active on any one of the card AFUs. This may cause

                the card to reload the FPGA depending on load_image_on_perst.

                Writing -1 will do a force PERST irrespective of any active

                contexts on the card AFUs.

Users:		https://github.com/ibm-capi/libcxl



What:		/sys/class/cxl/<card>/perst_reloads_same_image (not in a guest)

Documentation/devicetree/bindings/ipmi/aspeed,ast2400-bt-bmc.txt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
* Aspeed BT (Block Transfer) IPMI interface



The Aspeed SOCs (AST2400 and AST2500) are commonly used as BMCs

(BaseBoard Management Controllers) and the BT interface can be used to

perform in-band IPMI communication with their host.



Required properties:



- compatible : should be "aspeed,ast2400-bt-bmc"

- reg: physical address and size of the registers



Optional properties:



- interrupts: interrupt generated by the BT interface. without an

  interrupt, the driver will operate in poll mode.



Example:



	ibt@1e789140 {

		compatible = "aspeed,ast2400-bt-bmc";

		reg = <0x1e789140 0x18>;

		interrupts = <8>;

	};

Documentation/devicetree/bindings/pinctrl/pinctrl-aspeed.txt

+3 −1
Original line number Diff line number Diff line
@@ -43,7 +43,9 @@ aspeed,ast2500-pinctrl, aspeed,g5-pinctrl: 


GPID0 GPID2 GPIE0 I2C10 I2C11 I2C12 I2C13 I2C14 I2C3 I2C4 I2C5 I2C6 I2C7 I2C8

I2C9 MAC1LINK MDIO1 MDIO2 OSCCLK PEWAKE PWM0 PWM1 PWM2 PWM3 PWM4 PWM5 PWM6 PWM7

RGMII1 RGMII2 RMII1 RMII2 SD1 SPI1 TIMER4 TIMER5 TIMER6 TIMER7 TIMER8

RGMII1 RGMII2 RMII1 RMII2 SD1 SPI1 SPI1DEBUG SPI1PASSTHRU TIMER4 TIMER5 TIMER6

TIMER7 TIMER8 VGABIOSROM





Examples:

Documentation/devicetree/bindings/timer/jcore,pit.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
J-Core Programmable Interval Timer and Clocksource



Required properties:



- compatible: Must be "jcore,pit".



- reg: Memory region(s) for timer/clocksource registers. For SMP,

  there should be one region per cpu, indexed by the sequential,

  zero-based hardware cpu number.



- interrupts: An interrupt to assign for the timer. The actual pit

  core is integrated with the aic and allows the timer interrupt

  assignment to be programmed by software, but this property is

  required in order to reserve an interrupt number that doesn't

  conflict with other devices.





Example:



timer@200 {

	compatible = "jcore,pit";

	reg = < 0x200 0x30 0x500 0x30 >;

	interrupts = < 0x48 >;

};