| Message ID | 20190318110041.19040-1-maxime.ripard@bootlin.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | fa44328f4eb0b762a1fcb148809068e9646e7156 |
| Headers | show |
| Series | ARM: dts: sun8i: a33: Reintroduce default pinctrl muxing | expand |
On Mon, Mar 18, 2019 at 7:00 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > Commit d02752149759 ("ARM: dts: sun8i-a23-a33: Move NAND controller device > node to sort by address") moved the NAND controller node around, but > dropped the default muxing in the process. > > Reintroduce it. > > Fixes: d02752149759 ("ARM: dts: sun8i-a23-a33: Move NAND controller device node to sort by address") > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> Acked-by: Chen-Yu Tsai <wens@csie.org>
On Fri, Mar 22, 2019 at 04:56:09PM +0800, Chen-Yu Tsai wrote: > On Mon, Mar 18, 2019 at 7:00 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > > > Commit d02752149759 ("ARM: dts: sun8i-a23-a33: Move NAND controller device > > node to sort by address") moved the NAND controller node around, but > > dropped the default muxing in the process. > > > > Reintroduce it. > > > > Fixes: d02752149759 ("ARM: dts: sun8i-a23-a33: Move NAND controller device node to sort by address") > > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> > > Acked-by: Chen-Yu Tsai <wens@csie.org> Applied, thanks! Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi index 2eed7a2d7d7e..eb44d0b63417 100644 --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi @@ -169,6 +169,8 @@ clock-names = "ahb", "mod"; resets = <&ccu RST_BUS_NAND>; reset-names = "ahb"; + pinctrl-names = "default"; + pinctrl-0 = <&nand_pins &nand_pins_cs0 &nand_pins_rb0>; status = "disabled"; #address-cells = <1>; #size-cells = <0>;
Commit d02752149759 ("ARM: dts: sun8i-a23-a33: Move NAND controller device node to sort by address") moved the NAND controller node around, but dropped the default muxing in the process. Reintroduce it. Fixes: d02752149759 ("ARM: dts: sun8i-a23-a33: Move NAND controller device node to sort by address") Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> --- arch/arm/boot/dts/sun8i-a23-a33.dtsi | 2 ++ 1 file changed, 2 insertions(+)