| Message ID | 20170426152023.41567-2-icenowy@aosc.io (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Apr 26, 2017 at 11:20:14PM +0800, Icenowy Zheng wrote: > Allwinner A64 have a RSB controller like the one on A23/A33 SoCs. > > Add it and its pinmux. > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> > Acked-by: Chen-Yu Tsai <wens@csie.org> > --- > Changes in v2: > - Removed bonus properties in pio node. > - Added Chen-Yu's ACK. > > arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > index c7f669f5884f..05ec9fc5e81f 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > @@ -422,6 +422,25 @@ > #gpio-cells = <3>; > interrupt-controller; > #interrupt-cells = <3>; > + > + r_rsb_pins: rsb@0 { > + pins = "PL0", "PL1"; > + function = "s_rsb"; > + }; > + }; > + > + r_rsb: rsb@1f03400 { > + compatible = "allwinner,sun8i-a23-rsb"; > + reg = <0x01f03400 0x400>; > + interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&r_ccu 6>; Please use the defines here.. > + clock-frequency = <3000000>; > + resets = <&r_ccu 2>; And here. Thanks! Maxime
在 2017-04-27 21:28，Maxime Ripard 写道： > On Wed, Apr 26, 2017 at 11:20:14PM +0800, Icenowy Zheng wrote: >> Allwinner A64 have a RSB controller like the one on A23/A33 SoCs. >> >> Add it and its pinmux. >> >> Signed-off-by: Icenowy Zheng <icenowy@aosc.io> >> Acked-by: Chen-Yu Tsai <wens@csie.org> >> --- >> Changes in v2: >> - Removed bonus properties in pio node. >> - Added Chen-Yu's ACK. >> >> arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 19 >> +++++++++++++++++++ >> 1 file changed, 19 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi >> b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi >> index c7f669f5884f..05ec9fc5e81f 100644 >> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi >> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi >> @@ -422,6 +422,25 @@ >> #gpio-cells = <3>; >> interrupt-controller; >> #interrupt-cells = <3>; >> + >> + r_rsb_pins: rsb@0 { >> + pins = "PL0", "PL1"; >> + function = "s_rsb"; >> + }; >> + }; >> + >> + r_rsb: rsb@1f03400 { >> + compatible = "allwinner,sun8i-a23-rsb"; >> + reg = <0x01f03400 0x400>; >> + interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; >> + clocks = <&r_ccu 6>; > > Please use the defines here.. Linux-4.12 doesn't yet enter rc1, and the defines are still not in Linus's tree. Please note that I have already mentioned that this patch is necessary to be merged into 4.12, otherwise poweroff won't work properly at 4.12 . So I think it shouldn't still use defines. I will fix here after 4.12-rc1 is out, along with other r_ccu usages. > >> + clock-frequency = <3000000>; >> + resets = <&r_ccu 2>; > > And here. > > Thanks! > Maxime
On Fri, Apr 28, 2017 at 02:14:58AM +0800, icenowy@aosc.io wrote: > 在 2017-04-27 21:28，Maxime Ripard 写道： > > On Wed, Apr 26, 2017 at 11:20:14PM +0800, Icenowy Zheng wrote: > > > Allwinner A64 have a RSB controller like the one on A23/A33 SoCs. > > > > > > Add it and its pinmux. > > > > > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> > > > Acked-by: Chen-Yu Tsai <wens@csie.org> > > > --- > > > Changes in v2: > > > - Removed bonus properties in pio node. > > > - Added Chen-Yu's ACK. > > > > > > arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 19 > > > +++++++++++++++++++ > > > 1 file changed, 19 insertions(+) > > > > > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > > > b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > > > index c7f669f5884f..05ec9fc5e81f 100644 > > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > > > @@ -422,6 +422,25 @@ > > > #gpio-cells = <3>; > > > interrupt-controller; > > > #interrupt-cells = <3>; > > > + > > > + r_rsb_pins: rsb@0 { > > > + pins = "PL0", "PL1"; > > > + function = "s_rsb"; > > > + }; > > > + }; > > > + > > > + r_rsb: rsb@1f03400 { > > > + compatible = "allwinner,sun8i-a23-rsb"; > > > + reg = <0x01f03400 0x400>; > > > + interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; > > > + clocks = <&r_ccu 6>; > > > > Please use the defines here.. > > Linux-4.12 doesn't yet enter rc1, and the defines are still not in > Linus's tree. > > Please note that I have already mentioned that this patch is necessary > to be merged into 4.12, otherwise poweroff won't work properly at 4.12 . This is too late for 4.12. We don't merge any patch two weeks before the merge window opens, which makes it around -rc6. This will be 4.13 material, so we'll definitely have the defines by then. Maxime
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index c7f669f5884f..05ec9fc5e81f 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -422,6 +422,25 @@ #gpio-cells = <3>; interrupt-controller; #interrupt-cells = <3>; + + r_rsb_pins: rsb@0 { + pins = "PL0", "PL1"; + function = "s_rsb"; + }; + }; + + r_rsb: rsb@1f03400 { + compatible = "allwinner,sun8i-a23-rsb"; + reg = <0x01f03400 0x400>; + interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&r_ccu 6>; + clock-frequency = <3000000>; + resets = <&r_ccu 2>; + pinctrl-names = "default"; + pinctrl-0 = <&r_rsb_pins>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; }; }; };