Unverified Commit 42a57a47 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Palmer Dabbelt
Browse files

riscv: dts: microchip: drop duplicated MMC/SDHC node 



Devicetree source is a description of hardware and hardware has only one
block @20008000 which can be configured either as eMMC or SDHC.  Having
two node for different modes is an obscure, unusual and confusing way to
configure it.  Instead the board file is supposed to customize the block
to its needs, e.g. to SDHC mode.

This fixes dtbs_check warning:
  arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dt.yaml: sdhc@20008000: $nodename:0: 'sdhc@20008000' does not match '^mmc(@.*)?$'

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent fd86dd2a

arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts

+10 −1
Original line number Diff line number Diff line
@@ -51,8 +51,17 @@ 
	status = "okay";

};



&sdcard {

&mmc {

	status = "okay";



	bus-width = <4>;

	disable-wp;

	cap-sd-highspeed;

	card-detect-delay = <200>;

	sd-uhs-sdr12;

	sd-uhs-sdr25;

	sd-uhs-sdr50;

	sd-uhs-sdr104;

};



&emac0 {

arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi

+2 −27
Original line number Diff line number Diff line
@@ -262,39 +262,14 @@ 
			status = "disabled";

		};



		emmc: mmc@20008000 {

		/* Common node entry for emmc/sd */

		mmc: mmc@20008000 {

			compatible = "cdns,sd4hc";

			reg = <0x0 0x20008000 0x0 0x1000>;

			interrupt-parent = <&plic>;

			interrupts = <88 89>;

			pinctrl-names = "default";

			clocks = <&clkcfg 6>;

			bus-width = <4>;

			cap-mmc-highspeed;

			mmc-ddr-3_3v;

			max-frequency = <200000000>;

			non-removable;

			no-sd;

			no-sdio;

			voltage-ranges = <3300 3300>;

			status = "disabled";

		};



		sdcard: sdhc@20008000 {

			compatible = "cdns,sd4hc";

			reg = <0x0 0x20008000 0x0 0x1000>;

			interrupt-parent = <&plic>;

			interrupts = <88>;

			pinctrl-names = "default";

			clocks = <&clkcfg 6>;

			bus-width = <4>;

			disable-wp;

			cap-sd-highspeed;

			card-detect-delay = <200>;

			sd-uhs-sdr12;

			sd-uhs-sdr25;

			sd-uhs-sdr50;

			sd-uhs-sdr104;

			max-frequency = <200000000>;

			status = "disabled";

		};