-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'omap-for-v3.13/board-removal-signed-take2' of git://git.ke…
…rnel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt From Tony Lindgren: Changes needed to drop legacy booting support for some omap3 boards. Note that that these are based on a merge of the following for the dependencies: - v3.12-rc5 for fixes to pinctrl mask - omap-for-v3.13/dt-signed to avoid pointless merge conflicts - omap-for-v3.13/quirk-signed for legacy pdata handling * tag 'omap-for-v3.13/board-removal-signed-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (125 commits) ARM: OMAP2+: remove legacy support for IGEP boards ARM: OMAP2+: Remove legacy support for zoom platforms ARM: OMAP2+: Remove legacy booting support for omap3 EVM ARM: OMAP2: delete board-rm680 ARM: dts: add minimal DT support for Nokia N950 & N9 phones ARM: dts: Add basic support for zoom3 ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM) ARM: dts: Add common support for omap3-evm ARM: dts: Shared file for omap GPMC connected smsc911x +Linux 3.12-rc5 Signed-off-by: Kevin Hilman <khilman@linaro.org>
- Loading branch information
Showing
172 changed files
with
1,535 additions
and
3,156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| /* | ||
| * Common file for GPMC connected smsc911x on omaps | ||
| * | ||
| * Note that the board specifc DTS file needs to specify | ||
| * ranges, pinctrl, reg, interrupt parent and interrupts. | ||
| */ | ||
|
|
||
| / { | ||
| vddvario: regulator-vddvario { | ||
| compatible = "regulator-fixed"; | ||
| regulator-name = "vddvario"; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| vdd33a: regulator-vdd33a { | ||
| compatible = "regulator-fixed"; | ||
| regulator-name = "vdd33a"; | ||
| regulator-always-on; | ||
| }; | ||
| }; | ||
|
|
||
| &gpmc { | ||
| ethernet@gpmc { | ||
| compatible = "smsc,lan9221", "smsc,lan9115"; | ||
| bank-width = <2>; | ||
| gpmc,mux-add-data; | ||
| gpmc,cs-on-ns = <0>; | ||
| gpmc,cs-rd-off-ns = <186>; | ||
| gpmc,cs-wr-off-ns = <186>; | ||
| gpmc,adv-on-ns = <12>; | ||
| gpmc,adv-rd-off-ns = <48>; | ||
| gpmc,adv-wr-off-ns = <48>; | ||
| gpmc,oe-on-ns = <54>; | ||
| gpmc,oe-off-ns = <168>; | ||
| gpmc,we-on-ns = <54>; | ||
| gpmc,we-off-ns = <168>; | ||
| gpmc,rd-cycle-ns = <186>; | ||
| gpmc,wr-cycle-ns = <186>; | ||
| gpmc,access-ns = <114>; | ||
| gpmc,page-burst-access-ns = <6>; | ||
| gpmc,bus-turnaround-ns = <12>; | ||
| gpmc,cycle2cycle-delay-ns = <18>; | ||
| gpmc,wr-data-mux-bus-ns = <90>; | ||
| gpmc,wr-access-ns = <186>; | ||
| gpmc,cycle2cycle-samecsen; | ||
| gpmc,cycle2cycle-diffcsen; | ||
| vmmc-supply = <&vddvario>; | ||
| vmmc_aux-supply = <&vdd33a>; | ||
| reg-io-width = <4>; | ||
| smsc,save-mac-address; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * Common features on the Zoom debug board | ||
| */ | ||
|
|
||
| #include "omap-gpmc-smsc911x.dtsi" | ||
|
|
||
| &gpmc { | ||
| ranges = <3 0 0x10000000 0x00000400>, | ||
| <7 0 0x2c000000 0x01000000>; | ||
|
|
||
| /* | ||
| * Four port TL16CP754C serial port on GPMC, | ||
| * they probably share the same GPIO IRQ | ||
| * REVISIT: Add timing support from slls644g.pdf | ||
| */ | ||
| 8250@3,0 { | ||
| compatible = "ns16550a"; | ||
| reg = <3 0 0x100>; | ||
| bank-width = <2>; | ||
| reg-shift = <1>; | ||
| reg-io-width = <1>; | ||
| interrupt-parent = <&gpio4>; | ||
| interrupts = <6 IRQ_TYPE_EDGE_RISING>; /* gpio102 */ | ||
| clock-frequency = <1843200>; | ||
| current-speed = <115200>; | ||
| }; | ||
|
|
||
| ethernet@gpmc { | ||
| reg = <7 0 0xff>; | ||
| interrupt-parent = <&gpio5>; | ||
| interrupts = <30 IRQ_TYPE_LEVEL_LOW>; /* gpio158 */ | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| /* | ||
| * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 2 as | ||
| * published by the Free Software Foundation. | ||
| */ | ||
| /dts-v1/; | ||
|
|
||
| #include "omap36xx.dtsi" | ||
| #include "omap3-evm-common.dtsi" | ||
|
|
||
|
|
||
| / { | ||
| model = "TI OMAP37XX EVM (TMDSEVM3730)"; | ||
| compatible = "ti,omap3-evm-37xx", "ti,omap36xx"; | ||
|
|
||
| memory { | ||
| device_type = "memory"; | ||
| reg = <0x80000000 0x10000000>; /* 256 MB */ | ||
| }; | ||
|
|
||
| wl12xx_vmmc: wl12xx_vmmc { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&wl12xx_gpio>; | ||
| }; | ||
| }; | ||
|
|
||
| &omap3_pmx_core { | ||
| mmc1_pins: pinmux_mmc1_pins { | ||
| pinctrl-single,pins = < | ||
| 0x114 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* sdmmc1_clk.sdmmc1_clk */ | ||
| 0x116 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_cmd.sdmmc1_cmd */ | ||
| 0x118 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat0.sdmmc1_dat0 */ | ||
| 0x11a (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat1.sdmmc1_dat1 */ | ||
| 0x11c (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat2.sdmmc1_dat2 */ | ||
| 0x11e (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat3.sdmmc1_dat3 */ | ||
| 0x120 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat4.sdmmc1_dat4 */ | ||
| 0x122 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat5.sdmmc1_dat5 */ | ||
| 0x124 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat6.sdmmc1_dat6 */ | ||
| 0x126 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat7.sdmmc1_dat7 */ | ||
| >; | ||
| }; | ||
|
|
||
| /* NOTE: Clocked externally, needs INPUT also for sdmmc2_clk.sdmmc2_clk */ | ||
| mmc2_pins: pinmux_mmc2_pins { | ||
| pinctrl-single,pins = < | ||
| 0x128 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_clk.sdmmc2_clk */ | ||
| 0x12a (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_cmd.sdmmc2_cmd */ | ||
| 0x12c (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat0.sdmmc2_dat0 */ | ||
| 0x12e (WAKEUP_EN | PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */ | ||
| 0x130 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat2.sdmmc2_dat2 */ | ||
| 0x132 (PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat3.sdmmc2_dat3 */ | ||
| >; | ||
| }; | ||
|
|
||
| uart3_pins: pinmux_uart3_pins { | ||
| pinctrl-single,pins = < | ||
| 0x16e (WAKEUP_EN | PIN_INPUT | MUX_MODE0) /* uart3_rx_irrx.uart3_rx_irrx */ | ||
| 0x170 (PIN_OUTPUT | MUX_MODE0) /* uart3_tx_irtx.uart3_tx_irtx */ | ||
| >; | ||
| }; | ||
|
|
||
| wl12xx_gpio: pinmux_wl12xx_gpio { | ||
| pinctrl-single,pins = < | ||
| 0x150 (PIN_OUTPUT | MUX_MODE4) /* uart1_cts.gpio_150 */ | ||
| 0x14e (PIN_INPUT | MUX_MODE4) /* uart1_rts.gpio_149 */ | ||
| >; | ||
| }; | ||
|
|
||
| smsc911x_pins: pinmux_smsc911x_pins { | ||
| pinctrl-single,pins = < | ||
| 0x1a2 (PIN_INPUT | MUX_MODE4) /* mcspi1_cs2.gpio_176 */ | ||
| >; | ||
| }; | ||
| }; | ||
|
|
||
| &mmc1 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&mmc1_pins>; | ||
| }; | ||
|
|
||
| &mmc2 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&mmc2_pins>; | ||
| }; | ||
|
|
||
| &mmc3 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &uart3 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&uart3_pins>; | ||
| }; | ||
|
|
||
| &gpmc { | ||
| ranges = <0 0 0x00000000 0x20000000>, | ||
| <5 0 0x2c000000 0x01000000>; | ||
|
|
||
| nand@0,0 { | ||
| linux,mtd-name= "hynix,h8kds0un0mer-4em"; | ||
| reg = <0 0 0>; | ||
| nand-bus-width = <16>; | ||
| ti,nand-ecc-opt = "bch8"; | ||
|
|
||
| gpmc,sync-clk-ps = <0>; | ||
| gpmc,cs-on-ns = <0>; | ||
| gpmc,cs-rd-off-ns = <44>; | ||
| gpmc,cs-wr-off-ns = <44>; | ||
| gpmc,adv-on-ns = <6>; | ||
| gpmc,adv-rd-off-ns = <34>; | ||
| gpmc,adv-wr-off-ns = <44>; | ||
| gpmc,we-off-ns = <40>; | ||
| gpmc,oe-off-ns = <54>; | ||
| gpmc,access-ns = <64>; | ||
| gpmc,rd-cycle-ns = <82>; | ||
| gpmc,wr-cycle-ns = <82>; | ||
| gpmc,wr-access-ns = <40>; | ||
| gpmc,wr-data-mux-bus-ns = <0>; | ||
|
|
||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
|
|
||
| partition@0 { | ||
| label = "X-Loader"; | ||
| reg = <0 0x80000>; | ||
| }; | ||
| partition@0x80000 { | ||
| label = "U-Boot"; | ||
| reg = <0x80000 0x1c0000>; | ||
| }; | ||
| partition@0x1c0000 { | ||
| label = "Environment"; | ||
| reg = <0x240000 0x40000>; | ||
| }; | ||
| partition@0x280000 { | ||
| label = "Kernel"; | ||
| reg = <0x280000 0x500000>; | ||
| }; | ||
| partition@0x780000 { | ||
| label = "Filesystem"; | ||
| reg = <0x780000 0x1f880000>; | ||
| }; | ||
| }; | ||
|
|
||
| ethernet@gpmc { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&smsc911x_pins>; | ||
| }; | ||
| }; |
Oops, something went wrong.