Skip to contentSkip to conversation

omap device tree changes for v3.15

GIT PULL Tony Lindgren 3 participants 9 messages Mar 3, 2014 – May 5, 2014 4 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): pull-1393802089-910509

#1 lore raw
Quoted 10 lines · Tony Lindgren

The following changes since commit 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2:

Linux 3.14-rc3 (2014-02-16 13:30:25 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.15/dt-signed

for you to fetch changes up to f777ba1780584b100ab9664cc06d04f3bb273a84:

Quoted 7 lines

Merge tag 'for_3.15/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.15/dt (2014-03-02 14:22:03 -0800)

----------------------------------------------------------------

Device tree related changes for omaps with minor code changes also to platform data quirks that are still needed for some features.

FYI, this probably causes a minor overlapping additions conflict with the recently merged fixes. My resolve below for reference.

Regards,

Tony

--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@@ -172,21 -194,42 +196,58 @@@ static void __init am35xx_emac_reset(vo
omap_ctrl_readl(AM35XX_CONTROL_IP_SW_RESET); /* OCP barrier */
}

+static void __init nokia_n900_legacy_init(void) +{
+ hsmmc2_internal_input_clk();
+
+ if (omap_type() == OMAP2_DEVICE_TYPE_SEC) {
+ if (IS_ENABLED(CONFIG_ARM_ERRATA_430973)) {
+ pr_info("RX-51: Enabling ARM errata 430973 workaround\n");
+ /* set IBE to 1 */
+ rx51_secure_update_aux_cr(BIT(6), 0);
+ } else {
+ pr_warning("RX-51: Not enabling ARM errata 430973 workaround\n");
+ pr_warning("Thumb binaries may crash randomly without this workaround\n");
+ }
+ }
+}
++
+ static struct gpio cm_t3517_wlan_gpios[] __initdata = {
+ { 56, GPIOF_OUT_INIT_HIGH, "wlan pwr" },
+ { 4, GPIOF_OUT_INIT_HIGH, "xcvr noe" },
+ };
+
+ static void __init omap3_sbc_t3517_wifi_init(void)
+ {
+ int err = gpio_request_array(cm_t3517_wlan_gpios,
+ ARRAY_SIZE(cm_t3517_wlan_gpios));
+ if (err) {
+ pr_err("SBC-T3517: wl12xx gpios request failed: %d\n", err);
+ return;
+ }
+
+ gpio_export(cm_t3517_wlan_gpios[0].gpio, 0);
+ gpio_export(cm_t3517_wlan_gpios[1].gpio, 0);
+
+ msleep(100);
+ gpio_set_value(cm_t3517_wlan_gpios[1].gpio, 0);
+ }
+
+ static void __init omap3_sbc_t3517_legacy_init(void)
+ {
+ omap3_sbc_t3x_usb_hub_init(152, "cm-t3517 usb hub");
+ omap3_sbc_t3x_usb_hub_init(98, "sb-t35 usb hub");
+ am35xx_emac_reset();
+ hsmmc2_internal_input_clk();
+ omap3_sbc_t3517_wifi_init();
+ legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 145);
+ omap_ads7846_init(1, 57, 0, NULL);
+ }
+
+ static void __init am3517_evm_legacy_init(void)
+ {
+ am35xx_emac_reset();
+ }
#endif /* CONFIG_ARCH_OMAP3 */

#ifdef CONFIG_ARCH_OMAP4
@@@ -277,8 -319,10 +338,10 @@@ struct of_dev_auxdata omap_auxdata_look
*/
static struct pdata_init pdata_quirks[] __initdata = { #ifdef CONFIG_ARCH_OMAP3
+ { "compulab,omap3-sbc-t3517", omap3_sbc_t3517_legacy_init, },
+ { "compulab,omap3-sbc-t3530", omap3_sbc_t3530_legacy_init, },
{ "compulab,omap3-sbc-t3730", omap3_sbc_t3730_legacy_init, },
- { "nokia,omap3-n900", hsmmc2_internal_input_clk, },
+ { "nokia,omap3-n900", nokia_n900_legacy_init, },
{ "nokia,omap3-n9", hsmmc2_internal_input_clk, },
{ "nokia,omap3-n950", hsmmc2_internal_input_clk, }, { "isee,omap3-igep0020", omap3_igep0020_legacy_init, },

#2 lore raw
Quoted 13 lines · Tony Lindgren
Quoted 12 lines · Tony Lindgren

The following changes since commit 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2:

Linux 3.14-rc3 (2014-02-16 13:30:25 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.15/dt-signed

for you to fetch changes up to f777ba1780584b100ab9664cc06d04f3bb273a84:

Merge tag 'for_3.15/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.15/dt (2014-03-02 14:22:03 -0800)

Quoted 8 lines
Quoted 5 lines

----------------------------------------------------------------

Device tree related changes for omaps with minor code changes also to platform data quirks that are still needed for some features.

FYI, this probably causes a minor overlapping additions conflict with the recently merged fixes. My resolve below for reference.

D'oh, saw this after I did the merge. Yes, same resolution as I used.

-Olof

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw

[GIT PULL 2/4] omap prcm changes for v3.15

Quoted 11 lines · Tony Lindgren

The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:

Linus 3.14-rc1 (2014-02-02 16:42:13 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.15/prcm-signed

for you to fetch changes up to 9ed5811ddd32eb02140783095f1fec7d12fb3eb9:

Merge tag 'for-v3.15/omap-hwmod-clk-prcm-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.15/prcm (2014-02-28 15:41:55 -0800)

Pulled into next/soc. Thanks.

-Olof

A message that is not in the archive (sent off-list or not yet received): [email protected]

#6 lore raw
Quoted 11 lines · Tony Lindgren

The following changes since commit 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2:

Linux 3.14-rc3 (2014-02-16 13:30:25 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.15/dt-signed

for you to fetch changes up to f777ba1780584b100ab9664cc06d04f3bb273a84:

Merge tag 'for_3.15/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.15/dt (2014-03-02 14:22:03 -0800)

Merged, this had an add/add conflict with "ARM: OMAP2+: Add support for thumb mode on DT booted N900" that I had to resolve.

-Olof

A message that is not in the archive (sent off-list or not yet received): [email protected]

#8 lore raw

[GIT PULL 4/4] omap crossbar support for v3.15

Quoted 19 lines · Tony Lindgren

The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:

Linus 3.14-rc1 (2014-02-02 16:42:13 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.15/crossbar-signed

for you to fetch changes up to 9594274201ac3c67d5c569aae63792e58bcd33e6:

Merge branch 'crossbar_3.14_rc1' of git://github.com/Sricharanti/sricharan into omap-for-v3.15/crossbar (2014-02-28 13:35:02 -0800)

----------------------------------------------------------------

Add support for GIC crossbar that routes interrupts on newer omaps.

Looks like people wanted these merged via the omap tree as it's the only user for the GIC crossbar.

Quoted 6 lines

----------------------------------------------------------------
Sricharan R (4):
DRIVERS: IRQCHIP: IRQ-GIC: Add support for routable irqs
DRIVERS: IRQCHIP: CROSSBAR: Add support for Crossbar IP
ARM: OMAP4+: Correct Wakeup-gen code to use physical irq number
ARM: DRA: Enable Crossbar IP support for DRA7XX

Whoa, lots of caps on those driver subjects. I don't think we need those in the future, lower case is just fine (and DRIVERS: usually isn't used).

Branch has been merged into next/drivers.

-Olof

#9 lore raw

[GIT PULL 4/4] omap crossbar support for v3.15

Quoted 27 lines · Olof Johansson
Quoted 19 lines · Tony Lindgren

The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:

Linus 3.14-rc1 (2014-02-02 16:42:13 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.15/crossbar-signed

for you to fetch changes up to 9594274201ac3c67d5c569aae63792e58bcd33e6:

Merge branch 'crossbar_3.14_rc1' of git://github.com/Sricharanti/sricharan into omap-for-v3.15/crossbar (2014-02-28 13:35:02 -0800)

----------------------------------------------------------------

Add support for GIC crossbar that routes interrupts on newer omaps.

Looks like people wanted these merged via the omap tree as it's the only user for the GIC crossbar.

Quoted 6 lines

----------------------------------------------------------------
Sricharan R (4):
DRIVERS: IRQCHIP: IRQ-GIC: Add support for routable irqs
DRIVERS: IRQCHIP: CROSSBAR: Add support for Crossbar IP
ARM: OMAP4+: Correct Wakeup-gen code to use physical irq number
ARM: DRA: Enable Crossbar IP support for DRA7XX

Quoted 2 lines

Whoa, lots of caps on those driver subjects. I don't think we need those in the future, lower case is just fine (and DRIVERS: usually isn't used).

Oops yeah I had them as "irqchip: crossbar" and "irqchip: irq-gic" in my earlier branch for v3.14 that did not get merged, but this time I pulled from Sricharan.

Scricharan, maybe use less yelling naming for any follow-up patches?

Quoted 1 line

Branch has been merged into next/drivers.

OK thanks!

Tony

#10 lore raw

[GIT PULL 4/4] omap crossbar support for v3.15

Tony,

Quoted 27 lines · Tony Lindgren
Quoted 26 lines · Olof Johansson
Quoted 25 lines · Tony Lindgren

The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:

Linus 3.14-rc1 (2014-02-02 16:42:13 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.15/crossbar-signed

for you to fetch changes up to 9594274201ac3c67d5c569aae63792e58bcd33e6:

Merge branch 'crossbar_3.14_rc1' of git://github.com/Sricharanti/sricharan into omap-for-v3.15/crossbar (2014-02-28 13:35:02 -0800)

----------------------------------------------------------------

Add support for GIC crossbar that routes interrupts on newer omaps.

Looks like people wanted these merged via the omap tree as it's the only user for the GIC crossbar.

----------------------------------------------------------------
Sricharan R (4):
DRIVERS: IRQCHIP: IRQ-GIC: Add support for routable irqs
DRIVERS: IRQCHIP: CROSSBAR: Add support for Crossbar IP
ARM: OMAP4+: Correct Wakeup-gen code to use physical irq number
ARM: DRA: Enable Crossbar IP support for DRA7XX

Quoted 8 lines
Quoted 2 lines

Whoa, lots of caps on those driver subjects. I don't think we need those in the future, lower case is just fine (and DRIVERS: usually isn't used).

Oops yeah I had them as "irqchip: crossbar" and "irqchip: irq-gic" in my earlier branch for v3.14 that did not get merged, but this time I pulled from Sricharan.

Scricharan, maybe use less yelling naming for any follow-up patches?

Will make sure that there are no caps in the follow up patches.

Regards,
Sricharan

#11 lore raw

[GIT PULL 4/4] omap crossbar support for v3.15

Hi Tony,

Quoted 36 lines · Sricharan R

Tony,

Quoted 33 lines · Tony Lindgren
Quoted 20 lines · Olof Johansson
Quoted 19 lines · Tony Lindgren

The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:

Linus 3.14-rc1 (2014-02-02 16:42:13 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.15/crossbar-signed

for you to fetch changes up to 9594274201ac3c67d5c569aae63792e58bcd33e6:

Merge branch 'crossbar_3.14_rc1' of git://github.com/Sricharanti/sricharan into omap-for-v3.15/crossbar (2014-02-28 13:35:02 -0800)

----------------------------------------------------------------

Add support for GIC crossbar that routes interrupts on newer omaps.

Looks like people wanted these merged via the omap tree as it's the only user for the GIC crossbar.

Quoted 8 lines
Quoted 6 lines

----------------------------------------------------------------
Sricharan R (4):
DRIVERS: IRQCHIP: IRQ-GIC: Add support for routable irqs
DRIVERS: IRQCHIP: CROSSBAR: Add support for Crossbar IP
ARM: OMAP4+: Correct Wakeup-gen code to use physical irq number
ARM: DRA: Enable Crossbar IP support for DRA7XX

Whoa, lots of caps on those driver subjects. I don't think we need those in the future, lower case is just fine (and DRIVERS: usually isn't used).

Oops yeah I had them as "irqchip: crossbar" and "irqchip: irq-gic" in my earlier branch for v3.14 that did not get merged, but this time I pulled from Sricharan.

Quoted 6 lines
Quoted 2 lines

Scricharan, maybe use less yelling naming for any follow-up patches?

Will make sure that there are no caps in the follow up patches.

Regards,
Sricharan

I have pushed the below branch for the crossbar-dts data rebased on 3.15-rc4

git at github.com:Sricharanti/sricharan.git
branch: crossbar_dts_3.15_rc4

These patches are dependent on the crossbar driver fixes sent below.

http://marc.info/?l=linux-omap&m=139929963420299&w=2

Regards,
Sricharan

#12 lore raw

[GIT PULL 4/4] omap crossbar support for v3.15

Hi,

Quoted 50 lines · Sricharan R

Hi Tony,

Quoted 36 lines · Sricharan R

Tony,

Quoted 33 lines · Tony Lindgren
Quoted 20 lines · Olof Johansson
Quoted 19 lines · Tony Lindgren

The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:

Linus 3.14-rc1 (2014-02-02 16:42:13 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.15/crossbar-signed

for you to fetch changes up to 9594274201ac3c67d5c569aae63792e58bcd33e6:

Merge branch 'crossbar_3.14_rc1' of git://github.com/Sricharanti/sricharan into omap-for-v3.15/crossbar (2014-02-28 13:35:02 -0800)

----------------------------------------------------------------

Add support for GIC crossbar that routes interrupts on newer omaps.

Looks like people wanted these merged via the omap tree as it's the only user for the GIC crossbar.

Quoted 8 lines
Quoted 6 lines

----------------------------------------------------------------
Sricharan R (4):
DRIVERS: IRQCHIP: IRQ-GIC: Add support for routable irqs
DRIVERS: IRQCHIP: CROSSBAR: Add support for Crossbar IP
ARM: OMAP4+: Correct Wakeup-gen code to use physical irq number
ARM: DRA: Enable Crossbar IP support for DRA7XX

Whoa, lots of caps on those driver subjects. I don't think we need those in the future, lower case is just fine (and DRIVERS: usually isn't used).

Oops yeah I had them as "irqchip: crossbar" and "irqchip: irq-gic" in my earlier branch for v3.14 that did not get merged, but this time I pulled from Sricharan.

Quoted 6 lines
Quoted 2 lines

Scricharan, maybe use less yelling naming for any follow-up patches?

Will make sure that there are no caps in the follow up patches.

Regards,
Sricharan

I have pushed the below branch for the crossbar-dts data rebased on 3.15-rc4

git at github.com:Sricharanti/sricharan.git
branch: crossbar_dts_3.15_rc4

Quoted 7 lines

These patches are dependent on the crossbar driver fixes sent below.

http://marc.info/?l=linux-omap&m=139929963420299&w=2

Regards,
Sricharan

Sorry, please ignore this. Used a wrong thread.

Regards,
Sricharan