Message ID | 20181205093555.5386-2-sashal@kernel.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | None | expand |
On Wed, Dec 05, 2018 at 04:33:54AM -0500, Sasha Levin wrote: > From: Keiji Hayashibara <hayashibara.keiji@socionext.com> > > [ Upstream commit 3511ba7d4ca6f39e2d060bb94e42a41ad1fee7bf ] > > This commit fixes incorrect property because it was different > from the actual. > The parameters of '#address-cells' and '#size-cells' were removed, > and 'interrupts', 'pinctrl-names' and 'pinctrl-0' were added. Not sure we should be backporting documentation changes like this to stable, especially not without accompanying code changes...
On Wed, Dec 05, 2018 at 11:38:20AM +0000, Mark Brown wrote: >On Wed, Dec 05, 2018 at 04:33:54AM -0500, Sasha Levin wrote: >> From: Keiji Hayashibara <hayashibara.keiji@socionext.com> >> >> [ Upstream commit 3511ba7d4ca6f39e2d060bb94e42a41ad1fee7bf ] >> >> This commit fixes incorrect property because it was different >> from the actual. >> The parameters of '#address-cells' and '#size-cells' were removed, >> and 'interrupts', 'pinctrl-names' and 'pinctrl-0' were added. > >Not sure we should be backporting documentation changes like this to >stable, especially not without accompanying code changes... Dropped, thank you. -- Thanks, Sasha
diff --git a/Documentation/devicetree/bindings/spi/spi-uniphier.txt b/Documentation/devicetree/bindings/spi/spi-uniphier.txt index 504a4ecfc7b1..b04e66a52de5 100644 --- a/Documentation/devicetree/bindings/spi/spi-uniphier.txt +++ b/Documentation/devicetree/bindings/spi/spi-uniphier.txt @@ -5,18 +5,20 @@ UniPhier SoCs have SCSSI which supports SPI single channel. Required properties: - compatible: should be "socionext,uniphier-scssi" - reg: address and length of the spi master registers - - #address-cells: must be <1>, see spi-bus.txt - - #size-cells: must be <0>, see spi-bus.txt - - clocks: A phandle to the clock for the device. - - resets: A phandle to the reset control for the device. + - interrupts: a single interrupt specifier + - pinctrl-names: should be "default" + - pinctrl-0: pin control state for the default mode + - clocks: a phandle to the clock for the device + - resets: a phandle to the reset control for the device Example: spi0: spi@54006000 { compatible = "socionext,uniphier-scssi"; reg = <0x54006000 0x100>; - #address-cells = <1>; - #size-cells = <0>; + interrupts = <0 39 4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi0>; clocks = <&peri_clk 11>; resets = <&peri_rst 11>; };