Yet more fixes for booting omaps with device tree
Subsystems (4)
Tony Lindgren
maintainercover Yet more fixes for booting omaps with device tree
Hi all,
Hopefully this is the last set for the -rc cycle on the legacy booting vs device tree booting regressions.
Regards,
Tony
Tony Lindgren (3):
ARM: OMAP2+: Fix more missing data for omap3.dtsi file
ARM: OMAP2+: Add fixed regulator to omap2plus_defconfig
ARM: OMAP2+: Fix eMMC on n900 with device tree
arch/arm/boot/dts/omap3-n900.dts | 6 +++++- arch/arm/boot/dts/omap3.dtsi | 42 ++++++++++++++++++++++++++++++++++++ arch/arm/configs/omap2plus_defconfig | 1 + arch/arm/mach-omap2/pdata-quirks.c | 1 + 4 files changed, 49 insertions(+), 1 deletion(-)
Signature · 1 line
1.8.1.1
Tony Lindgren
maintainerPATCH 1/3 ARM: OMAP2+: Fix more missing data for omap3.dtsi file
After dropping the duplicate data in hwmod that now should come from the .dts files, I noticed few more entries missing. Let's add these as otherwise devices relying on these won't work.
Looks like the side tone entries are bundled into the mcbsp1 to 3, so that may needs some special handling in the hwmod code as it's currently trying to look up mcbsp2_sidetone and mcbsp3_sidetone entries.
--- arch/arm/boot/dts/omap3.dtsi | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+)
arch/arm/boot/dts/omap3.dtsi +42 -0
@@ -82,6 +82,13 @@ ranges; ti,hwmods = "l3_main"; + aes: aes at 480c5000 { + compatible = "ti,omap3-aes"; + ti,hwmods = "aes"; + reg = <0x480c5000 0x50>; + interrupts = <0>; + }; + counter32k: counter at 48320000 { compatible = "ti,omap-counter32k"; reg = <0x48320000 0x20>;
@@ -260,6 +267,13 @@ ti,hwmods = "i2c3"; }; + mailbox: mailbox at 48094000 { + compatible = "ti,omap3-mailbox"; + ti,hwmods = "mailbox"; + reg = <0x48094000 0x200>; + interrupts = <26>; + }; + mcspi1: spi at 48098000 { compatible = "ti,omap2-mcspi"; reg = <0x48098000 0x100>;
@@ -357,6 +371,13 @@ dma-names = "tx", "rx"; }; + mmu_isp: mmu at 480bd400 { + compatible = "ti,omap3-mmu-isp"; + ti,hwmods = "mmu_isp"; + reg = <0x480bd400 0x80>; + interrupts = <8>; + }; + wdt2: wdt at 48314000 { compatible = "ti,omap3-wdt"; reg = <0x48314000 0x80>;
@@ -442,6 +463,27 @@ dma-names = "tx", "rx"; }; + sham: sham at 480c3000 { + compatible = "ti,omap3-sham"; + ti,hwmods = "sham"; + reg = <0x480c3000 0x64>; + interrupts = <49>; + }; + + smartreflex_core: smartreflex at 480cb000 { + compatible = "ti,omap3-smartreflex-core"; + ti,hwmods = "smartreflex_core"; + reg = <0x480cb000 0x400>; + interrupts = <19>; + }; + + smartreflex_mpu_iva: smartreflex at 480c9000 { + compatible = "ti,omap3-smartreflex-iva"; + ti,hwmods = "smartreflex_mpu_iva"; + reg = <0x480c9000 0x400>; + interrupts = <18>; + }; + timer1: timer at 48318000 { compatible = "ti,omap3430-timer"; reg = <0x48318000 0x400>;
Signature · 1 line
1.8.1.1
Tony Lindgren
maintainerPATCH 2/3 ARM: OMAP2+: Add fixed regulator to omap2plus_defconfig
In reply to Tony LindgrenWe do not have REGULATOR_FIXED selected if no boards are selected and we boot with device tree. This can cause various devices to fail.
--- arch/arm/configs/omap2plus_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/omap2plus_defconfig +1 -0
@@ -173,6 +173,7 @@ CONFIG_MFD_PALMAS=y CONFIG_MFD_TPS65217=y CONFIG_MFD_TPS65910=y CONFIG_TWL6040_CORE=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_PALMAS=y CONFIG_REGULATOR_TPS65023=y CONFIG_REGULATOR_TPS6507X=y
Signature · 1 line
1.8.1.1
Tony Lindgren
maintainerPATCH 3/3 ARM: OMAP2+: Fix eMMC on n900 with device tree
In reply to Tony LindgrenLooks like we need to configure the regulators and use the pdata quirk to make eMMC work with device tree.
It seems that mostly vmmc2 is used, and only some earlier revisions like the macro board used vaux3.
Note that we can add support for the macro board later as needed by including the common n900 .dts file and configuring the vaux3 instead of vmmc2, and adding support for the smc91x Ethernet.
---
Can you guys please test this on production n900 devices?
I've tested it with my old macro board where I had to patch in vaux3 instead of vmmc2. I think there's some confusion in the legacy code comments, or else I'm confused. In any case, vaux3 works for the macro board, and I suspect that the production versions have vmmc2.
If this does not work and vaux3 as regulator works, please also dump out the system_rev from your board.
--- arch/arm/boot/dts/omap3-n900.dts | 6 +++++- arch/arm/mach-omap2/pdata-quirks.c | 1 + 2 files changed, 6 insertions(+), 1 deletion(-)
arch/arm/boot/dts/omap3-n900.dts +5 -1
@@ -359,7 +359,11 @@ }; &mmc2 { - status = "disabled"; + /* most boards use vmmc2, only the macro boards use vaux3 */ + vmmc-supply = <&vmmc2>; + vmmc_aux-supply = <&vsim>; + bus-width = <8>; + non-removable; }; &mmc3 {
arch/arm/mach-omap2/pdata-quirks.c +1 -0
@@ -139,6 +139,7 @@ struct of_dev_auxdata omap_auxdata_lookup[] __initdata = { static struct pdata_init pdata_quirks[] __initdata = {#ifdef CONFIG_ARCH_OMAP3 + { "nokia,omap3-n900", hsmmc2_internal_input_clk, }, { "nokia,omap3-n9", hsmmc2_internal_input_clk, }, { "nokia,omap3-n950", hsmmc2_internal_input_clk, }, { "isee,omap3-igep0020", omap3_igep0020_legacy_init, },
Signature · 1 line
1.8.1.1
PATCH 3/3 ARM: OMAP2+: Fix eMMC on n900 with device tree
Hi Tony,
Quoted 14 lines · Tony Lindgren
Looks like we need to configure the regulators and use the pdata quirk to make eMMC work with device tree.
It seems that mostly vmmc2 is used, and only some earlier revisions like the macro board used vaux3.
Note that we can add support for the macro board later as needed by including the common n900 .dts file and configuring the vaux3 instead of vmmc2, and adding support for the smc91x Ethernet.
---
Can you guys please test this on production n900 devices?
Quoted 7 lines
I've tested it with my old macro board where I had to patch in vaux3 instead of vmmc2. I think there's some confusion in the legacy code comments, or else I'm confused. In any case, vaux3 works for the macro board, and I suspect that the production versions have vmmc2.
If this does not work and vaux3 as regulator works, please also dump out the
system_revfrom your board.
The good news is, that I got eMMC working :) The bad news is, that it did not work with your patch :( I included my DTS nodes below. The phone is HW/System revision 0x2101.
I have a second N900, which has HW revision 0x2204. I did not yet test the patch with this phone, but legacy code also seems to use vaux3 for it. Seems like we need two n900.dts files?
--- DTS nodes working on the 0x2101 board ---
&omap3_pmx_core {
mmc2_pins: pinmux_mmc2_pins {
pinctrl-single,pins = <
0x128 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_clk */
0x12a (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_cmd */
0x12c (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat0 */
0x12e (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1 */
0x130 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat2 */
0x132 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat3 */
0x134 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat4 */
0x136 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat5 */
0x138 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat6 */
0x13a (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat7 */
>;
};
};&mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&vaux3>;
vmmc_aux-supply = <&vsim>;
bus-width = <8>;
non-removable;
};-- Sebastian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131122/9b244e1d/attachment.sig>
Tony Lindgren
maintainerPATCH 3/3 ARM: OMAP2+: Fix eMMC on n900 with device tree
Quoted 22 lines · Sebastian Reichel
Hi Tony,
Quoted 19 lines · Tony Lindgren
Looks like we need to configure the regulators and use the pdata quirk to make eMMC work with device tree.
It seems that mostly vmmc2 is used, and only some earlier revisions like the macro board used vaux3.
Note that we can add support for the macro board later as needed by including the common n900 .dts file and configuring the vaux3 instead of vmmc2, and adding support for the smc91x Ethernet.
---
Can you guys please test this on production n900 devices?
I've tested it with my old macro board where I had to patch in vaux3 instead of vmmc2. I think there's some confusion in the legacy code comments, or else I'm confused. In any case, vaux3 works for the macro board, and I suspect that the production versions have vmmc2.
Quoted 6 lines
Quoted 2 lines
If this does not work and vaux3 as regulator works, please also dump out the
system_revfrom your board.The good news is, that I got eMMC working :) The bad news is, that it did not work with your patch :( I included my DTS nodes below. The phone is HW/System revision
0x2101.
Oh ok, I must have parsed the revisions wrong way then, and the macro I tried it on must be something newer than I thought :)
Quoted 3 lines
I have a second N900, which has HW revision
0x2204. I did not yet test the patch with this phone, but legacy code also seems to use vaux3 for it. Seems like we need twon900.dtsfiles?
Well let's use just vaux3 then with a comment to the .dts file if that works also on your 0x2204. It works on my 0x0010 too.
I folded in your changes to the updated patch below. Care to reply with your Signed-off-by too assuming it works also on your 0x2204 n900?
Regards,
Tony
From: Tony Lindgren <[email protected]>
Date: Wed, 20 Nov 2013 18:03:39 -0800
Subject: [PATCH] ARM: OMAP2+: Fix eMMC on n900 with device tree
Looks like we need to configure the regulators and use the pdata quirk to make eMMC work with device tree.
It seems that mostly vaux3 is used, and only some earlier revisions used vmmc2. This has been tested to work on devices where the system_rev passed by the bootloader has versions 0x0010 and 0x2101.
arch/arm/boot/dts/omap3-n900.dts +22 -1
@@ -125,6 +125,21 @@ >; }; + mmc2_pins: pinmux_mmc2_pins { + pinctrl-single,pins = < + 0x128 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_clk */ + 0x12a (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_cmd */ + 0x12c (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat0 */ + 0x12e (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1 */ + 0x130 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat2 */ + 0x132 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat3 */ + 0x134 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat4 */ + 0x136 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat5 */ + 0x138 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat6 */ + 0x13a (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat7 */ + >; + }; + display_pins: pinmux_display_pins { pinctrl-single,pins = < 0x0d4 (PIN_OUTPUT | MUX_MODE4) /* RX51_LCD_RESET_GPIO */
@@ -358,8 +373,14 @@ cd-gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>; /* 160 */ }; +/* most boards use vaux3, only some old versions use vmmc2 instead */ &mmc2 { - status = "disabled"; + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_pins>; + vmmc-supply = <&vaux3>; + vmmc_aux-supply = <&vsim>; + bus-width = <8>; + non-removable; }; &mmc3 {
arch/arm/mach-omap2/pdata-quirks.c +1 -0
@@ -139,6 +139,7 @@ struct of_dev_auxdata omap_auxdata_lookup[] __initdata = { static struct pdata_init pdata_quirks[] __initdata = {#ifdef CONFIG_ARCH_OMAP3 + { "nokia,omap3-n900", hsmmc2_internal_input_clk, }, { "nokia,omap3-n9", hsmmc2_internal_input_clk, }, { "nokia,omap3-n950", hsmmc2_internal_input_clk, }, { "isee,omap3-igep0020", omap3_igep0020_legacy_init, },
PATCH 3/3 ARM: OMAP2+: Fix eMMC on n900 with device tree
Quoted 5 lines · Tony Lindgren
Well let's use just vaux3 then with a comment to the .dts file if that works also on your
0x2204. It works on my0x0010too.I folded in your changes to the updated patch below. Care to reply with your Signed-off-by too assuming it works also on your
0x2204n900?
It does work with the 0x2204 phone.
-- Sebastian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131122/f13c7aaf/attachment.sig>
Tony Lindgren
maintainerPATCH 3/3 ARM: OMAP2+: Fix eMMC on n900 with device tree
Quoted 10 lines · Sebastian Reichel
Quoted 5 lines · Tony Lindgren
Well let's use just vaux3 then with a comment to the .dts file if that works also on your
0x2204. It works on my0x0010too.I folded in your changes to the updated patch below. Care to reply with your Signed-off-by too assuming it works also on your
0x2204n900?It does work with the
0x2204phone.Signed-off-by Sebastian Reichel <[email protected]>
OK good to hear. I'll update the patch with that.
Thanks,
Tony