Skip to content

Commit 0d55f2a

Browse files
olofjolofj
committed
Merge tag 'omap-for-v4.15/fixes-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Fixes for omaps for v4.15-rc cycle with two fixes for hangs with the rest being compiler warning fixes and fixes for power states and devices on various boards: - Fix smatch issue introduced by recent omap device changes for legacy resources - Fix SRAM virt to phys related boot hang affecting n900 and other omap3 hs devices found by pending CMA changes. While it seems that we have not hit this in other use cases, let's fix it to avoid a nasty and hard to find suprise as right now there is just luck keeping the SRAM virtual address to physical address translation working with the 0xffff high_mask. - Fix am335x reading of domain state registers that only exist for the PM_CEFUSE domain and produce wrong results for other domains - Fix missing setting for error code for omap device if allocation fails - Fix missing modules_offs for omap3 MMC3 affecting n9/n950 - Fix cm_split_idlest() reading reserved registers showing wrong idlestatus - Fixes to correct #phy-cells property for compiler warnings that recently started happening - Add a missing OHCI remote-wakeup-connected property that I was supposed to merge after the ohci-omap3 to ohci-platform changes but somehow managed to drop. I only noticed this was missing while debugging the OHCI/EHCI GPS and modem hang - Fix a system hang with GPS or modem connected to the OHCI/EHCI bus that typically happened within 20 - 40 minutes on an idle system. This turned out to be an issue caused by using the parent interrupt controller directly with the WUGEN + GIC stacked interrupt controller domains - Fixes for logicpd-somlv GPMC for Ethernet and NAND that clearly have been broken since we changed GPMC to use the interrupt controller binding for some pins. And fix the wrong pin muxing for WLAN while at it - Fixes for am437x interrupt and dma properties to fix compiler warnings that recently started happening * tag 'omap-for-v4.15/fixes-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: am437x-cm-t43: Correct the dmas property of spi0 ARM: dts: am4372: Correct the interrupts_properties of McASP ARM: dts: logicpd-somlv: Fix wl127x pinmux ARM: dts: logicpd-som-lv: Fix gpmc addresses for NAND and enet ARM: dts: Fix omap4 hang with GPS connected to USB by using wakeupgen ARM: OMAP2+: Missing error code in omap_device_build() ARM: AM33xx: PRM: Remove am33xx_pwrdm_read_prev_pwrst function ARM: OMAP2+: Fix SRAM virt to phys translation for save_secure_ram_context ARM: dts: Add remote-wakeup-connected for omap OHCI ARM: dts: am33xx: Add missing #phy-cells to ti,am335x-usb-phy ARM: dts: omap: Add missing #phy-cells to usb-nop-xceiv ARM: OMAP2+: Fix smatch found issue for omap_device ARM: OMAP2/3: CM: fix cm_split_idlest functionality ARM: OMAP3: hwmod_data: add missing module_offs for MMC3 Signed-off-by: Olof Johansson <[email protected]>
2 parents 8d810a4 + 7cd4a5e commit 0d55f2a

37 files changed

+90
-66
lines changed

‎Documentation/devicetree/bindings/usb/am33xx-usb.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ usb: usb@47400000 {
9595
reg = <0x47401300 0x100>;
9696
reg-names = "phy";
9797
ti,ctrl_mod = <&ctrl_mod>;
98+
#phy-cells = <0>;
9899
};
99100

100101
usb0: usb@47401000 {
@@ -141,6 +142,7 @@ usb: usb@47400000 {
141142
reg = <0x47401b00 0x100>;
142143
reg-names = "phy";
143144
ti,ctrl_mod = <&ctrl_mod>;
145+
#phy-cells = <0>;
144146
};
145147

146148
usb1: usb@47401800 {

‎arch/arm/boot/dts/am33xx.dtsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,7 @@
630630
reg-names = "phy";
631631
status = "disabled";
632632
ti,ctrl_mod = <&usb_ctrl_mod>;
633+
#phy-cells = <0>;
633634
};
634635

635636
usb0: usb@47401000 {
@@ -678,6 +679,7 @@
678679
reg-names = "phy";
679680
status = "disabled";
680681
ti,ctrl_mod = <&usb_ctrl_mod>;
682+
#phy-cells = <0>;
681683
};
682684

683685
usb1: usb@47401800 {

‎arch/arm/boot/dts/am4372.dtsi‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,8 @@
927927
reg = <0x48038000 0x2000>,
928928
<0x46000000 0x400000>;
929929
reg-names = "mpu", "dat";
930-
interrupts = <80>, <81>;
930+
interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,
931+
<GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
931932
interrupt-names = "tx", "rx";
932933
status = "disabled";
933934
dmas = <&edma 8 2>,
@@ -941,7 +942,8 @@
941942
reg = <0x4803C000 0x2000>,
942943
<0x46400000 0x400000>;
943944
reg-names = "mpu", "dat";
944-
interrupts = <82>, <83>;
945+
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>,
946+
<GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
945947
interrupt-names = "tx", "rx";
946948
status = "disabled";
947949
dmas = <&edma 10 2>,

‎arch/arm/boot/dts/am437x-cm-t43.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,8 @@
301301
status = "okay";
302302
pinctrl-names = "default";
303303
pinctrl-0 = <&spi0_pins>;
304-
dmas = <&edma 16
305-
&edma 17>;
304+
dmas = <&edma 16 0
305+
&edma 17 0>;
306306
dma-names = "tx0", "rx0";
307307

308308
flash: w25q64cvzpig@0 {

‎arch/arm/boot/dts/dm814x.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
reg = <0x47401300 0x100>;
7676
reg-names = "phy";
7777
ti,ctrl_mod = <&usb_ctrl_mod>;
78+
#phy-cells = <0>;
7879
};
7980

8081
usb0: usb@47401000 {

‎arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@
7272
};
7373

7474
&gpmc {
75-
ranges = <1 0 0x08000000 0x1000000>; /* CS1: 16MB for LAN9221 */
75+
ranges = <0 0 0x30000000 0x1000000 /* CS0: 16MB for NAND */
76+
1 0 0x2c000000 0x1000000>; /* CS1: 16MB for LAN9221 */
7677

7778
ethernet@gpmc {
7879
pinctrl-names = "default";

‎arch/arm/boot/dts/logicpd-som-lv.dtsi‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,12 @@
3333
hsusb2_phy: hsusb2_phy {
3434
compatible = "usb-nop-xceiv";
3535
reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; /* gpio_4 */
36+
#phy-cells = <0>;
3637
};
3738
};
3839

3940
&gpmc {
40-
ranges = <0 0 0x00000000 0x1000000>; /* CS0: 16MB for NAND */
41+
ranges = <0 0 0x30000000 0x1000000>; /* CS0: 16MB for NAND */
4142

4243
nand@0,0 {
4344
compatible = "ti,omap2-nand";
@@ -121,7 +122,7 @@
121122

122123
&mmc3 {
123124
interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>;
124-
pinctrl-0 = <&mmc3_pins>;
125+
pinctrl-0 = <&mmc3_pins &wl127x_gpio>;
125126
pinctrl-names = "default";
126127
vmmc-supply = <&wl12xx_vmmc>;
127128
non-removable;
@@ -132,8 +133,8 @@
132133
wlcore: wlcore@2 {
133134
compatible = "ti,wl1273";
134135
reg = <2>;
135-
interrupt-parent = <&gpio5>;
136-
interrupts = <24 IRQ_TYPE_LEVEL_HIGH>; /* gpio 152 */
136+
interrupt-parent = <&gpio1>;
137+
interrupts = <2 IRQ_TYPE_LEVEL_HIGH>; /* gpio 2 */
137138
ref-clock-frequency = <26000000>;
138139
};
139140
};
@@ -157,8 +158,6 @@
157158
OMAP3_CORE1_IOPAD(0x2166, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat5.sdmmc3_dat1 */
158159
OMAP3_CORE1_IOPAD(0x2168, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat2 */
159160
OMAP3_CORE1_IOPAD(0x216a, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat3 */
160-
OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT_PULLUP | MUX_MODE4) /* mcbsp4_clkx.gpio_152 */
161-
OMAP3_CORE1_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */
162161
OMAP3_CORE1_IOPAD(0x21d0, PIN_INPUT_PULLUP | MUX_MODE3) /* mcspi1_cs1.sdmmc3_cmd */
163162
OMAP3_CORE1_IOPAD(0x21d2, PIN_INPUT_PULLUP | MUX_MODE3) /* mcspi1_cs2.sdmmc_clk */
164163
>;
@@ -228,6 +227,12 @@
228227
OMAP3_WKUP_IOPAD(0x2a0e, PIN_OUTPUT | MUX_MODE4) /* sys_boot2.gpio_4 */
229228
>;
230229
};
230+
wl127x_gpio: pinmux_wl127x_gpio_pin {
231+
pinctrl-single,pins = <
232+
OMAP3_WKUP_IOPAD(0x2a0c, PIN_INPUT | MUX_MODE4) /* sys_boot0.gpio_2 */
233+
OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */
234+
>;
235+
};
231236
};
232237

233238
&omap3_pmx_core2 {

‎arch/arm/boot/dts/omap3-beagle-xm.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
compatible = "usb-nop-xceiv";
9191
reset-gpios = <&gpio5 19 GPIO_ACTIVE_LOW>; /* gpio_147 */
9292
vcc-supply = <&hsusb2_power>;
93+
#phy-cells = <0>;
9394
};
9495

9596
tfp410: encoder0 {

‎arch/arm/boot/dts/omap3-beagle.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
compatible = "usb-nop-xceiv";
6565
reset-gpios = <&gpio5 19 GPIO_ACTIVE_LOW>; /* gpio_147 */
6666
vcc-supply = <&hsusb2_power>;
67+
#phy-cells = <0>;
6768
};
6869

6970
sound {

‎arch/arm/boot/dts/omap3-cm-t3x.dtsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,14 @@
4343
hsusb1_phy: hsusb1_phy {
4444
compatible = "usb-nop-xceiv";
4545
vcc-supply = <&hsusb1_power>;
46+
#phy-cells = <0>;
4647
};
4748

4849
/* HS USB Host PHY on PORT 2 */
4950
hsusb2_phy: hsusb2_phy {
5051
compatible = "usb-nop-xceiv";
5152
vcc-supply = <&hsusb2_power>;
53+
#phy-cells = <0>;
5254
};
5355

5456
ads7846reg: ads7846-reg {

0 commit comments

Comments
 (0)