mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-12-05 02:23:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

ARM: dts: ast2600: Update SDHCI nodes

Browse Source 
Match the description used by the Linux kernel, except use scu instead
of syscon as the phandle.

Signed-off-by: Joel Stanley <joel@jms.id.au>
This commit is contained in:
Joel Stanley 2022-06-23 18:35:28 +09:30 committed by Tom Rini
parent f760403f83
commit dedf8e3186
2 changed files with 35 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arch/arm/dts/ast2600-evb.dts
View File

@ -15,9 +15,9 @@
}; };
aliases { aliases {
mmc0 = &emmc_slot0; mmc0 = &emmc;
mmc1 = &sdhci_slot0; mmc1 = &sdhci0;
mmc2 = &sdhci_slot1; mmc2 = &sdhci1;
spi0 = &fmc; spi0 = &fmc;
spi1 = &spi1; spi1 = &spi1;
spi2 = &spi2; spi2 = &spi2;
@ -134,18 +134,16 @@
}; };
}; };
&emmc {
u-boot,dm-pre-reloc; &emmc_controller {
timing-phase = <0x700ff>; status = "okay";
}; };
&emmc_slot0 { &emmc {
u-boot,dm-pre-reloc; non-removable;
status = "okay"; bus-width = <4>;
bus-width = <4>; max-frequency = <100000000>;
pinctrl-names = "default"; clk-phase-mmc-hs200 = <9>, <225>;
pinctrl-0 = <&pinctrl_emmc_default>;
sdhci-drive-type = <1>;
}; };
&i2c4 { &i2c4 {

57
arch/arm/dts/ast2600.dtsi
View File

@ -416,60 +416,51 @@
status = "disabled"; status = "disabled";
}; };
sdhci: sdhci@1e740000 { sdc: sdc@1e740000 {
#interrupt-cells = <1>; compatible = "aspeed,ast2600-sd-controller";
compatible = "aspeed,aspeed-sdhci-irq", "simple-mfd"; reg = <0x1e740000 0x100>;
reg = <0x1e740000 0x1000>;
interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller;
clocks = <&scu ASPEED_CLK_GATE_SDCLK>,
<&scu ASPEED_CLK_GATE_SDEXTCLK>;
clock-names = "ctrlclk", "extclk";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0x0 0x1e740000 0x1000>; ranges = <0 0x1e740000 0x10000>;
clocks = <&scu ASPEED_CLK_GATE_SDCLK>;
status = "disabled";
sdhci_slot0: sdhci_slot0@100 { sdhci0: sdhci@1e740100 {
compatible = "aspeed,sdhci-ast2600"; compatible = "aspeed,ast2600-sdhci", "sdhci";
reg = <0x100 0x100>; reg = <0x100 0x100>;
interrupts = <0>; interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
interrupt-parent = <&sdhci>;
sdhci,auto-cmd12; sdhci,auto-cmd12;
clocks = <&scu ASPEED_CLK_SDIO>; clocks = <&scu ASPEED_CLK_SDIO>;
status = "disabled"; status = "disabled";
}; };
sdhci_slot1: sdhci_slot1@200 { sdhci1: sdhci@1e740200 {
compatible = "aspeed,sdhci-ast2600"; compatible = "aspeed,ast2600-sdhci", "sdhci";
reg = <0x200 0x100>; reg = <0x200 0x100>;
interrupts = <1>; interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
interrupt-parent = <&sdhci>;
sdhci,auto-cmd12; sdhci,auto-cmd12;
clocks = <&scu ASPEED_CLK_SDIO>; clocks = <&scu ASPEED_CLK_SDIO>;
status = "disabled"; status = "disabled";
}; };
}; };
emmc: emmc@1e750000 { emmc_controller: sdc@1e750000 {
#interrupt-cells = <1>; compatible = "aspeed,ast2600-sd-controller";
compatible = "aspeed,aspeed-emmc-irq", "simple-mfd"; reg = <0x1e750000 0x100>;
reg = <0x1e750000 0x1000>;
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller;
clocks = <&scu ASPEED_CLK_GATE_EMMCCLK>,
<&scu ASPEED_CLK_GATE_EMMCEXTCLK>;
clock-names = "ctrlclk", "extclk";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0x0 0x1e750000 0x1000>; ranges = <0 0x1e750000 0x10000>;
clocks = <&scu ASPEED_CLK_GATE_EMMCCLK>;
status = "disabled";
emmc_slot0: emmc_slot0@100 { emmc: sdhci@1e750100 {
compatible = "aspeed,emmc-ast2600"; compatible = "aspeed,ast2600-sdhci";
reg = <0x100 0x100>; reg = <0x100 0x100>;
interrupts = <0>; sdhci,auto-cmd12;
interrupt-parent = <&emmc>; interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&scu ASPEED_CLK_EMMC>; clocks = <&scu ASPEED_CLK_EMMC>;
status = "disabled"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_emmc_default>;
}; };
}; };