Message ID | 20190408092619.23152-1-peron.clem@gmail.com |
---|---|
Headers | show |
Series | Add Beelink GS1 Board | expand |
On Mon, Apr 08, 2019 at 11:26:14AM +0200, Clément Péron wrote: > There is only one pinmuxing available for each MMC controller. > > Move the pinctrl to the SOC > > Signed-off-by: Clément Péron <peron.clem@gmail.com> > --- > arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 2 -- > arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 4 ---- > arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 4 ++++ > 3 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi > index b2526dac2fcf..62e27948a3fa 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi > @@ -56,8 +56,6 @@ > }; > > &mmc0 { > - pinctrl-names = "default"; > - pinctrl-0 = <&mmc0_pins>; > vmmc-supply = <®_cldo1>; > cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; > bus-width = <4>; > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts > index bdb8470fc8dc..4802902e128f 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts > @@ -104,8 +104,6 @@ > }; > > &mmc0 { > - pinctrl-names = "default"; > - pinctrl-0 = <&mmc0_pins>; > vmmc-supply = <®_cldo1>; > cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; > bus-width = <4>; > @@ -113,8 +111,6 @@ > }; > > &mmc2 { > - pinctrl-names = "default"; > - pinctrl-0 = <&mmc2_pins>; > vmmc-supply = <®_cldo1>; > vqmmc-supply = <®_bldo2>; > non-removable; > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi > index 3e4bb0b0de69..006d3b6418af 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi > @@ -278,6 +278,8 @@ > resets = <&ccu RST_BUS_MMC0>; > reset-names = "ahb"; > interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; > + pinctrl-names = "default"; This is indented with spaces and not tabulations. This error is reported by checkpatch. > + pinctrl-0 = <&mmc0_pins>; > status = "disabled"; > #address-cells = <1>; > #size-cells = <0>; > @@ -306,6 +308,8 @@ > resets = <&ccu RST_BUS_MMC2>; > reset-names = "ahb"; > interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc0_pins>; I guess you meant mmc2? Can you test your patches before sending them please? Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
On Mon, Apr 08, 2019 at 11:26:16AM +0200, Clément Péron wrote: > Beelink GS1 is an Allwinner H6 based TV box, > which support: > - Allwinner H6 Quad-core 64-bit ARM Cortex-A53 > - GPU Mali-T720 > - 2GB LPDDR3 RAM > - AXP805 PMIC > - 1Gbps GMAC via RTL8211E > - FN-Link 6222B-SRB Wifi/BT > - 1x USB 2.0 Host and 1x USB 3.0 Host > - HDMI port > - S/PDIF Tx > - IR receiver > - 5V/2A DC power supply > > Signed-off-by: Clément Péron <peron.clem@gmail.com> > --- > arch/arm64/boot/dts/allwinner/Makefile | 1 + > .../dts/allwinner/sun50i-h6-beelink-gs1.dts | 262 ++++++++++++++++++ > 2 files changed, 263 insertions(+) > create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts > > diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile > index e4dce2f6fa3a..2dd806a3d5c9 100644 > --- a/arch/arm64/boot/dts/allwinner/Makefile > +++ b/arch/arm64/boot/dts/allwinner/Makefile > @@ -20,6 +20,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb > dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb > dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus.dtb > dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb > +dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-beelink-gs1.dtb > dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-lite2.dtb > dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-one-plus.dtb > dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts > new file mode 100644 > index 000000000000..3087e56727e1 > --- /dev/null > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts > @@ -0,0 +1,262 @@ > +// SPDX-License-Identifier: (GPL-2.0+ or MIT) > +/* > + * Copyright (C) 2019 Clément Péron <peron.clem@gmail.com> > + */ > + > +/dts-v1/; > + > +#include "sun50i-h6.dtsi" > + > +#include <dt-bindings/gpio/gpio.h> > + > +/ { > + model = "Beelink GS1"; > + compatible = "azw,beelink-gs1", "allwinner,sun50i-h6"; > + > + aliases { > + ethernet0 = &emac; > + serial0 = &uart0; > + }; > + > + chosen { > + stdout-path = "serial0:115200n8"; > + }; > + > + connector { > + compatible = "hdmi-connector"; > + type = "a"; > + > + port { > + hdmi_con_in: endpoint { > + remote-endpoint = <&hdmi_out_con>; > + }; > + }; > + }; > + > + leds { > + compatible = "gpio-leds"; > + > + power { > + label = "beelink:white:power"; > + gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */ > + default-state = "on"; > + }; > + }; > + > + reg_vcc5v: vcc5v { > + /* board wide 5V supply directly from the DC jack */ > + compatible = "regulator-fixed"; > + regulator-name = "vcc-5v"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + regulator-always-on; > + }; > +}; > + > +&de { > + status = "okay"; > +}; > + > +&ehci0 { > + status = "okay"; > +}; > + > +&emac { > + pinctrl-names = "default"; > + pinctrl-0 = <&ext_rgmii_pins>; > + phy-mode = "rgmii"; > + phy-handle = <&ext_rgmii_phy>; > + phy-supply = <®_aldo2>; > + allwinner,rx-delay-ps = <0>; > + allwinner,tx-delay-ps = <0>; These two are at their default values Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Hi, On Mon, 8 Apr 2019 at 12:42, Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > On Mon, Apr 08, 2019 at 11:26:14AM +0200, Clément Péron wrote: > > There is only one pinmuxing available for each MMC controller. > > > > Move the pinctrl to the SOC > > > > Signed-off-by: Clément Péron <peron.clem@gmail.com> > > --- > > arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 2 -- > > arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 4 ---- > > arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 4 ++++ > > 3 files changed, 4 insertions(+), 6 deletions(-) > > > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi > > index b2526dac2fcf..62e27948a3fa 100644 > > --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi > > @@ -56,8 +56,6 @@ > > }; > > > > &mmc0 { > > - pinctrl-names = "default"; > > - pinctrl-0 = <&mmc0_pins>; > > vmmc-supply = <®_cldo1>; > > cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; > > bus-width = <4>; > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts > > index bdb8470fc8dc..4802902e128f 100644 > > --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts > > @@ -104,8 +104,6 @@ > > }; > > > > &mmc0 { > > - pinctrl-names = "default"; > > - pinctrl-0 = <&mmc0_pins>; > > vmmc-supply = <®_cldo1>; > > cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; > > bus-width = <4>; > > @@ -113,8 +111,6 @@ > > }; > > > > &mmc2 { > > - pinctrl-names = "default"; > > - pinctrl-0 = <&mmc2_pins>; > > vmmc-supply = <®_cldo1>; > > vqmmc-supply = <®_bldo2>; > > non-removable; > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi > > index 3e4bb0b0de69..006d3b6418af 100644 > > --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi > > @@ -278,6 +278,8 @@ > > resets = <&ccu RST_BUS_MMC0>; > > reset-names = "ahb"; > > interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; > > + pinctrl-names = "default"; > > This is indented with spaces and not tabulations. This error is > reported by checkpatch. > > > + pinctrl-0 = <&mmc0_pins>; > > status = "disabled"; > > #address-cells = <1>; > > #size-cells = <0>; > > @@ -306,6 +308,8 @@ > > resets = <&ccu RST_BUS_MMC2>; > > reset-names = "ahb"; > > interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; > > + pinctrl-names = "default"; > > + pinctrl-0 = <&mmc0_pins>; > > I guess you meant mmc2? Yes > > Can you test your patches before sending them please? I made a test before posting the patch but I think my U-boot correctly mux the pins before linux. That's why I didn't catch it. Anyway it's really trival and I should have seen it. My apologizes for this, Clément > > Maxime > > -- > Maxime Ripard, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com