-
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.14/dt-signed' of git://git.kernel.org/pub/scm/…
…linux/kernel/git/tmlind/linux-omap into next/boards Split omap3 core padconf area into two as some of the registers in the padconf area are not accessible and used for other devices. Also fix the interrupt number for omap2 RNG, and add basic support for sbc-3xxx with cm-t3730. Note that the minor merge conflicts for omap_hwmod_2xxx_ipblock_data.c can be solved by just dropping the legacy hwmod data for interrupts for v3.14. * tag 'omap-for-v3.14/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: OMAP2: fix interrupt number for rng ARM: dts: Split omap3 pinmux core device ARM: dts: Add omap specific pinctrl defines to use padconf addresses ARM: dts: Add support for sbc-3xxx with cm-t3730 Signed-off-by: Olof Johansson <olof@lixom.net>
- Loading branch information
Showing
17 changed files
with
450 additions
and
67 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| /* | ||
| * Support for CompuLab CM-T3730 | ||
| */ | ||
| /dts-v1/; | ||
|
|
||
| #include "omap36xx.dtsi" | ||
| #include "omap3-cm-t3x30.dtsi" | ||
|
|
||
| / { | ||
| model = "CompuLab CM-T3730"; | ||
| compatible = "compulab,omap3-cm-t3730", "ti,omap36xx", "ti,omap3"; | ||
|
|
||
| wl12xx_vmmc2: wl12xx_vmmc2 { | ||
| compatible = "regulator-fixed"; | ||
| regulator-name = "vw1271"; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&wl12xx_gpio>; | ||
| regulator-min-microvolt = <1800000>; | ||
| regulator-max-microvolt = <1800000>; | ||
| gpio = <&gpio3 9 GPIO_ACTIVE_HIGH>; /* gpio73 */ | ||
| startup-delay-us = <20000>; | ||
| enable-active-high; | ||
| }; | ||
|
|
||
| wl12xx_vaux2: wl12xx_vaux2 { | ||
| compatible = "regulator-fixed"; | ||
| regulator-name = "vwl1271_vaux2"; | ||
| regulator-min-microvolt = <1800000>; | ||
| regulator-max-microvolt = <1800000>; | ||
| vin-supply = <&vaux2>; | ||
| }; | ||
| }; | ||
|
|
||
| &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 */ | ||
| >; | ||
| }; | ||
|
|
||
| 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 (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 */ | ||
| >; | ||
| }; | ||
|
|
||
| smsc1_pins: pinmux_smsc1_pins { | ||
| pinctrl-single,pins = < | ||
| 0x88 (PIN_OUTPUT | MUX_MODE0) /* gpmc_ncs5.gpmc_ncs5 */ | ||
| 0x16a (PIN_INPUT_PULLUP | MUX_MODE4) /* uart3_cts_rctx.gpio_163 */ | ||
| >; | ||
| }; | ||
|
|
||
| uart3_pins: pinmux_uart3_pins { | ||
| pinctrl-single,pins = < | ||
| 0x16e (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 = < | ||
| 0xb2 (PIN_OUTPUT | MUX_MODE4) /* dss_data3.gpio_73 */ | ||
| 0x134 (PIN_INPUT | MUX_MODE4) /* sdmmc2_dat4.gpio_136 */ | ||
| >; | ||
| }; | ||
| }; | ||
|
|
||
| &mmc1 { | ||
| vmmc-supply = <&vmmc1>; | ||
| bus-width = <4>; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&mmc1_pins>; | ||
| }; | ||
|
|
||
| &mmc2 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&mmc2_pins>; | ||
| vmmc-supply = <&wl12xx_vmmc2>; | ||
| vmmc_aux-supply = <&wl12xx_vaux2>; | ||
| non-removable; | ||
| bus-width = <4>; | ||
| cap-power-off-card; | ||
| }; | ||
|
|
||
| &smsc1 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&smsc1_pins>; | ||
| }; | ||
|
|
||
| &uart3 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&uart3_pins>; | ||
| }; |
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,95 @@ | ||
| /* | ||
| * Common support for CompuLab CM-T3530 and CM-T3730 | ||
| */ | ||
|
|
||
| / { | ||
| memory { | ||
| device_type = "memory"; | ||
| reg = <0x80000000 0x10000000>; /* 256 MB */ | ||
| }; | ||
|
|
||
| cpus { | ||
| cpu@0 { | ||
| cpu0-supply = <&vcc>; | ||
| }; | ||
| }; | ||
|
|
||
| leds { | ||
| compatible = "gpio-leds"; | ||
| ledb { | ||
| label = "cm-t35:green"; | ||
| gpios = <&gpio6 26 GPIO_ACTIVE_HIGH>; /* gpio186 */ | ||
| linux,default-trigger = "heartbeat"; | ||
| }; | ||
| }; | ||
|
|
||
| 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 { | ||
| ranges = <5 0 0x2c000000 0x01000000>; | ||
|
|
||
| smsc1: ethernet@5,0 { | ||
| compatible = "smsc,lan9221", "smsc,lan9115"; | ||
| interrupt-parent = <&gpio6>; | ||
| interrupts = <3 IRQ_TYPE_LEVEL_LOW>; | ||
| reg = <5 0 0xff>; | ||
| 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; | ||
| vddvario-supply = <&vddvario>; | ||
| vdd33a-supply = <&vdd33a>; | ||
| reg-io-width = <4>; | ||
| smsc,save-mac-address; | ||
| }; | ||
| }; | ||
|
|
||
| &i2c1 { | ||
| clock-frequency = <400000>; | ||
|
|
||
| twl: twl@48 { | ||
| reg = <0x48>; | ||
| interrupts = <7>; /* SYS_NIRQ cascaded to intc */ | ||
| interrupt-parent = <&intc>; | ||
| }; | ||
| }; | ||
|
|
||
| #include "twl4030.dtsi" | ||
| #include "twl4030_omap3.dtsi" | ||
|
|
||
| &i2c3 { | ||
| clock-frequency = <400000>; | ||
| }; | ||
|
|
||
| &twl_gpio { | ||
| ti,use-leds; | ||
| }; |
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
Oops, something went wrong.