* [PATCH] ARM: dts: suniv: Add MMC and clock macros. @ 2022-01-25 1:13 Jesse Taube 2022-01-26 23:57 ` Andre Przywara 0 siblings, 1 reply; 6+ messages in thread From: Jesse Taube @ 2022-01-25 1:13 UTC (permalink / raw) To: devicetree; +Cc: robh+dt, Mr.Bossman075, andre.przywara, Mesih Kilinc Include clock and reset macros and replace magic numbers. Add MMC node. Signed-off-by: Mesih Kilinc <mesihkilinc@gmail.com> Signed-off-by: Jesse Taube <Mr.Bossman075@gmail.com> --- arch/arm/boot/dts/suniv-f1c100s.dtsi | 41 +++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/suniv-f1c100s.dtsi b/arch/arm/boot/dts/suniv-f1c100s.dtsi index 6100d3b75f61..32872bb29917 100644 --- a/arch/arm/boot/dts/suniv-f1c100s.dtsi +++ b/arch/arm/boot/dts/suniv-f1c100s.dtsi @@ -4,6 +4,9 @@ * Copyright 2018 Mesih Kilinc <mesihkilinc@gmail.com> */ +#include <dt-bindings/clock/suniv-ccu-f1c100s.h> +#include <dt-bindings/reset/suniv-ccu-f1c100s.h> + / { #address-cells = <1>; #size-cells = <1>; @@ -82,7 +85,7 @@ pio: pinctrl@1c20800 { compatible = "allwinner,suniv-f1c100s-pinctrl"; reg = <0x01c20800 0x400>; interrupts = <38>, <39>, <40>; - clocks = <&ccu 37>, <&osc24M>, <&osc32k>; + clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>; clock-names = "apb", "hosc", "losc"; gpio-controller; interrupt-controller; @@ -93,6 +96,11 @@ uart0_pe_pins: uart0-pe-pins { pins = "PE0", "PE1"; function = "uart0"; }; + + mmc0_pins: mmc0-pins { + pins = "PF0", "PF1", "PF2", "PF3", "PF4", "PF5"; + function = "mmc0"; + }; }; timer@1c20c00 { @@ -108,14 +116,33 @@ wdt: watchdog@1c20ca0 { reg = <0x01c20ca0 0x20>; }; + mmc0: mmc@1c0f000 { + compatible = "allwinner,suniv-f1c100s-mmc", + "allwinner,sun7i-a20-mmc"; + reg = <0x01c0f000 0x1000>; + clocks = <&ccu CLK_BUS_MMC0>, + <&ccu CLK_MMC0>, + <&ccu CLK_MMC0_OUTPUT>, + <&ccu CLK_MMC0_SAMPLE>; + clock-names = "ahb", "mmc", "output", "sample"; + resets = <&ccu RST_BUS_MMC0>; + reset-names = "ahb"; + interrupts = <23>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>; + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; + }; + uart0: serial@1c25000 { compatible = "snps,dw-apb-uart"; reg = <0x01c25000 0x400>; interrupts = <1>; reg-shift = <2>; reg-io-width = <4>; - clocks = <&ccu 38>; - resets = <&ccu 24>; + clocks = <&ccu CLK_BUS_UART0>; + resets = <&ccu RST_BUS_UART0>; status = "disabled"; }; @@ -125,8 +152,8 @@ uart1: serial@1c25400 { interrupts = <2>; reg-shift = <2>; reg-io-width = <4>; - clocks = <&ccu 39>; - resets = <&ccu 25>; + clocks = <&ccu CLK_BUS_UART1>; + resets = <&ccu RST_BUS_UART1>; status = "disabled"; }; @@ -136,8 +163,8 @@ uart2: serial@1c25800 { interrupts = <3>; reg-shift = <2>; reg-io-width = <4>; - clocks = <&ccu 40>; - resets = <&ccu 26>; + clocks = <&ccu CLK_BUS_UART2>; + resets = <&ccu RST_BUS_UART2>; status = "disabled"; }; }; -- 2.34.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: suniv: Add MMC and clock macros. 2022-01-25 1:13 [PATCH] ARM: dts: suniv: Add MMC and clock macros Jesse Taube @ 2022-01-26 23:57 ` Andre Przywara 2022-01-27 0:12 ` Jesse Taube 0 siblings, 1 reply; 6+ messages in thread From: Andre Przywara @ 2022-01-26 23:57 UTC (permalink / raw) To: Jesse Taube Cc: devicetree, robh+dt, Mesih Kilinc, Maxime Ripard, Chen-Yu Tsai, Jernej Skrabec, linux-arm-kernel, linux-sunxi, Chris Morgan On Mon, 24 Jan 2022 20:13:52 -0500 Jesse Taube <mr.bossman075@gmail.com> wrote: Hi Jesse, I understand that get_maintainers.pl suggested this CC: list, but you should add sunxi people and linux-arm kernel ML. Doing that now. > Include clock and reset macros and replace magic numbers. > Add MMC node. This patch itself does not do much, does it? You would at least need to enable that in the board dts. And this should be multiple patches: 1) replace numbers with macros (part of this patch) 2) Add the MMC compatible string combo to the the bindings doc 3) Add the *two* MMC nodes and at least the pinctrl node for MMC0 to the SoC .dtsi (partly in this patch) 4) Enable the MMC and the card detect pin in the Nano board .dts I checked that the macros names match the numbers they replace, so you can add my R-b: on that patch 1 (if you follow my suggestion). The MMC node also seems to look sane. > > Signed-off-by: Mesih Kilinc <mesihkilinc@gmail.com> It is not evident why Mesih's S-o-b: is in here? The patch seems to be authored and sent by you? Either you make him the author if that is his patch originally, or you put him just as Cc: or in Suggested-by:, maybe. Cheers, Andre > Signed-off-by: Jesse Taube <Mr.Bossman075@gmail.com> > --- > arch/arm/boot/dts/suniv-f1c100s.dtsi | 41 +++++++++++++++++++++++----- > 1 file changed, 34 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/boot/dts/suniv-f1c100s.dtsi b/arch/arm/boot/dts/suniv-f1c100s.dtsi > index 6100d3b75f61..32872bb29917 100644 > --- a/arch/arm/boot/dts/suniv-f1c100s.dtsi > +++ b/arch/arm/boot/dts/suniv-f1c100s.dtsi > @@ -4,6 +4,9 @@ > * Copyright 2018 Mesih Kilinc <mesihkilinc@gmail.com> > */ > > +#include <dt-bindings/clock/suniv-ccu-f1c100s.h> > +#include <dt-bindings/reset/suniv-ccu-f1c100s.h> > + > / { > #address-cells = <1>; > #size-cells = <1>; > @@ -82,7 +85,7 @@ pio: pinctrl@1c20800 { > compatible = "allwinner,suniv-f1c100s-pinctrl"; > reg = <0x01c20800 0x400>; > interrupts = <38>, <39>, <40>; > - clocks = <&ccu 37>, <&osc24M>, <&osc32k>; > + clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>; > clock-names = "apb", "hosc", "losc"; > gpio-controller; > interrupt-controller; > @@ -93,6 +96,11 @@ uart0_pe_pins: uart0-pe-pins { > pins = "PE0", "PE1"; > function = "uart0"; > }; > + > + mmc0_pins: mmc0-pins { > + pins = "PF0", "PF1", "PF2", "PF3", "PF4", "PF5"; > + function = "mmc0"; > + }; > }; > > timer@1c20c00 { > @@ -108,14 +116,33 @@ wdt: watchdog@1c20ca0 { > reg = <0x01c20ca0 0x20>; > }; > > + mmc0: mmc@1c0f000 { > + compatible = "allwinner,suniv-f1c100s-mmc", > + "allwinner,sun7i-a20-mmc"; > + reg = <0x01c0f000 0x1000>; > + clocks = <&ccu CLK_BUS_MMC0>, > + <&ccu CLK_MMC0>, > + <&ccu CLK_MMC0_OUTPUT>, > + <&ccu CLK_MMC0_SAMPLE>; > + clock-names = "ahb", "mmc", "output", "sample"; > + resets = <&ccu RST_BUS_MMC0>; > + reset-names = "ahb"; > + interrupts = <23>; > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc0_pins>; > + status = "disabled"; > + #address-cells = <1>; > + #size-cells = <0>; > + }; > + > uart0: serial@1c25000 { > compatible = "snps,dw-apb-uart"; > reg = <0x01c25000 0x400>; > interrupts = <1>; > reg-shift = <2>; > reg-io-width = <4>; > - clocks = <&ccu 38>; > - resets = <&ccu 24>; > + clocks = <&ccu CLK_BUS_UART0>; > + resets = <&ccu RST_BUS_UART0>; > status = "disabled"; > }; > > @@ -125,8 +152,8 @@ uart1: serial@1c25400 { > interrupts = <2>; > reg-shift = <2>; > reg-io-width = <4>; > - clocks = <&ccu 39>; > - resets = <&ccu 25>; > + clocks = <&ccu CLK_BUS_UART1>; > + resets = <&ccu RST_BUS_UART1>; > status = "disabled"; > }; > > @@ -136,8 +163,8 @@ uart2: serial@1c25800 { > interrupts = <3>; > reg-shift = <2>; > reg-io-width = <4>; > - clocks = <&ccu 40>; > - resets = <&ccu 26>; > + clocks = <&ccu CLK_BUS_UART2>; > + resets = <&ccu RST_BUS_UART2>; > status = "disabled"; > }; > }; ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: suniv: Add MMC and clock macros. 2022-01-26 23:57 ` Andre Przywara @ 2022-01-27 0:12 ` Jesse Taube 2022-01-27 0:53 ` Andre Przywara 0 siblings, 1 reply; 6+ messages in thread From: Jesse Taube @ 2022-01-27 0:12 UTC (permalink / raw) To: Andre Przywara Cc: devicetree, robh+dt, Mesih Kilinc, Maxime Ripard, Chen-Yu Tsai, Jernej Skrabec, linux-arm-kernel, linux-sunxi, Chris Morgan On 1/26/22 18:57, Andre Przywara wrote: > On Mon, 24 Jan 2022 20:13:52 -0500 > Jesse Taube <mr.bossman075@gmail.com> wrote: > > Hi Jesse, > > I understand that get_maintainers.pl suggested this CC: list, but you > should add sunxi people and linux-arm kernel ML. Doing that now. Uh yeah that makes sense in hind sight. >> Include clock and reset macros and replace magic numbers. >> Add MMC node. > > This patch itself does not do much, does it? You would at least need to > enable that in the board dts. True it doesn't do much just so that its in both u-boot and linux. > And this should be multiple patches: > 1) replace numbers with macros (part of this patch) > 2) Add the MMC compatible string combo to the the bindings doc > 3) Add the *two* MMC nodes and at least the pinctrl node for MMC0 to the > SoC .dtsi (partly in this patch) > 4) Enable the MMC and the card detect pin in the Nano board .dts > > I checked that the macros names match the numbers they replace, so > you can add my R-b: on that patch 1 (if you follow my suggestion). > The MMC node also seems to look sane. That seems okay. >> >> Signed-off-by: Mesih Kilinc <mesihkilinc@gmail.com> > > It is not evident why Mesih's S-o-b: is in here? The patch seems to be > authored and sent by you? Either you make him the author if that is his > patch originally, or you put him just as Cc: or in Suggested-by:, maybe. I did write the patch after I wrote it I was looking at his github and he had almost the same patch. > Cheers, > Andre > >> Signed-off-by: Jesse Taube <Mr.Bossman075@gmail.com> >> --- >> arch/arm/boot/dts/suniv-f1c100s.dtsi | 41 +++++++++++++++++++++++----- >> 1 file changed, 34 insertions(+), 7 deletions(-) >> >> diff --git a/arch/arm/boot/dts/suniv-f1c100s.dtsi b/arch/arm/boot/dts/suniv-f1c100s.dtsi >> index 6100d3b75f61..32872bb29917 100644 >> --- a/arch/arm/boot/dts/suniv-f1c100s.dtsi >> +++ b/arch/arm/boot/dts/suniv-f1c100s.dtsi >> @@ -4,6 +4,9 @@ >> * Copyright 2018 Mesih Kilinc <mesihkilinc@gmail.com> >> */ >> >> +#include <dt-bindings/clock/suniv-ccu-f1c100s.h> >> +#include <dt-bindings/reset/suniv-ccu-f1c100s.h> >> + >> / { >> #address-cells = <1>; >> #size-cells = <1>; >> @@ -82,7 +85,7 @@ pio: pinctrl@1c20800 { >> compatible = "allwinner,suniv-f1c100s-pinctrl"; >> reg = <0x01c20800 0x400>; >> interrupts = <38>, <39>, <40>; >> - clocks = <&ccu 37>, <&osc24M>, <&osc32k>; >> + clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>; >> clock-names = "apb", "hosc", "losc"; >> gpio-controller; >> interrupt-controller; >> @@ -93,6 +96,11 @@ uart0_pe_pins: uart0-pe-pins { >> pins = "PE0", "PE1"; >> function = "uart0"; >> }; >> + >> + mmc0_pins: mmc0-pins { >> + pins = "PF0", "PF1", "PF2", "PF3", "PF4", "PF5"; >> + function = "mmc0"; >> + }; >> }; >> >> timer@1c20c00 { >> @@ -108,14 +116,33 @@ wdt: watchdog@1c20ca0 { >> reg = <0x01c20ca0 0x20>; >> }; >> >> + mmc0: mmc@1c0f000 { >> + compatible = "allwinner,suniv-f1c100s-mmc", >> + "allwinner,sun7i-a20-mmc"; >> + reg = <0x01c0f000 0x1000>; >> + clocks = <&ccu CLK_BUS_MMC0>, >> + <&ccu CLK_MMC0>, >> + <&ccu CLK_MMC0_OUTPUT>, >> + <&ccu CLK_MMC0_SAMPLE>; >> + clock-names = "ahb", "mmc", "output", "sample"; >> + resets = <&ccu RST_BUS_MMC0>; >> + reset-names = "ahb"; >> + interrupts = <23>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&mmc0_pins>; >> + status = "disabled"; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + }; >> + >> uart0: serial@1c25000 { >> compatible = "snps,dw-apb-uart"; >> reg = <0x01c25000 0x400>; >> interrupts = <1>; >> reg-shift = <2>; >> reg-io-width = <4>; >> - clocks = <&ccu 38>; >> - resets = <&ccu 24>; >> + clocks = <&ccu CLK_BUS_UART0>; >> + resets = <&ccu RST_BUS_UART0>; >> status = "disabled"; >> }; >> >> @@ -125,8 +152,8 @@ uart1: serial@1c25400 { >> interrupts = <2>; >> reg-shift = <2>; >> reg-io-width = <4>; >> - clocks = <&ccu 39>; >> - resets = <&ccu 25>; >> + clocks = <&ccu CLK_BUS_UART1>; >> + resets = <&ccu RST_BUS_UART1>; >> status = "disabled"; >> }; >> >> @@ -136,8 +163,8 @@ uart2: serial@1c25800 { >> interrupts = <3>; >> reg-shift = <2>; >> reg-io-width = <4>; >> - clocks = <&ccu 40>; >> - resets = <&ccu 26>; >> + clocks = <&ccu CLK_BUS_UART2>; >> + resets = <&ccu RST_BUS_UART2>; >> status = "disabled"; >> }; >> }; > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: suniv: Add MMC and clock macros. 2022-01-27 0:12 ` Jesse Taube @ 2022-01-27 0:53 ` Andre Przywara 2022-01-29 2:05 ` Jesse Taube 0 siblings, 1 reply; 6+ messages in thread From: Andre Przywara @ 2022-01-27 0:53 UTC (permalink / raw) To: Jesse Taube Cc: devicetree, robh+dt, Mesih Kilinc, Maxime Ripard, Chen-Yu Tsai, Jernej Skrabec, linux-arm-kernel, linux-sunxi, Chris Morgan On Wed, 26 Jan 2022 19:12:05 -0500 Jesse Taube <mr.bossman075@gmail.com> wrote: > On 1/26/22 18:57, Andre Przywara wrote: > > On Mon, 24 Jan 2022 20:13:52 -0500 > > Jesse Taube <mr.bossman075@gmail.com> wrote: > > > > Hi Jesse, > > > > I understand that get_maintainers.pl suggested this CC: list, but you > > should add sunxi people and linux-arm kernel ML. Doing that now. > Uh yeah that makes sense in hind sight. > >> Include clock and reset macros and replace magic numbers. > >> Add MMC node. > > > > This patch itself does not do much, does it? You would at least need to > > enable that in the board dts. > True it doesn't do much just so that its in both u-boot and linux. > > And this should be multiple patches: > > 1) replace numbers with macros (part of this patch) > > 2) Add the MMC compatible string combo to the the bindings doc > > 3) Add the *two* MMC nodes and at least the pinctrl node for MMC0 to the > > SoC .dtsi (partly in this patch) > > 4) Enable the MMC and the card detect pin in the Nano board .dts > > > > I checked that the macros names match the numbers they replace, so > > you can add my R-b: on that patch 1 (if you follow my suggestion). > > The MMC node also seems to look sane. > That seems okay. > >> > >> Signed-off-by: Mesih Kilinc <mesihkilinc@gmail.com> > > > > It is not evident why Mesih's S-o-b: is in here? The patch seems to be > > authored and sent by you? Either you make him the author if that is his > > patch originally, or you put him just as Cc: or in Suggested-by:, maybe. > I did write the patch after I wrote it I was looking at his github and > he had almost the same patch. Yeah, not really surprising, there are only so many ways to write a DT. I guess he never sent it, and since you wrote it, it's yours, so just add him in Cc:, since he was involved in the F1C100s upstreaming. Cheers, Andre > > Cheers, > > Andre > > > >> Signed-off-by: Jesse Taube <Mr.Bossman075@gmail.com> > >> --- > >> arch/arm/boot/dts/suniv-f1c100s.dtsi | 41 +++++++++++++++++++++++----- > >> 1 file changed, 34 insertions(+), 7 deletions(-) > >> > >> diff --git a/arch/arm/boot/dts/suniv-f1c100s.dtsi b/arch/arm/boot/dts/suniv-f1c100s.dtsi > >> index 6100d3b75f61..32872bb29917 100644 > >> --- a/arch/arm/boot/dts/suniv-f1c100s.dtsi > >> +++ b/arch/arm/boot/dts/suniv-f1c100s.dtsi > >> @@ -4,6 +4,9 @@ > >> * Copyright 2018 Mesih Kilinc <mesihkilinc@gmail.com> > >> */ > >> > >> +#include <dt-bindings/clock/suniv-ccu-f1c100s.h> > >> +#include <dt-bindings/reset/suniv-ccu-f1c100s.h> > >> + > >> / { > >> #address-cells = <1>; > >> #size-cells = <1>; > >> @@ -82,7 +85,7 @@ pio: pinctrl@1c20800 { > >> compatible = "allwinner,suniv-f1c100s-pinctrl"; > >> reg = <0x01c20800 0x400>; > >> interrupts = <38>, <39>, <40>; > >> - clocks = <&ccu 37>, <&osc24M>, <&osc32k>; > >> + clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>; > >> clock-names = "apb", "hosc", "losc"; > >> gpio-controller; > >> interrupt-controller; > >> @@ -93,6 +96,11 @@ uart0_pe_pins: uart0-pe-pins { > >> pins = "PE0", "PE1"; > >> function = "uart0"; > >> }; > >> + > >> + mmc0_pins: mmc0-pins { > >> + pins = "PF0", "PF1", "PF2", "PF3", "PF4", "PF5"; > >> + function = "mmc0"; > >> + }; > >> }; > >> > >> timer@1c20c00 { > >> @@ -108,14 +116,33 @@ wdt: watchdog@1c20ca0 { > >> reg = <0x01c20ca0 0x20>; > >> }; > >> > >> + mmc0: mmc@1c0f000 { > >> + compatible = "allwinner,suniv-f1c100s-mmc", > >> + "allwinner,sun7i-a20-mmc"; > >> + reg = <0x01c0f000 0x1000>; > >> + clocks = <&ccu CLK_BUS_MMC0>, > >> + <&ccu CLK_MMC0>, > >> + <&ccu CLK_MMC0_OUTPUT>, > >> + <&ccu CLK_MMC0_SAMPLE>; > >> + clock-names = "ahb", "mmc", "output", "sample"; > >> + resets = <&ccu RST_BUS_MMC0>; > >> + reset-names = "ahb"; > >> + interrupts = <23>; > >> + pinctrl-names = "default"; > >> + pinctrl-0 = <&mmc0_pins>; > >> + status = "disabled"; > >> + #address-cells = <1>; > >> + #size-cells = <0>; > >> + }; > >> + > >> uart0: serial@1c25000 { > >> compatible = "snps,dw-apb-uart"; > >> reg = <0x01c25000 0x400>; > >> interrupts = <1>; > >> reg-shift = <2>; > >> reg-io-width = <4>; > >> - clocks = <&ccu 38>; > >> - resets = <&ccu 24>; > >> + clocks = <&ccu CLK_BUS_UART0>; > >> + resets = <&ccu RST_BUS_UART0>; > >> status = "disabled"; > >> }; > >> > >> @@ -125,8 +152,8 @@ uart1: serial@1c25400 { > >> interrupts = <2>; > >> reg-shift = <2>; > >> reg-io-width = <4>; > >> - clocks = <&ccu 39>; > >> - resets = <&ccu 25>; > >> + clocks = <&ccu CLK_BUS_UART1>; > >> + resets = <&ccu RST_BUS_UART1>; > >> status = "disabled"; > >> }; > >> > >> @@ -136,8 +163,8 @@ uart2: serial@1c25800 { > >> interrupts = <3>; > >> reg-shift = <2>; > >> reg-io-width = <4>; > >> - clocks = <&ccu 40>; > >> - resets = <&ccu 26>; > >> + clocks = <&ccu CLK_BUS_UART2>; > >> + resets = <&ccu RST_BUS_UART2>; > >> status = "disabled"; > >> }; > >> }; > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: suniv: Add MMC and clock macros. 2022-01-27 0:53 ` Andre Przywara @ 2022-01-29 2:05 ` Jesse Taube 2022-01-29 2:31 ` Andre Przywara 0 siblings, 1 reply; 6+ messages in thread From: Jesse Taube @ 2022-01-29 2:05 UTC (permalink / raw) To: Andre Przywara Cc: devicetree, robh+dt, Mesih Kilinc, Maxime Ripard, Chen-Yu Tsai, Jernej Skrabec, linux-arm-kernel, linux-sunxi, Chris Morgan On 1/26/22 19:53, Andre Przywara wrote: > On Wed, 26 Jan 2022 19:12:05 -0500 > Jesse Taube <mr.bossman075@gmail.com> wrote: > >> On 1/26/22 18:57, Andre Przywara wrote: >>> On Mon, 24 Jan 2022 20:13:52 -0500 >>> Jesse Taube <mr.bossman075@gmail.com> wrote: >>> >>> Hi Jesse, >>> >>> I understand that get_maintainers.pl suggested this CC: list, but you >>> should add sunxi people and linux-arm kernel ML. Doing that now. >> Uh yeah that makes sense in hind sight. >>>> Include clock and reset macros and replace magic numbers. >>>> Add MMC node. >>> >>> This patch itself does not do much, does it? You would at least need to >>> enable that in the board dts. >> True it doesn't do much just so that its in both u-boot and linux. >>> And this should be multiple patches: >>> 1) replace numbers with macros (part of this patch) >>> 2) Add the MMC compatible string combo to the the bindings doc Uh there is no f1c100s driver yet its just a placeholder it should be compatible with the a20 though. >>> 3) Add the *two* MMC nodes and at least the pinctrl node for MMC0 to the >>> SoC .dtsi (partly in this patch) >>> 4) Enable the MMC and the card detect pin in the Nano board .dts Uh after like an hour of trying to find the schematic I found it here nano.lichee.pro but the card detect pin isn't connected ;-(. >>> >>> I checked that the macros names match the numbers they replace, so >>> you can add my R-b: on that patch 1 (if you follow my suggestion). >>> The MMC node also seems to look sane. >> That seems okay. >>>> >>>> Signed-off-by: Mesih Kilinc <mesihkilinc@gmail.com> >>> >>> It is not evident why Mesih's S-o-b: is in here? The patch seems to be >>> authored and sent by you? Either you make him the author if that is his >>> patch originally, or you put him just as Cc: or in Suggested-by:, maybe. >> I did write the patch after I wrote it I was looking at his github and >> he had almost the same patch. > > Yeah, not really surprising, there are only so many ways to write a DT. > I guess he never sent it, and since you wrote it, it's yours, so just > add him in Cc:, since he was involved in the F1C100s upstreaming. > > Cheers, > Andre > >>> Cheers, >>> Andre >>> >>>> Signed-off-by: Jesse Taube <Mr.Bossman075@gmail.com> >>>> --- >>>> arch/arm/boot/dts/suniv-f1c100s.dtsi | 41 +++++++++++++++++++++++----- >>>> 1 file changed, 34 insertions(+), 7 deletions(-) >>>> >>>> diff --git a/arch/arm/boot/dts/suniv-f1c100s.dtsi b/arch/arm/boot/dts/suniv-f1c100s.dtsi >>>> index 6100d3b75f61..32872bb29917 100644 >>>> --- a/arch/arm/boot/dts/suniv-f1c100s.dtsi >>>> +++ b/arch/arm/boot/dts/suniv-f1c100s.dtsi >>>> @@ -4,6 +4,9 @@ >>>> * Copyright 2018 Mesih Kilinc <mesihkilinc@gmail.com> >>>> */ >>>> >>>> +#include <dt-bindings/clock/suniv-ccu-f1c100s.h> >>>> +#include <dt-bindings/reset/suniv-ccu-f1c100s.h> >>>> + >>>> / { >>>> #address-cells = <1>; >>>> #size-cells = <1>; >>>> @@ -82,7 +85,7 @@ pio: pinctrl@1c20800 { >>>> compatible = "allwinner,suniv-f1c100s-pinctrl"; >>>> reg = <0x01c20800 0x400>; >>>> interrupts = <38>, <39>, <40>; >>>> - clocks = <&ccu 37>, <&osc24M>, <&osc32k>; >>>> + clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>; >>>> clock-names = "apb", "hosc", "losc"; >>>> gpio-controller; >>>> interrupt-controller; >>>> @@ -93,6 +96,11 @@ uart0_pe_pins: uart0-pe-pins { >>>> pins = "PE0", "PE1"; >>>> function = "uart0"; >>>> }; >>>> + >>>> + mmc0_pins: mmc0-pins { >>>> + pins = "PF0", "PF1", "PF2", "PF3", "PF4", "PF5"; >>>> + function = "mmc0"; >>>> + }; >>>> }; >>>> >>>> timer@1c20c00 { >>>> @@ -108,14 +116,33 @@ wdt: watchdog@1c20ca0 { >>>> reg = <0x01c20ca0 0x20>; >>>> }; >>>> >>>> + mmc0: mmc@1c0f000 { >>>> + compatible = "allwinner,suniv-f1c100s-mmc", >>>> + "allwinner,sun7i-a20-mmc"; >>>> + reg = <0x01c0f000 0x1000>; >>>> + clocks = <&ccu CLK_BUS_MMC0>, >>>> + <&ccu CLK_MMC0>, >>>> + <&ccu CLK_MMC0_OUTPUT>, >>>> + <&ccu CLK_MMC0_SAMPLE>; >>>> + clock-names = "ahb", "mmc", "output", "sample"; >>>> + resets = <&ccu RST_BUS_MMC0>; >>>> + reset-names = "ahb"; >>>> + interrupts = <23>; >>>> + pinctrl-names = "default"; >>>> + pinctrl-0 = <&mmc0_pins>; >>>> + status = "disabled"; >>>> + #address-cells = <1>; >>>> + #size-cells = <0>; >>>> + }; >>>> + >>>> uart0: serial@1c25000 { >>>> compatible = "snps,dw-apb-uart"; >>>> reg = <0x01c25000 0x400>; >>>> interrupts = <1>; >>>> reg-shift = <2>; >>>> reg-io-width = <4>; >>>> - clocks = <&ccu 38>; >>>> - resets = <&ccu 24>; >>>> + clocks = <&ccu CLK_BUS_UART0>; >>>> + resets = <&ccu RST_BUS_UART0>; >>>> status = "disabled"; >>>> }; >>>> >>>> @@ -125,8 +152,8 @@ uart1: serial@1c25400 { >>>> interrupts = <2>; >>>> reg-shift = <2>; >>>> reg-io-width = <4>; >>>> - clocks = <&ccu 39>; >>>> - resets = <&ccu 25>; >>>> + clocks = <&ccu CLK_BUS_UART1>; >>>> + resets = <&ccu RST_BUS_UART1>; >>>> status = "disabled"; >>>> }; >>>> >>>> @@ -136,8 +163,8 @@ uart2: serial@1c25800 { >>>> interrupts = <3>; >>>> reg-shift = <2>; >>>> reg-io-width = <4>; >>>> - clocks = <&ccu 40>; >>>> - resets = <&ccu 26>; >>>> + clocks = <&ccu CLK_BUS_UART2>; >>>> + resets = <&ccu RST_BUS_UART2>; >>>> status = "disabled"; >>>> }; >>>> }; >>> > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: suniv: Add MMC and clock macros. 2022-01-29 2:05 ` Jesse Taube @ 2022-01-29 2:31 ` Andre Przywara 0 siblings, 0 replies; 6+ messages in thread From: Andre Przywara @ 2022-01-29 2:31 UTC (permalink / raw) To: Jesse Taube Cc: devicetree, robh+dt, Mesih Kilinc, Maxime Ripard, Chen-Yu Tsai, Jernej Skrabec, linux-arm-kernel, linux-sunxi, Chris Morgan On Fri, 28 Jan 2022 21:05:28 -0500 Jesse Taube <mr.bossman075@gmail.com> wrote: > On 1/26/22 19:53, Andre Przywara wrote: > > On Wed, 26 Jan 2022 19:12:05 -0500 > > Jesse Taube <mr.bossman075@gmail.com> wrote: > > > >> On 1/26/22 18:57, Andre Przywara wrote: > >>> On Mon, 24 Jan 2022 20:13:52 -0500 > >>> Jesse Taube <mr.bossman075@gmail.com> wrote: > >>> > >>> Hi Jesse, > >>> > >>> I understand that get_maintainers.pl suggested this CC: list, but you > >>> should add sunxi people and linux-arm kernel ML. Doing that now. > >> Uh yeah that makes sense in hind sight. > >>>> Include clock and reset macros and replace magic numbers. > >>>> Add MMC node. > >>> > >>> This patch itself does not do much, does it? You would at least need to > >>> enable that in the board dts. > >> True it doesn't do much just so that its in both u-boot and linux. > >>> And this should be multiple patches: > >>> 1) replace numbers with macros (part of this patch) > >>> 2) Add the MMC compatible string combo to the the bindings doc > Uh there is no f1c100s driver yet its just a placeholder it should be > compatible with the a20 though. That is expected, ideally we won't need any addition to the driver file, as indeed chances are it's really compatible to the A20. But in any case we need to document the compatible string, and how it is used: paired with the actual defining A20 fallback string. This needs to go to Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml. If you look around in that file and its git history, you should get the idea what you need to do. > >>> 3) Add the *two* MMC nodes and at least the pinctrl node for MMC0 to the > >>> SoC .dtsi (partly in this patch) > >>> 4) Enable the MMC and the card detect pin in the Nano board .dts > Uh after like an hour of trying to find the schematic I found it here > nano.lichee.pro but the card detect pin isn't connected ;-(. That's fine, it wouldn't be the first one. We have the "broken-cd;" property for this. Cheers, Andre > >>> > >>> I checked that the macros names match the numbers they replace, so > >>> you can add my R-b: on that patch 1 (if you follow my suggestion). > >>> The MMC node also seems to look sane. > >> That seems okay. > >>>> > >>>> Signed-off-by: Mesih Kilinc <mesihkilinc@gmail.com> > >>> > >>> It is not evident why Mesih's S-o-b: is in here? The patch seems to be > >>> authored and sent by you? Either you make him the author if that is his > >>> patch originally, or you put him just as Cc: or in Suggested-by:, maybe. > >> I did write the patch after I wrote it I was looking at his github and > >> he had almost the same patch. > > > > Yeah, not really surprising, there are only so many ways to write a DT. > > I guess he never sent it, and since you wrote it, it's yours, so just > > add him in Cc:, since he was involved in the F1C100s upstreaming. > > > > Cheers, > > Andre > > > >>> Cheers, > >>> Andre > >>> > >>>> Signed-off-by: Jesse Taube <Mr.Bossman075@gmail.com> > >>>> --- > >>>> arch/arm/boot/dts/suniv-f1c100s.dtsi | 41 +++++++++++++++++++++++----- > >>>> 1 file changed, 34 insertions(+), 7 deletions(-) > >>>> > >>>> diff --git a/arch/arm/boot/dts/suniv-f1c100s.dtsi b/arch/arm/boot/dts/suniv-f1c100s.dtsi > >>>> index 6100d3b75f61..32872bb29917 100644 > >>>> --- a/arch/arm/boot/dts/suniv-f1c100s.dtsi > >>>> +++ b/arch/arm/boot/dts/suniv-f1c100s.dtsi > >>>> @@ -4,6 +4,9 @@ > >>>> * Copyright 2018 Mesih Kilinc <mesihkilinc@gmail.com> > >>>> */ > >>>> > >>>> +#include <dt-bindings/clock/suniv-ccu-f1c100s.h> > >>>> +#include <dt-bindings/reset/suniv-ccu-f1c100s.h> > >>>> + > >>>> / { > >>>> #address-cells = <1>; > >>>> #size-cells = <1>; > >>>> @@ -82,7 +85,7 @@ pio: pinctrl@1c20800 { > >>>> compatible = "allwinner,suniv-f1c100s-pinctrl"; > >>>> reg = <0x01c20800 0x400>; > >>>> interrupts = <38>, <39>, <40>; > >>>> - clocks = <&ccu 37>, <&osc24M>, <&osc32k>; > >>>> + clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>; > >>>> clock-names = "apb", "hosc", "losc"; > >>>> gpio-controller; > >>>> interrupt-controller; > >>>> @@ -93,6 +96,11 @@ uart0_pe_pins: uart0-pe-pins { > >>>> pins = "PE0", "PE1"; > >>>> function = "uart0"; > >>>> }; > >>>> + > >>>> + mmc0_pins: mmc0-pins { > >>>> + pins = "PF0", "PF1", "PF2", "PF3", "PF4", "PF5"; > >>>> + function = "mmc0"; > >>>> + }; > >>>> }; > >>>> > >>>> timer@1c20c00 { > >>>> @@ -108,14 +116,33 @@ wdt: watchdog@1c20ca0 { > >>>> reg = <0x01c20ca0 0x20>; > >>>> }; > >>>> > >>>> + mmc0: mmc@1c0f000 { > >>>> + compatible = "allwinner,suniv-f1c100s-mmc", > >>>> + "allwinner,sun7i-a20-mmc"; > >>>> + reg = <0x01c0f000 0x1000>; > >>>> + clocks = <&ccu CLK_BUS_MMC0>, > >>>> + <&ccu CLK_MMC0>, > >>>> + <&ccu CLK_MMC0_OUTPUT>, > >>>> + <&ccu CLK_MMC0_SAMPLE>; > >>>> + clock-names = "ahb", "mmc", "output", "sample"; > >>>> + resets = <&ccu RST_BUS_MMC0>; > >>>> + reset-names = "ahb"; > >>>> + interrupts = <23>; > >>>> + pinctrl-names = "default"; > >>>> + pinctrl-0 = <&mmc0_pins>; > >>>> + status = "disabled"; > >>>> + #address-cells = <1>; > >>>> + #size-cells = <0>; > >>>> + }; > >>>> + > >>>> uart0: serial@1c25000 { > >>>> compatible = "snps,dw-apb-uart"; > >>>> reg = <0x01c25000 0x400>; > >>>> interrupts = <1>; > >>>> reg-shift = <2>; > >>>> reg-io-width = <4>; > >>>> - clocks = <&ccu 38>; > >>>> - resets = <&ccu 24>; > >>>> + clocks = <&ccu CLK_BUS_UART0>; > >>>> + resets = <&ccu RST_BUS_UART0>; > >>>> status = "disabled"; > >>>> }; > >>>> > >>>> @@ -125,8 +152,8 @@ uart1: serial@1c25400 { > >>>> interrupts = <2>; > >>>> reg-shift = <2>; > >>>> reg-io-width = <4>; > >>>> - clocks = <&ccu 39>; > >>>> - resets = <&ccu 25>; > >>>> + clocks = <&ccu CLK_BUS_UART1>; > >>>> + resets = <&ccu RST_BUS_UART1>; > >>>> status = "disabled"; > >>>> }; > >>>> > >>>> @@ -136,8 +163,8 @@ uart2: serial@1c25800 { > >>>> interrupts = <3>; > >>>> reg-shift = <2>; > >>>> reg-io-width = <4>; > >>>> - clocks = <&ccu 40>; > >>>> - resets = <&ccu 26>; > >>>> + clocks = <&ccu CLK_BUS_UART2>; > >>>> + resets = <&ccu RST_BUS_UART2>; > >>>> status = "disabled"; > >>>> }; > >>>> }; > >>> > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-01-29 2:32 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-01-25 1:13 [PATCH] ARM: dts: suniv: Add MMC and clock macros Jesse Taube 2022-01-26 23:57 ` Andre Przywara 2022-01-27 0:12 ` Jesse Taube 2022-01-27 0:53 ` Andre Przywara 2022-01-29 2:05 ` Jesse Taube 2022-01-29 2:31 ` Andre Przywara
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).