UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'ti-sysc-fixes' into fixes

This commit is contained in:
Tony Lindgren 2019-08-13 04:04:16 -07:00
parent 58e16d792a 5b63fb90ad
commit 50e4b5cac4
2 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/arm/boot/dts/am33xx.dtsi
View File

@ -234,13 +234,33 @@
interrupt-names = "edma3_tcerrint"; interrupt-names = "edma3_tcerrint";
}; };
mmc3: mmc@47810000 { target-module@47810000 {
compatible = "ti,omap4-hsmmc"; compatible = "ti,sysc-omap2", "ti,sysc";
ti,hwmods = "mmc3"; ti,hwmods = "mmc3";
reg = <0x478102fc 0x4>,
<0x47810110 0x4>,
<0x47810114 0x4>;
reg-names = "rev", "sysc", "syss";
ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
SYSC_OMAP2_ENAWAKEUP |
SYSC_OMAP2_SOFTRESET |
SYSC_OMAP2_AUTOIDLE)>;
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
<SYSC_IDLE_NO>,
<SYSC_IDLE_SMART>;
ti,syss-mask = <1>;
clocks = <&l3s_clkctrl AM3_L3S_MMC3_CLKCTRL 0>;
clock-names = "fck";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x47810000 0x1000>;
mmc3: mmc@0 {
compatible = "ti,omap4-hsmmc";
ti,needs-special-reset; ti,needs-special-reset;
interrupts = <29>; interrupts = <29>;
reg = <0x47810000 0x1000>; reg = <0x0 0x1000>;
status = "disabled"; };
}; };
usb: usb@47400000 { usb: usb@47400000 {

28
arch/arm/boot/dts/am4372.dtsi
View File

@ -228,13 +228,33 @@
interrupt-names = "edma3_tcerrint"; interrupt-names = "edma3_tcerrint";
}; };
mmc3: mmc@47810000 { target-module@47810000 {
compatible = "ti,omap4-hsmmc"; compatible = "ti,sysc-omap2", "ti,sysc";
reg = <0x47810000 0x1000>;
ti,hwmods = "mmc3"; ti,hwmods = "mmc3";
reg = <0x478102fc 0x4>,
<0x47810110 0x4>,
<0x47810114 0x4>;
reg-names = "rev", "sysc", "syss";
ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
SYSC_OMAP2_ENAWAKEUP |
SYSC_OMAP2_SOFTRESET |
SYSC_OMAP2_AUTOIDLE)>;
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
<SYSC_IDLE_NO>,
<SYSC_IDLE_SMART>;
ti,syss-mask = <1>;
clocks = <&l3s_clkctrl AM4_L3S_MMC3_CLKCTRL 0>;
clock-names = "fck";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x47810000 0x1000>;
mmc3: mmc@0 {
compatible = "ti,omap4-hsmmc";
ti,needs-special-reset; ti,needs-special-reset;
interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled"; reg = <0x0 0x1000>;
};
}; };
sham: sham@53100000 { sham: sham@53100000 {