Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50e4b5ca authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'ti-sysc-fixes' into fixes

parents 58e16d79 5b63fb90

arch/arm/boot/dts/am33xx.dtsi

+26 −6
Original line number Diff line number Diff line
@@ -234,13 +234,33 @@ 
			interrupt-names = "edma3_tcerrint";

		};



		mmc3: mmc@47810000 {

			compatible = "ti,omap4-hsmmc";

		target-module@47810000 {

			compatible = "ti,sysc-omap2", "ti,sysc";

			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;

				interrupts = <29>;

			reg = <0x47810000 0x1000>;

			status = "disabled";

				reg = <0x0 0x1000>;

			};

		};



		usb: usb@47400000 {

arch/arm/boot/dts/am4372.dtsi

+26 −6
Original line number Diff line number Diff line
@@ -228,13 +228,33 @@ 
			interrupt-names = "edma3_tcerrint";

		};



		mmc3: mmc@47810000 {

			compatible = "ti,omap4-hsmmc";

			reg = <0x47810000 0x1000>;

		target-module@47810000 {

			compatible = "ti,sysc-omap2", "ti,sysc";

			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;

				interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

				reg = <0x0 0x1000>;

			};

		};



		sham: sham@53100000 {