ARM: dts: suniv: Add MMC and clock macros.
Subsystems (2)
PATCH 1/1 ARM: dts: suniv: Add MMC and clock macros.
Include clock and reset macros and replace magic numbers. Add MMC node.
--- arch/arm/boot/dts/suniv-f1c100s.dtsi | 41 +++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 7 deletions(-)
arch/arm/boot/dts/suniv-f1c100s.dtsi +34 -7
@@ -4,6 +4,9 @@ * Copyright 2018 Mesih Kilinc <[email protected]> */ +#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"; }; };
Signature · 1 line
2.34.1
On Mon, 24 Jan 2022 20:13:52 -0500
Jesse Taube <[email protected]> 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.
Quoted 2 lines
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.
Quoted 2 lines
Signed-off-by Mesih Kilinc <[email protected]>
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
Quoted 98 lines
Signed-off-by Jesse Taube <[email protected]>--- arch/arm/boot/dts/suniv-f1c100s.dtsi | 41 +++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 7 deletions(-)arch/arm/boot/dts/suniv-f1c100s.dtsi +34
-7@@ -4,6 +4,9 @@ * Copyright 2018 Mesih Kilinc <[email protected]> */ +#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"; }; };
Quoted 7 lines · Andre Przywara
On Mon, 24 Jan 2022 20:13:52 -0500
Jesse Taube <[email protected]> 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.
Quoted 5 lines
Quoted 2 lines
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.
Quoted 10 lines
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 .dtsI 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.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Mesih Kilinc <[email protected]>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.
Quoted 102 lines
Cheers,
AndreQuoted 98 lines
Signed-off-by Jesse Taube <[email protected]>--- arch/arm/boot/dts/suniv-f1c100s.dtsi | 41 +++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 7 deletions(-)arch/arm/boot/dts/suniv-f1c100s.dtsi +34
-7@@ -4,6 +4,9 @@ * Copyright 2018 Mesih Kilinc <[email protected]> */ +#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"; }; };
Quoted 27 lines · On Wed, 26 Jan 2022 19:12:05 -0500 Jesse Taube <[email protected]> wrote:
Quoted 7 lines · Andre Przywara
On Mon, 24 Jan 2022 20:13:52 -0500
Jesse Taube <[email protected]> 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.
Quoted 5 lines
Quoted 2 lines
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.
Quoted 10 lines
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 .dtsI 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.
Quoted 1 line
Quoted 1 line
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Signed-off-by Mesih Kilinc <[email protected]>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
Quoted 102 lines
Quoted 102 lines
Cheers,
AndreQuoted 98 lines
Signed-off-by Jesse Taube <[email protected]>--- arch/arm/boot/dts/suniv-f1c100s.dtsi | 41 +++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 7 deletions(-)arch/arm/boot/dts/suniv-f1c100s.dtsi +34
-7@@ -4,6 +4,9 @@ * Copyright 2018 Mesih Kilinc <[email protected]> */ +#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"; }; };
Quoted 15 lines · Andre Przywara
Quoted 12 lines · On Wed, 26 Jan 2022 19:12:05 -0500 Jesse Taube <[email protected]> wrote:
Quoted 7 lines · Andre Przywara
On Mon, 24 Jan 2022 20:13:52 -0500
Jesse Taube <[email protected]> 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.
Quoted 3 lines
Quoted 2 lines
Include clock and reset macros and replace magic numbers. Add MMC node.
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
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.
Quoted 3 lines
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.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
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 ;-(.
Quoted 124 lines
Quoted 6 lines
Quoted 4 lines
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.
Quoted 1 line
Quoted 1 line
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Signed-off-by Mesih Kilinc <[email protected]>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,
AndreQuoted 102 lines
Quoted 102 lines
Cheers,
AndreQuoted 98 lines
Signed-off-by Jesse Taube <[email protected]>--- arch/arm/boot/dts/suniv-f1c100s.dtsi | 41 +++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 7 deletions(-)arch/arm/boot/dts/suniv-f1c100s.dtsi +34
-7@@ -4,6 +4,9 @@ * Copyright 2018 Mesih Kilinc <[email protected]> */ +#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"; }; };
Quoted 16 lines · On Fri, 28 Jan 2022 21:05:28 -0500 Jesse Taube <[email protected]> wrote:
Quoted 15 lines · Andre Przywara
Quoted 12 lines · On Wed, 26 Jan 2022 19:12:05 -0500 Jesse Taube <[email protected]> wrote:
Quoted 7 lines · Andre Przywara
On Mon, 24 Jan 2022 20:13:52 -0500
Jesse Taube <[email protected]> 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.
Quoted 3 lines
Quoted 2 lines
Include clock and reset macros and replace magic numbers. Add MMC node.
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
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.
Quoted 3 lines
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 docUh 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.
Quoted 5 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
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 .dtsUh 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
Quoted 125 lines
Quoted 124 lines
Quoted 6 lines
Quoted 4 lines
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.
Quoted 1 line
Quoted 1 line
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Signed-off-by Mesih Kilinc <[email protected]>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,
AndreQuoted 102 lines
Quoted 102 lines
Cheers,
AndreQuoted 98 lines
Signed-off-by Jesse Taube <[email protected]>--- arch/arm/boot/dts/suniv-f1c100s.dtsi | 41 +++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 7 deletions(-)arch/arm/boot/dts/suniv-f1c100s.dtsi +34
-7@@ -4,6 +4,9 @@ * Copyright 2018 Mesih Kilinc <[email protected]> */ +#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"; }; };