| Message ID | 20170630115331.73869-3-ivan@de.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jun 30, 2017 at 02:53:31PM +0300, Ivan Mikhaylov wrote: > Add mmc0 changes for enabling arasan emmc and change > defconfig appropriately. > > Signed-off-by: Ivan Mikhaylov <ivan@de.ibm.com> > --- > arch/powerpc/boot/dts/fsp2.dts | 33 +++++++++++++++++------------- > arch/powerpc/configs/44x/fsp2_defconfig | 2 + > 2 files changed, 21 insertions(+), 14 deletions(-) > > diff --git a/arch/powerpc/boot/dts/fsp2.dts b/arch/powerpc/boot/dts/fsp2.dts > index 475953a..6a63026 100644 > --- a/arch/powerpc/boot/dts/fsp2.dts > +++ b/arch/powerpc/boot/dts/fsp2.dts > @@ -52,6 +52,7 @@ > clocks { > mmc_clk: mmc_clk { > compatible = "fixed-clock"; > + #clock-cells = <0>; > clock-frequency = <50000000>; > clock-output-names = "mmc_clk"; > }; > @@ -359,20 +360,6 @@ > interrupts = <31 0x4 15 0x84>; > }; > > - mmc0: sdhci@020c0000 { > - compatible = "st,sdhci-stih407", "st,sdhci"; > - status = "disabled"; > - reg = <0x020c0000 0x20000>; > - reg-names = "mmc"; > - interrupt-parent = <&UIC1_3>; > - interrupts = <21 0x4 22 0x4>; > - interrupt-names = "mmcirq"; > - pinctrl-names = "default"; > - pinctrl-0 = <>; > - clock-names = "mmc"; > - clocks = <&mmc_clk>; > - }; > - > plb6 { > compatible = "ibm,plb6"; > #address-cells = <2>; > @@ -501,6 +488,24 @@ > /*RXDE*/ 4 &UIC1_2 13 0x4>; > }; > > + mmc0: sdhci@020c0000 { Use generic node names and drop leading 0: mmc@20c0000 Rob -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/powerpc/boot/dts/fsp2.dts b/arch/powerpc/boot/dts/fsp2.dts index 475953a..6a63026 100644 --- a/arch/powerpc/boot/dts/fsp2.dts +++ b/arch/powerpc/boot/dts/fsp2.dts @@ -52,6 +52,7 @@ clocks { mmc_clk: mmc_clk { compatible = "fixed-clock"; + #clock-cells = <0>; clock-frequency = <50000000>; clock-output-names = "mmc_clk"; }; @@ -359,20 +360,6 @@ interrupts = <31 0x4 15 0x84>; }; - mmc0: sdhci@020c0000 { - compatible = "st,sdhci-stih407", "st,sdhci"; - status = "disabled"; - reg = <0x020c0000 0x20000>; - reg-names = "mmc"; - interrupt-parent = <&UIC1_3>; - interrupts = <21 0x4 22 0x4>; - interrupt-names = "mmcirq"; - pinctrl-names = "default"; - pinctrl-0 = <>; - clock-names = "mmc"; - clocks = <&mmc_clk>; - }; - plb6 { compatible = "ibm,plb6"; #address-cells = <2>; @@ -501,6 +488,24 @@ /*RXDE*/ 4 &UIC1_2 13 0x4>; }; + mmc0: sdhci@020c0000 { + compatible = "st,sdhci-stih407", "st,sdhci"; + reg = <0x020c0000 0x20000>; + reg-names = "mmc"; + interrupts = <21 0x4>; + interrupt-parent = <&UIC1_3>; + interrupt-names = "mmcirq"; + pinctrl-names = "default"; + pinctrl-0 = <>; + clock-names = "mmc"; + clocks = <&mmc_clk>; + bus-width = <4>; + non-removable; + sd-uhs-sdr50; + sd-uhs-sdr104; + sd-uhs-ddr50; + }; + opb { compatible = "ibm,opb"; #address-cells = <1>; diff --git a/arch/powerpc/configs/44x/fsp2_defconfig b/arch/powerpc/configs/44x/fsp2_defconfig index e8e6a69..935aabe 100644 --- a/arch/powerpc/configs/44x/fsp2_defconfig +++ b/arch/powerpc/configs/44x/fsp2_defconfig @@ -92,8 +92,10 @@ CONFIG_MMC_DEBUG=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_OF_ARASAN=y +CONFIG_MMC_SDHCI_ST=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_M41T80=y +CONFIG_RESET_CONTROLLER=y CONFIG_EXT2_FS=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y
Add mmc0 changes for enabling arasan emmc and change defconfig appropriately. Signed-off-by: Ivan Mikhaylov <ivan@de.ibm.com> --- arch/powerpc/boot/dts/fsp2.dts | 33 +++++++++++++++++------------- arch/powerpc/configs/44x/fsp2_defconfig | 2 + 2 files changed, 21 insertions(+), 14 deletions(-)