Omap device tree fixes for issue discovered during the merge window:
- Fix triggering for GPIO interrupts that's needed for 4430sdp Ethernet. Otherwise booting with nfsroot won't work. - Fix CPU operating point values - Fix wrong assumption that twl PMIC is always connected to omap3 - Add gpmc for am33xx so beaglebone users can use the bus - Cosmetic fix for mcspi pin muxing to avoid confusion -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJRi9DnAAoJEBvUPslcq6Vztw8QANBafpNr/TGhCZApZSwf5Vnf jjIibZ6twXd6fkJCiPHW+XOreJiIdQlhqRd90ChmdzSiEslsHtu1ayu6d0XCiNG8 Sqk4RCbV0QKsZ9Q//hXH0wXNsngezGaI2bistm/Vpp+bn5Ayj0et/CXVIRFIFZfl nVNnOjQYVEcod7GQYYO61sPv2wf+EqQCFZNgnHp29/v4+wijlPUO22HC/ONCmKKd FxpWmyYI80Xes620UjCbOIIOHRgCjZRdavZpocgBfJvDisBiFmXBU1eqWoIX4MVE tfxyy/eyQZBsupPiMrjnHSKNoP2jxmyL3k2HdTrjP6JMyW2+t8dljDlrY6VTBSet 4Sp3wJh441gMNuM0VsVIbTFDVLk5JP+JiDv67VGirRwO8qmJ3coxtj817BnaUR91 VFGVd6HaZjtIP1pvY/e/neWg4XYfsj9nhh9Lp1gWtpqavLq5/KhyMoVf/CDmBscn RywK4uEsFgcjewuL1HGKU1hdOCi7kuOmCC/rvWli3msoOClEGncFeEsEWE9VuT1B nxYo+zJQmpK12YRcjOPK3+eAl1RZy4kghOGComARjAJndguejn8HEU84c91veRga 2GHSab9IKtcb+am8Rzt8oH3T2/T2PKc5V80kh2ZXdwKC9RUHeKcdMZHpWllvkSJ+ FpdePNhjR7KPwIvUxoo1 =/Y67 -----END PGP SIGNATURE----- Merge tag 'omap-for-v3.10/dt-fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes From Tony Lindgren: Omap device tree fixes for issue discovered during the merge window: - Fix triggering for GPIO interrupts that's needed for 4430sdp Ethernet. Otherwise booting with nfsroot won't work. - Fix CPU operating point values - Fix wrong assumption that twl PMIC is always connected to omap3 - Add gpmc for am33xx so beaglebone users can use the bus - Cosmetic fix for mcspi pin muxing to avoid confusion * tag 'omap-for-v3.10/dt-fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: don't assume boards are using twl4030 for omap3 ARM: dts: Configure and fix the McSPI pins for 4430sdp ARM: dts: AM33XX: Add GPMC node ARM: dts: OMAP4460: Fix CPU OPP voltages ARM: dts: OMAP36xx: Fix CPU OPP voltages ARM: dts: OMAP4: Fix ethernet IRQ for OMAP4 boards
This commit is contained in:
commit
6e6a3af7f1
9 changed files with 35 additions and 9 deletions
|
@ -403,5 +403,17 @@
|
|||
0x44d80000 0x2000>; /* M3 DMEM */
|
||||
ti,hwmods = "wkup_m3";
|
||||
};
|
||||
|
||||
gpmc: gpmc@50000000 {
|
||||
compatible = "ti,am3352-gpmc";
|
||||
ti,hwmods = "gpmc";
|
||||
reg = <0x50000000 0x2000>;
|
||||
interrupts = <100>;
|
||||
num-cs = <7>;
|
||||
num-waitpins = <2>;
|
||||
#address-cells = <2>;
|
||||
#size-cells = <1>;
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -122,6 +122,7 @@
|
|||
|
||||
&usb_otg_hs {
|
||||
interface-type = <0>;
|
||||
usb-phy = <&usb2_phy>;
|
||||
mode = <3>;
|
||||
power = <50>;
|
||||
};
|
||||
|
|
|
@ -68,6 +68,7 @@
|
|||
|
||||
&usb_otg_hs {
|
||||
interface-type = <0>;
|
||||
usb-phy = <&usb2_phy>;
|
||||
mode = <3>;
|
||||
power = <50>;
|
||||
};
|
||||
|
|
|
@ -73,6 +73,7 @@
|
|||
|
||||
&usb_otg_hs {
|
||||
interface-type = <0>;
|
||||
usb-phy = <&usb2_phy>;
|
||||
mode = <3>;
|
||||
power = <50>;
|
||||
};
|
||||
|
|
|
@ -519,7 +519,6 @@
|
|||
interrupts = <0 92 0x4>, <0 93 0x4>;
|
||||
interrupt-names = "mc", "dma";
|
||||
ti,hwmods = "usb_otg_hs";
|
||||
usb-phy = <&usb2_phy>;
|
||||
multipoint = <1>;
|
||||
num-eps = <16>;
|
||||
ram-bits = <12>;
|
||||
|
|
|
@ -20,9 +20,9 @@
|
|||
cpu@0 {
|
||||
operating-points = <
|
||||
/* kHz uV */
|
||||
300000 975000
|
||||
600000 1075000
|
||||
800000 1200000
|
||||
300000 1012500
|
||||
600000 1200000
|
||||
800000 1325000
|
||||
>;
|
||||
clock-latency = <300000>; /* From legacy driver */
|
||||
};
|
||||
|
|
|
@ -223,6 +223,15 @@
|
|||
>;
|
||||
};
|
||||
|
||||
mcspi1_pins: pinmux_mcspi1_pins {
|
||||
pinctrl-single,pins = <
|
||||
0xf2 0x100 /* mcspi1_clk.mcspi1_clk INPUT | MODE0 */
|
||||
0xf4 0x100 /* mcspi1_somi.mcspi1_somi INPUT | MODE0 */
|
||||
0xf6 0x100 /* mcspi1_simo.mcspi1_simo INPUT | MODE0 */
|
||||
0xf8 0x100 /* mcspi1_cs0.mcspi1_cs0 INPUT | MODE0*/
|
||||
>;
|
||||
};
|
||||
|
||||
dss_hdmi_pins: pinmux_dss_hdmi_pins {
|
||||
pinctrl-single,pins = <
|
||||
0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */
|
||||
|
@ -358,12 +367,15 @@
|
|||
};
|
||||
|
||||
&mcspi1 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&mcspi1_pins>;
|
||||
|
||||
eth@0 {
|
||||
compatible = "ks8851";
|
||||
spi-max-frequency = <24000000>;
|
||||
reg = <0>;
|
||||
interrupt-parent = <&gpio2>;
|
||||
interrupts = <2>; /* gpio line 34 */
|
||||
interrupts = <2 8>; /* gpio line 34, low triggered */
|
||||
vdd-supply = <&vdd_eth>;
|
||||
};
|
||||
};
|
||||
|
|
|
@ -68,7 +68,7 @@
|
|||
spi-max-frequency = <24000000>;
|
||||
reg = <0>;
|
||||
interrupt-parent = <&gpio6>;
|
||||
interrupts = <11>; /* gpio line 171 */
|
||||
interrupts = <11 8>; /* gpio line 171, low triggered */
|
||||
vdd-supply = <&vdd_eth>;
|
||||
};
|
||||
};
|
||||
|
|
|
@ -15,9 +15,9 @@
|
|||
cpu@0 {
|
||||
operating-points = <
|
||||
/* kHz uV */
|
||||
350000 975000
|
||||
700000 1075000
|
||||
920000 1200000
|
||||
350000 1025000
|
||||
700000 1200000
|
||||
920000 1313000
|
||||
>;
|
||||
clock-latency = <300000>; /* From legacy driver */
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue