diff options
| -rw-r--r-- | Documentation/devicetree/bindings/usb/am33xx-usb.txt | 21 | ||||
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/am335x-bone.dts | 44 | ||||
| -rw-r--r-- | arch/arm/boot/dts/am335x-evm.dts | 63 | ||||
| -rw-r--r-- | arch/arm/boot/dts/am335x-evmsk.dts | 84 | ||||
| -rw-r--r-- | arch/arm/boot/dts/am33xx.dtsi | 17 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap4-panda-a4.dts | 17 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap4-panda-es.dts | 9 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap4-panda.dts | 18 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap4-sdp-es23plus.dts | 17 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap4-sdp.dts | 18 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap5-evm.dts | 13 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap5.dtsi | 22 | ||||
| -rw-r--r-- | arch/arm/boot/dts/samsung_k3pe0e000b.dtsi | 67 |
14 files changed, 410 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/usb/am33xx-usb.txt b/Documentation/devicetree/bindings/usb/am33xx-usb.txt index ca8fa56e9f03..707c1a2dae06 100644 --- a/Documentation/devicetree/bindings/usb/am33xx-usb.txt +++ b/Documentation/devicetree/bindings/usb/am33xx-usb.txt | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | AM33XX MUSB GLUE | 1 | AM33XX MUSB GLUE |
| 2 | - compatible : Should be "ti,musb-am33xx" | 2 | - compatible : Should be "ti,musb-am33xx" |
| 3 | - reg : offset and length of register sets, first usbss, then for musb instances | ||
| 4 | - interrupts : usbss, musb instance interrupts in order | ||
| 3 | - ti,hwmods : must be "usb_otg_hs" | 5 | - ti,hwmods : must be "usb_otg_hs" |
| 4 | - multipoint : Should be "1" indicating the musb controller supports | 6 | - multipoint : Should be "1" indicating the musb controller supports |
| 5 | multipoint. This is a MUSB configuration-specific setting. | 7 | multipoint. This is a MUSB configuration-specific setting. |
| @@ -12,3 +14,22 @@ AM33XX MUSB GLUE | |||
| 12 | represents PERIPHERAL. | 14 | represents PERIPHERAL. |
| 13 | - power : Should be "250". This signifies the controller can supply upto | 15 | - power : Should be "250". This signifies the controller can supply upto |
| 14 | 500mA when operating in host mode. | 16 | 500mA when operating in host mode. |
| 17 | |||
| 18 | Example: | ||
| 19 | |||
| 20 | usb@47400000 { | ||
| 21 | compatible = "ti,musb-am33xx"; | ||
| 22 | reg = <0x47400000 0x1000 /* usbss */ | ||
| 23 | 0x47401000 0x800 /* musb instance 0 */ | ||
| 24 | 0x47401800 0x800>; /* musb instance 1 */ | ||
| 25 | interrupts = <17 /* usbss */ | ||
| 26 | 18 /* musb instance 0 */ | ||
| 27 | 19>; /* musb instance 1 */ | ||
| 28 | multipoint = <1>; | ||
| 29 | num-eps = <16>; | ||
| 30 | ram-bits = <12>; | ||
| 31 | port0-mode = <3>; | ||
| 32 | port1-mode = <3>; | ||
| 33 | power = <250>; | ||
| 34 | ti,hwmods = "usb_otg_hs"; | ||
| 35 | }; | ||
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 634bd4246574..2458b69e2be6 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
| @@ -73,6 +73,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ | |||
| 73 | omap4-sdp.dtb \ | 73 | omap4-sdp.dtb \ |
| 74 | omap5-evm.dtb \ | 74 | omap5-evm.dtb \ |
| 75 | am335x-evm.dtb \ | 75 | am335x-evm.dtb \ |
| 76 | am335x-evmsk.dtb \ | ||
| 76 | am335x-bone.dtb | 77 | am335x-bone.dtb |
| 77 | dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb | 78 | dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb |
| 78 | dtb-$(CONFIG_ARCH_U8500) += snowball.dtb | 79 | dtb-$(CONFIG_ARCH_U8500) += snowball.dtb |
diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts index 91eee97371ea..2c338889df1b 100644 --- a/arch/arm/boot/dts/am335x-bone.dts +++ b/arch/arm/boot/dts/am335x-bone.dts | |||
| @@ -24,6 +24,20 @@ | |||
| 24 | reg = <0x80000000 0x10000000>; /* 256 MB */ | 24 | reg = <0x80000000 0x10000000>; /* 256 MB */ |
| 25 | }; | 25 | }; |
| 26 | 26 | ||
| 27 | am33xx_pinmux: pinmux@44e10800 { | ||
| 28 | pinctrl-names = "default"; | ||
| 29 | pinctrl-0 = <&user_leds_s0>; | ||
| 30 | |||
| 31 | user_leds_s0: user_leds_s0 { | ||
| 32 | pinctrl-single,pins = < | ||
| 33 | 0x54 0x7 /* gpmc_a5.gpio1_21, OUTPUT | MODE7 */ | ||
| 34 | 0x58 0x17 /* gpmc_a6.gpio1_22, OUTPUT_PULLUP | MODE7 */ | ||
| 35 | 0x5c 0x7 /* gpmc_a7.gpio1_23, OUTPUT | MODE7 */ | ||
| 36 | 0x60 0x17 /* gpmc_a8.gpio1_24, OUTPUT_PULLUP | MODE7 */ | ||
| 37 | >; | ||
| 38 | }; | ||
| 39 | }; | ||
| 40 | |||
| 27 | ocp { | 41 | ocp { |
| 28 | uart1: serial@44e09000 { | 42 | uart1: serial@44e09000 { |
| 29 | status = "okay"; | 43 | status = "okay"; |
| @@ -39,6 +53,36 @@ | |||
| 39 | 53 | ||
| 40 | }; | 54 | }; |
| 41 | }; | 55 | }; |
| 56 | |||
| 57 | leds { | ||
| 58 | compatible = "gpio-leds"; | ||
| 59 | |||
| 60 | led@2 { | ||
| 61 | label = "beaglebone:green:heartbeat"; | ||
| 62 | gpios = <&gpio2 21 0>; | ||
| 63 | linux,default-trigger = "heartbeat"; | ||
| 64 | default-state = "off"; | ||
| 65 | }; | ||
| 66 | |||
| 67 | led@3 { | ||
| 68 | label = "beaglebone:green:mmc0"; | ||
| 69 | gpios = <&gpio2 22 0>; | ||
| 70 | linux,default-trigger = "mmc0"; | ||
| 71 | default-state = "off"; | ||
| 72 | }; | ||
| 73 | |||
| 74 | led@4 { | ||
| 75 | label = "beaglebone:green:usr2"; | ||
| 76 | gpios = <&gpio2 23 0>; | ||
| 77 | default-state = "off"; | ||
| 78 | }; | ||
| 79 | |||
| 80 | led@5 { | ||
| 81 | label = "beaglebone:green:usr3"; | ||
| 82 | gpios = <&gpio2 24 0>; | ||
| 83 | default-state = "off"; | ||
| 84 | }; | ||
| 85 | }; | ||
| 42 | }; | 86 | }; |
| 43 | 87 | ||
| 44 | /include/ "tps65217.dtsi" | 88 | /include/ "tps65217.dtsi" |
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index 513284fc66b9..9f65f17ebdf8 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts | |||
| @@ -24,6 +24,28 @@ | |||
| 24 | reg = <0x80000000 0x10000000>; /* 256 MB */ | 24 | reg = <0x80000000 0x10000000>; /* 256 MB */ |
| 25 | }; | 25 | }; |
| 26 | 26 | ||
| 27 | am33xx_pinmux: pinmux@44e10800 { | ||
| 28 | pinctrl-names = "default"; | ||
| 29 | pinctrl-0 = <&matrix_keypad_s0 &volume_keys_s0>; | ||
| 30 | |||
| 31 | matrix_keypad_s0: matrix_keypad_s0 { | ||
| 32 | pinctrl-single,pins = < | ||
| 33 | 0x54 0x7 /* gpmc_a5.gpio1_21, OUTPUT | MODE7 */ | ||
| 34 | 0x58 0x7 /* gpmc_a6.gpio1_22, OUTPUT | MODE7 */ | ||
| 35 | 0x64 0x27 /* gpmc_a9.gpio1_25, INPUT | MODE7 */ | ||
| 36 | 0x68 0x27 /* gpmc_a10.gpio1_26, INPUT | MODE7 */ | ||
| 37 | 0x6c 0x27 /* gpmc_a11.gpio1_27, INPUT | MODE7 */ | ||
| 38 | >; | ||
| 39 | }; | ||
| 40 | |||
| 41 | volume_keys_s0: volume_keys_s0 { | ||
| 42 | pinctrl-single,pins = < | ||
| 43 | 0x150 0x27 /* spi0_sclk.gpio0_2, INPUT | MODE7 */ | ||
| 44 | 0x154 0x27 /* spi0_d0.gpio0_3, INPUT | MODE7 */ | ||
| 45 | >; | ||
| 46 | }; | ||
| 47 | }; | ||
| 48 | |||
| 27 | ocp { | 49 | ocp { |
| 28 | uart1: serial@44e09000 { | 50 | uart1: serial@44e09000 { |
| 29 | status = "okay"; | 51 | status = "okay"; |
| @@ -95,6 +117,47 @@ | |||
| 95 | regulator-name = "lis3_reg"; | 117 | regulator-name = "lis3_reg"; |
| 96 | regulator-boot-on; | 118 | regulator-boot-on; |
| 97 | }; | 119 | }; |
| 120 | |||
| 121 | matrix_keypad: matrix_keypad@0 { | ||
| 122 | compatible = "gpio-matrix-keypad"; | ||
| 123 | debounce-delay-ms = <5>; | ||
| 124 | col-scan-delay-us = <2>; | ||
| 125 | |||
| 126 | row-gpios = <&gpio2 25 0 /* Bank1, pin25 */ | ||
| 127 | &gpio2 26 0 /* Bank1, pin26 */ | ||
| 128 | &gpio2 27 0>; /* Bank1, pin27 */ | ||
| 129 | |||
| 130 | col-gpios = <&gpio2 21 0 /* Bank1, pin21 */ | ||
| 131 | &gpio2 22 0>; /* Bank1, pin22 */ | ||
| 132 | |||
| 133 | linux,keymap = <0x0000008b /* MENU */ | ||
| 134 | 0x0100009e /* BACK */ | ||
| 135 | 0x02000069 /* LEFT */ | ||
| 136 | 0x0001006a /* RIGHT */ | ||
| 137 | 0x0101001c /* ENTER */ | ||
| 138 | 0x0201006c>; /* DOWN */ | ||
| 139 | }; | ||
| 140 | |||
| 141 | gpio_keys: volume_keys@0 { | ||
| 142 | compatible = "gpio-keys"; | ||
| 143 | #address-cells = <1>; | ||
| 144 | #size-cells = <0>; | ||
| 145 | autorepeat; | ||
| 146 | |||
| 147 | switch@9 { | ||
| 148 | label = "volume-up"; | ||
| 149 | linux,code = <115>; | ||
| 150 | gpios = <&gpio1 2 1>; | ||
| 151 | gpio-key,wakeup; | ||
| 152 | }; | ||
| 153 | |||
| 154 | switch@10 { | ||
| 155 | label = "volume-down"; | ||
| 156 | linux,code = <114>; | ||
| 157 | gpios = <&gpio1 3 1>; | ||
| 158 | gpio-key,wakeup; | ||
| 159 | }; | ||
| 160 | }; | ||
| 98 | }; | 161 | }; |
| 99 | 162 | ||
| 100 | /include/ "tps65910.dtsi" | 163 | /include/ "tps65910.dtsi" |
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts index 6f5387987865..f5a6162a4ff2 100644 --- a/arch/arm/boot/dts/am335x-evmsk.dts +++ b/arch/arm/boot/dts/am335x-evmsk.dts | |||
| @@ -30,6 +30,29 @@ | |||
| 30 | reg = <0x80000000 0x10000000>; /* 256 MB */ | 30 | reg = <0x80000000 0x10000000>; /* 256 MB */ |
| 31 | }; | 31 | }; |
| 32 | 32 | ||
| 33 | am33xx_pinmux: pinmux@44e10800 { | ||
| 34 | pinctrl-names = "default"; | ||
| 35 | pinctrl-0 = <&user_leds_s0 &gpio_keys_s0>; | ||
| 36 | |||
| 37 | user_leds_s0: user_leds_s0 { | ||
| 38 | pinctrl-single,pins = < | ||
| 39 | 0x10 0x7 /* gpmc_ad4.gpio1_4, OUTPUT | MODE7 */ | ||
| 40 | 0x14 0x7 /* gpmc_ad5.gpio1_5, OUTPUT | MODE7 */ | ||
| 41 | 0x18 0x7 /* gpmc_ad6.gpio1_6, OUTPUT | MODE7 */ | ||
| 42 | 0x1c 0x7 /* gpmc_ad7.gpio1_7, OUTPUT | MODE7 */ | ||
| 43 | >; | ||
| 44 | }; | ||
| 45 | |||
| 46 | gpio_keys_s0: gpio_keys_s0 { | ||
| 47 | pinctrl-single,pins = < | ||
| 48 | 0x94 0x27 /* gpmc_oen_ren.gpio2_3, INPUT | MODE7 */ | ||
| 49 | 0x90 0x27 /* gpmc_advn_ale.gpio2_2, INPUT | MODE7 */ | ||
| 50 | 0x70 0x27 /* gpmc_wait0.gpio0_30, INPUT | MODE7 */ | ||
| 51 | 0x9c 0x27 /* gpmc_ben0_cle.gpio2_5, INPUT | MODE7 */ | ||
| 52 | >; | ||
| 53 | }; | ||
| 54 | }; | ||
| 55 | |||
| 33 | ocp { | 56 | ocp { |
| 34 | uart1: serial@44e09000 { | 57 | uart1: serial@44e09000 { |
| 35 | status = "okay"; | 58 | status = "okay"; |
| @@ -86,6 +109,67 @@ | |||
| 86 | regulator-name = "lis3_reg"; | 109 | regulator-name = "lis3_reg"; |
| 87 | regulator-boot-on; | 110 | regulator-boot-on; |
| 88 | }; | 111 | }; |
| 112 | |||
| 113 | leds { | ||
| 114 | compatible = "gpio-leds"; | ||
| 115 | |||
| 116 | led@1 { | ||
| 117 | label = "evmsk:green:usr0"; | ||
| 118 | gpios = <&gpio2 4 0>; | ||
| 119 | default-state = "off"; | ||
| 120 | }; | ||
| 121 | |||
| 122 | led@2 { | ||
| 123 | label = "evmsk:green:usr1"; | ||
| 124 | gpios = <&gpio2 5 0>; | ||
| 125 | default-state = "off"; | ||
| 126 | }; | ||
| 127 | |||
| 128 | led@3 { | ||
| 129 | label = "evmsk:green:mmc0"; | ||
| 130 | gpios = <&gpio2 6 0>; | ||
| 131 | linux,default-trigger = "mmc0"; | ||
| 132 | default-state = "off"; | ||
| 133 | }; | ||
| 134 | |||
| 135 | led@4 { | ||
| 136 | label = "evmsk:green:heartbeat"; | ||
| 137 | gpios = <&gpio2 7 0>; | ||
| 138 | linux,default-trigger = "heartbeat"; | ||
| 139 | default-state = "off"; | ||
| 140 | }; | ||
| 141 | }; | ||
| 142 | |||
| 143 | gpio_buttons: gpio_buttons@0 { | ||
| 144 | compatible = "gpio-keys"; | ||
| 145 | #address-cells = <1>; | ||
| 146 | #size-cells = <0>; | ||
| 147 | |||
| 148 | switch@1 { | ||
| 149 | label = "button0"; | ||
| 150 | linux,code = <0x100>; | ||
| 151 | gpios = <&gpio3 3 0>; | ||
| 152 | }; | ||
| 153 | |||
| 154 | switch@2 { | ||
| 155 | label = "button1"; | ||
| 156 | linux,code = <0x101>; | ||
| 157 | gpios = <&gpio3 2 0>; | ||
| 158 | }; | ||
| 159 | |||
| 160 | switch@3 { | ||
| 161 | label = "button2"; | ||
| 162 | linux,code = <0x102>; | ||
| 163 | gpios = <&gpio1 30 0>; | ||
| 164 | gpio-key,wakeup; | ||
| 165 | }; | ||
| 166 | |||
| 167 | switch@4 { | ||
| 168 | label = "button3"; | ||
| 169 | linux,code = <0x103>; | ||
| 170 | gpios = <&gpio3 5 0>; | ||
| 171 | }; | ||
| 172 | }; | ||
| 89 | }; | 173 | }; |
| 90 | 174 | ||
| 91 | /include/ "tps65910.dtsi" | 175 | /include/ "tps65910.dtsi" |
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index 5dfd6822e6f8..20a3f29a6bfe 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi | |||
| @@ -321,5 +321,22 @@ | |||
| 321 | ti,hwmods = "spi1"; | 321 | ti,hwmods = "spi1"; |
| 322 | status = "disabled"; | 322 | status = "disabled"; |
| 323 | }; | 323 | }; |
| 324 | |||
| 325 | usb@47400000 { | ||
| 326 | compatible = "ti,musb-am33xx"; | ||
| 327 | reg = <0x47400000 0x1000 /* usbss */ | ||
| 328 | 0x47401000 0x800 /* musb instance 0 */ | ||
| 329 | 0x47401800 0x800>; /* musb instance 1 */ | ||
| 330 | interrupts = <17 /* usbss */ | ||
| 331 | 18 /* musb instance 0 */ | ||
| 332 | 19>; /* musb instance 1 */ | ||
| 333 | multipoint = <1>; | ||
| 334 | num-eps = <16>; | ||
| 335 | ram-bits = <12>; | ||
| 336 | port0-mode = <3>; | ||
| 337 | port1-mode = <3>; | ||
| 338 | power = <250>; | ||
| 339 | ti,hwmods = "usb_otg_hs"; | ||
| 340 | }; | ||
| 324 | }; | 341 | }; |
| 325 | }; | 342 | }; |
diff --git a/arch/arm/boot/dts/omap4-panda-a4.dts b/arch/arm/boot/dts/omap4-panda-a4.dts new file mode 100644 index 000000000000..75466d2abfb5 --- /dev/null +++ b/arch/arm/boot/dts/omap4-panda-a4.dts | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ | ||
| 3 | * | ||
| 4 | * This program is free software; you can redistribute it and/or modify | ||
| 5 | * it under the terms of the GNU General Public License version 2 as | ||
| 6 | * published by the Free Software Foundation. | ||
| 7 | */ | ||
| 8 | /include/ "omap4-panda.dts" | ||
| 9 | |||
| 10 | /* Pandaboard Rev A4+ have external pullups on SCL & SDA */ | ||
| 11 | &dss_hdmi_pins { | ||
| 12 | pinctrl-single,pins = < | ||
| 13 | 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ | ||
| 14 | 0x5c 0x100 /* hdmi_scl.hdmi_scl INPUT | MODE 0 */ | ||
| 15 | 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */ | ||
| 16 | >; | ||
| 17 | }; | ||
diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts index d4ba43a48d9b..73bc1a67e444 100644 --- a/arch/arm/boot/dts/omap4-panda-es.dts +++ b/arch/arm/boot/dts/omap4-panda-es.dts | |||
| @@ -22,3 +22,12 @@ | |||
| 22 | "AFML", "Line In", | 22 | "AFML", "Line In", |
| 23 | "AFMR", "Line In"; | 23 | "AFMR", "Line In"; |
| 24 | }; | 24 | }; |
| 25 | |||
| 26 | /* PandaboardES has external pullups on SCL & SDA */ | ||
| 27 | &dss_hdmi_pins { | ||
| 28 | pinctrl-single,pins = < | ||
| 29 | 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ | ||
| 30 | 0x5c 0x100 /* hdmi_scl.hdmi_scl INPUT | MODE 0 */ | ||
| 31 | 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */ | ||
| 32 | >; | ||
| 33 | }; | ||
diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts index 32baf65a7ea2..4122efe31cfd 100644 --- a/arch/arm/boot/dts/omap4-panda.dts +++ b/arch/arm/boot/dts/omap4-panda.dts | |||
| @@ -65,6 +65,8 @@ | |||
| 65 | &twl6040_pins | 65 | &twl6040_pins |
| 66 | &mcpdm_pins | 66 | &mcpdm_pins |
| 67 | &mcbsp1_pins | 67 | &mcbsp1_pins |
| 68 | &dss_hdmi_pins | ||
| 69 | &tpd12s015_pins | ||
| 68 | >; | 70 | >; |
| 69 | 71 | ||
| 70 | twl6040_pins: pinmux_twl6040_pins { | 72 | twl6040_pins: pinmux_twl6040_pins { |
| @@ -92,6 +94,22 @@ | |||
| 92 | 0xc4 0x100 /* abe_mcbsp1_fsx.abe_mcbsp1_fsx INPUT | MODE0 */ | 94 | 0xc4 0x100 /* abe_mcbsp1_fsx.abe_mcbsp1_fsx INPUT | MODE0 */ |
| 93 | >; | 95 | >; |
| 94 | }; | 96 | }; |
| 97 | |||
| 98 | dss_hdmi_pins: pinmux_dss_hdmi_pins { | ||
| 99 | pinctrl-single,pins = < | ||
| 100 | 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ | ||
| 101 | 0x5c 0x118 /* hdmi_scl.hdmi_scl INPUT PULLUP | MODE 0 */ | ||
| 102 | 0x5e 0x118 /* hdmi_sda.hdmi_sda INPUT PULLUP | MODE 0 */ | ||
| 103 | >; | ||
| 104 | }; | ||
| 105 | |||
| 106 | tpd12s015_pins: pinmux_tpd12s015_pins { | ||
| 107 | pinctrl-single,pins = < | ||
| 108 | 0x22 0x3 /* gpmc_a17.gpio_41 OUTPUT | MODE3 */ | ||
| 109 | 0x48 0x3 /* gpmc_nbe1.gpio_60 OUTPUT | MODE3 */ | ||
| 110 | 0x58 0x10b /* hdmi_hpd.gpio_63 INPUT PULLDOWN | MODE3 */ | ||
| 111 | >; | ||
| 112 | }; | ||
| 95 | }; | 113 | }; |
| 96 | 114 | ||
| 97 | &i2c1 { | 115 | &i2c1 { |
diff --git a/arch/arm/boot/dts/omap4-sdp-es23plus.dts b/arch/arm/boot/dts/omap4-sdp-es23plus.dts new file mode 100644 index 000000000000..b4a40ffbce31 --- /dev/null +++ b/arch/arm/boot/dts/omap4-sdp-es23plus.dts | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ | ||
| 3 | * | ||
| 4 | * This program is free software; you can redistribute it and/or modify | ||
| 5 | * it under the terms of the GNU General Public License version 2 as | ||
| 6 | * published by the Free Software Foundation. | ||
| 7 | */ | ||
| 8 | /include/ "omap4-sdp.dts" | ||
| 9 | |||
| 10 | /* SDP boards with 4430 ES2.3+ or 4460 have external pullups on SCL & SDA */ | ||
| 11 | &dss_hdmi_pins { | ||
| 12 | pinctrl-single,pins = < | ||
| 13 | 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ | ||
| 14 | 0x5c 0x100 /* hdmi_scl.hdmi_scl INPUT | MODE 0 */ | ||
| 15 | 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */ | ||
| 16 | >; | ||
| 17 | }; | ||
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts index 0f57bdf7c2df..43e5258a9372 100644 --- a/arch/arm/boot/dts/omap4-sdp.dts +++ b/arch/arm/boot/dts/omap4-sdp.dts | |||
| @@ -124,6 +124,8 @@ | |||
| 124 | &dmic_pins | 124 | &dmic_pins |
| 125 | &mcbsp1_pins | 125 | &mcbsp1_pins |
| 126 | &mcbsp2_pins | 126 | &mcbsp2_pins |
| 127 | &dss_hdmi_pins | ||
| 128 | &tpd12s015_pins | ||
| 127 | >; | 129 | >; |
| 128 | 130 | ||
| 129 | uart2_pins: pinmux_uart2_pins { | 131 | uart2_pins: pinmux_uart2_pins { |
| @@ -194,6 +196,22 @@ | |||
| 194 | 0xbc 0x100 /* abe_mcbsp2_fsx.abe_mcbsp2_fsx INPUT | MODE0 */ | 196 | 0xbc 0x100 /* abe_mcbsp2_fsx.abe_mcbsp2_fsx INPUT | MODE0 */ |
| 195 | >; | 197 | >; |
| 196 | }; | 198 | }; |
| 199 | |||
| 200 | dss_hdmi_pins: pinmux_dss_hdmi_pins { | ||
| 201 | pinctrl-single,pins = < | ||
| 202 | 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ | ||
| 203 | 0x5c 0x118 /* hdmi_scl.hdmi_scl INPUT PULLUP | MODE 0 */ | ||
| 204 | 0x5e 0x118 /* hdmi_sda.hdmi_sda INPUT PULLUP | MODE 0 */ | ||
| 205 | >; | ||
| 206 | }; | ||
| 207 | |||
| 208 | tpd12s015_pins: pinmux_tpd12s015_pins { | ||
| 209 | pinctrl-single,pins = < | ||
| 210 | 0x22 0x3 /* gpmc_a17.gpio_41 OUTPUT | MODE3 */ | ||
| 211 | 0x48 0x3 /* gpmc_nbe1.gpio_60 OUTPUT | MODE3 */ | ||
| 212 | 0x58 0x10b /* hdmi_hpd.gpio_63 INPUT PULLDOWN | MODE3 */ | ||
| 213 | >; | ||
| 214 | }; | ||
| 197 | }; | 215 | }; |
| 198 | 216 | ||
| 199 | &i2c1 { | 217 | &i2c1 { |
diff --git a/arch/arm/boot/dts/omap5-evm.dts b/arch/arm/boot/dts/omap5-evm.dts index c663eba73168..8722c15bbba2 100644 --- a/arch/arm/boot/dts/omap5-evm.dts +++ b/arch/arm/boot/dts/omap5-evm.dts | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | /dts-v1/; | 8 | /dts-v1/; |
| 9 | 9 | ||
| 10 | /include/ "omap5.dtsi" | 10 | /include/ "omap5.dtsi" |
| 11 | /include/ "samsung_k3pe0e000b.dtsi" | ||
| 11 | 12 | ||
| 12 | / { | 13 | / { |
| 13 | model = "TI OMAP5 EVM board"; | 14 | model = "TI OMAP5 EVM board"; |
| @@ -15,7 +16,7 @@ | |||
| 15 | 16 | ||
| 16 | memory { | 17 | memory { |
| 17 | device_type = "memory"; | 18 | device_type = "memory"; |
| 18 | reg = <0x80000000 0x40000000>; /* 1 GB */ | 19 | reg = <0x80000000 0x80000000>; /* 2 GB */ |
| 19 | }; | 20 | }; |
| 20 | 21 | ||
| 21 | vmmcsd_fixed: fixedregulator-mmcsd { | 22 | vmmcsd_fixed: fixedregulator-mmcsd { |
| @@ -140,3 +141,13 @@ | |||
| 140 | &mcbsp3 { | 141 | &mcbsp3 { |
| 141 | status = "disabled"; | 142 | status = "disabled"; |
| 142 | }; | 143 | }; |
| 144 | |||
| 145 | &emif1 { | ||
| 146 | cs1-used; | ||
| 147 | device-handle = <&samsung_K3PE0E000B>; | ||
| 148 | }; | ||
| 149 | |||
| 150 | &emif2 { | ||
| 151 | cs1-used; | ||
| 152 | device-handle = <&samsung_K3PE0E000B>; | ||
| 153 | }; | ||
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index ead74c85d999..790bb2a4b343 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi | |||
| @@ -474,5 +474,27 @@ | |||
| 474 | ti,hwmods = "timer11"; | 474 | ti,hwmods = "timer11"; |
| 475 | ti,timer-pwm; | 475 | ti,timer-pwm; |
| 476 | }; | 476 | }; |
| 477 | |||
| 478 | emif1: emif@0x4c000000 { | ||
| 479 | compatible = "ti,emif-4d5"; | ||
| 480 | ti,hwmods = "emif1"; | ||
| 481 | phy-type = <2>; /* DDR PHY type: Intelli PHY */ | ||
| 482 | reg = <0x4c000000 0x400>; | ||
| 483 | interrupts = <0 110 0x4>; | ||
| 484 | hw-caps-read-idle-ctrl; | ||
| 485 | hw-caps-ll-interface; | ||
| 486 | hw-caps-temp-alert; | ||
| 487 | }; | ||
| 488 | |||
| 489 | emif2: emif@0x4d000000 { | ||
| 490 | compatible = "ti,emif-4d5"; | ||
| 491 | ti,hwmods = "emif2"; | ||
| 492 | phy-type = <2>; /* DDR PHY type: Intelli PHY */ | ||
| 493 | reg = <0x4d000000 0x400>; | ||
| 494 | interrupts = <0 111 0x4>; | ||
| 495 | hw-caps-read-idle-ctrl; | ||
| 496 | hw-caps-ll-interface; | ||
| 497 | hw-caps-temp-alert; | ||
| 498 | }; | ||
| 477 | }; | 499 | }; |
| 478 | }; | 500 | }; |
diff --git a/arch/arm/boot/dts/samsung_k3pe0e000b.dtsi b/arch/arm/boot/dts/samsung_k3pe0e000b.dtsi new file mode 100644 index 000000000000..9657a5cbc3ad --- /dev/null +++ b/arch/arm/boot/dts/samsung_k3pe0e000b.dtsi | |||
| @@ -0,0 +1,67 @@ | |||
| 1 | /* | ||
| 2 | * Timings and Geometry for Samsung K3PE0E000B memory part | ||
| 3 | */ | ||
| 4 | |||
| 5 | / { | ||
| 6 | samsung_K3PE0E000B: lpddr2 { | ||
| 7 | compatible = "Samsung,K3PE0E000B","jedec,lpddr2-s4"; | ||
| 8 | density = <4096>; | ||
| 9 | io-width = <32>; | ||
| 10 | |||
| 11 | tRPab-min-tck = <3>; | ||
| 12 | tRCD-min-tck = <3>; | ||
| 13 | tWR-min-tck = <3>; | ||
| 14 | tRASmin-min-tck = <3>; | ||
| 15 | tRRD-min-tck = <2>; | ||
| 16 | tWTR-min-tck = <2>; | ||
| 17 | tXP-min-tck = <2>; | ||
| 18 | tRTP-min-tck = <2>; | ||
| 19 | tCKE-min-tck = <3>; | ||
| 20 | tCKESR-min-tck = <3>; | ||
| 21 | tFAW-min-tck = <8>; | ||
| 22 | |||
| 23 | timings_samsung_K3PE0E000B_533MHz: lpddr2-timings@0 { | ||
| 24 | compatible = "jedec,lpddr2-timings"; | ||
| 25 | min-freq = <10000000>; | ||
| 26 | max-freq = <533333333>; | ||
| 27 | tRPab = <21000>; | ||
| 28 | tRCD = <18000>; | ||
| 29 | tWR = <15000>; | ||
| 30 | tRAS-min = <42000>; | ||
| 31 | tRRD = <10000>; | ||
| 32 | tWTR = <7500>; | ||
| 33 | tXP = <7500>; | ||
| 34 | tRTP = <7500>; | ||
| 35 | tCKESR = <15000>; | ||
| 36 | tDQSCK-max = <5500>; | ||
| 37 | tFAW = <50000>; | ||
| 38 | tZQCS = <90000>; | ||
| 39 | tZQCL = <360000>; | ||
| 40 | tZQinit = <1000000>; | ||
| 41 | tRAS-max-ns = <70000>; | ||
| 42 | tDQSCK-max-derated = <6000>; | ||
| 43 | }; | ||
| 44 | |||
| 45 | timings_samsung_K3PE0E000B_266MHz: lpddr2-timings@1 { | ||
| 46 | compatible = "jedec,lpddr2-timings"; | ||
| 47 | min-freq = <10000000>; | ||
| 48 | max-freq = <266666666>; | ||
| 49 | tRPab = <21000>; | ||
| 50 | tRCD = <18000>; | ||
| 51 | tWR = <15000>; | ||
| 52 | tRAS-min = <42000>; | ||
| 53 | tRRD = <10000>; | ||
| 54 | tWTR = <7500>; | ||
| 55 | tXP = <7500>; | ||
| 56 | tRTP = <7500>; | ||
| 57 | tCKESR = <15000>; | ||
| 58 | tDQSCK-max = <5500>; | ||
| 59 | tFAW = <50000>; | ||
| 60 | tZQCS = <90000>; | ||
| 61 | tZQCL = <360000>; | ||
| 62 | tZQinit = <1000000>; | ||
| 63 | tRAS-max-ns = <70000>; | ||
| 64 | tDQSCK-max-derated = <6000>; | ||
| 65 | }; | ||
| 66 | }; | ||
| 67 | }; | ||
