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 = <&reg_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 = <&reg_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 = <&reg_cldo1>;
>  	vqmmc-supply = <&reg_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