tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'ti-sysc-fixes' into fixes
+52
-12
+26
-6
arch/arm/boot/dts/am33xx.dtsi
+26
-6
arch/arm/boot/dts/am33xx.dtsi
···
234
234
interrupt-names = "edma3_tcerrint";
235
235
};
236
236
237
-
mmc3: mmc@47810000 {
238
-
compatible = "ti,omap4-hsmmc";
237
+
target-module@47810000 {
238
+
compatible = "ti,sysc-omap2", "ti,sysc";
239
239
ti,hwmods = "mmc3";
240
-
ti,needs-special-reset;
241
-
interrupts = <29>;
242
-
reg = <0x47810000 0x1000>;
243
-
status = "disabled";
240
+
reg = <0x478102fc 0x4>,
241
+
<0x47810110 0x4>,
242
+
<0x47810114 0x4>;
243
+
reg-names = "rev", "sysc", "syss";
244
+
ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
245
+
SYSC_OMAP2_ENAWAKEUP |
246
+
SYSC_OMAP2_SOFTRESET |
247
+
SYSC_OMAP2_AUTOIDLE)>;
248
+
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
249
+
<SYSC_IDLE_NO>,
250
+
<SYSC_IDLE_SMART>;
251
+
ti,syss-mask = <1>;
252
+
clocks = <&l3s_clkctrl AM3_L3S_MMC3_CLKCTRL 0>;
253
+
clock-names = "fck";
254
+
#address-cells = <1>;
255
+
#size-cells = <1>;
256
+
ranges = <0x0 0x47810000 0x1000>;
257
+
258
+
mmc3: mmc@0 {
259
+
compatible = "ti,omap4-hsmmc";
260
+
ti,needs-special-reset;
261
+
interrupts = <29>;
262
+
reg = <0x0 0x1000>;
263
+
};
244
264
};
245
265
246
266
usb: usb@47400000 {
+26
-6
arch/arm/boot/dts/am4372.dtsi
+26
-6
arch/arm/boot/dts/am4372.dtsi
···
228
228
interrupt-names = "edma3_tcerrint";
229
229
};
230
230
231
-
mmc3: mmc@47810000 {
232
-
compatible = "ti,omap4-hsmmc";
233
-
reg = <0x47810000 0x1000>;
231
+
target-module@47810000 {
232
+
compatible = "ti,sysc-omap2", "ti,sysc";
234
233
ti,hwmods = "mmc3";
235
-
ti,needs-special-reset;
236
-
interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
237
-
status = "disabled";
234
+
reg = <0x478102fc 0x4>,
235
+
<0x47810110 0x4>,
236
+
<0x47810114 0x4>;
237
+
reg-names = "rev", "sysc", "syss";
238
+
ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
239
+
SYSC_OMAP2_ENAWAKEUP |
240
+
SYSC_OMAP2_SOFTRESET |
241
+
SYSC_OMAP2_AUTOIDLE)>;
242
+
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
243
+
<SYSC_IDLE_NO>,
244
+
<SYSC_IDLE_SMART>;
245
+
ti,syss-mask = <1>;
246
+
clocks = <&l3s_clkctrl AM4_L3S_MMC3_CLKCTRL 0>;
247
+
clock-names = "fck";
248
+
#address-cells = <1>;
249
+
#size-cells = <1>;
250
+
ranges = <0x0 0x47810000 0x1000>;
251
+
252
+
mmc3: mmc@0 {
253
+
compatible = "ti,omap4-hsmmc";
254
+
ti,needs-special-reset;
255
+
interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
256
+
reg = <0x0 0x1000>;
257
+
};
238
258
};
239
259
240
260
sham: sham@53100000 {