]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
Merge branch 'for_3.8/dts_part2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Fri, 9 Nov 2012 21:58:54 +0000 (13:58 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 9 Nov 2012 21:58:54 +0000 (13:58 -0800)
14 files changed:
Documentation/devicetree/bindings/usb/am33xx-usb.txt
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/am335x-bone.dts
arch/arm/boot/dts/am335x-evm.dts
arch/arm/boot/dts/am335x-evmsk.dts
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/omap4-panda-a4.dts [new file with mode: 0644]
arch/arm/boot/dts/omap4-panda-es.dts
arch/arm/boot/dts/omap4-panda.dts
arch/arm/boot/dts/omap4-sdp-es23plus.dts [new file with mode: 0644]
arch/arm/boot/dts/omap4-sdp.dts
arch/arm/boot/dts/omap5-evm.dts
arch/arm/boot/dts/omap5.dtsi
arch/arm/boot/dts/samsung_k3pe0e000b.dtsi [new file with mode: 0644]

index ca8fa56e9f03e6d5f6ad4a0f35885e9fb4fa66ed..707c1a2dae06dc9d5ee2c27c35a8129dfb30a9c0 100644 (file)
@@ -1,5 +1,7 @@
 AM33XX MUSB GLUE
  - compatible : Should be "ti,musb-am33xx"
+ - reg : offset and length of register sets, first usbss, then for musb instances
+ - interrupts : usbss, musb instance interrupts in order
  - ti,hwmods : must be "usb_otg_hs"
  - multipoint : Should be "1" indicating the musb controller supports
    multipoint. This is a MUSB configuration-specific setting.
@@ -12,3 +14,22 @@ AM33XX MUSB GLUE
    represents PERIPHERAL.
  - power : Should be "250". This signifies the controller can supply upto
    500mA when operating in host mode.
+
+Example:
+
+usb@47400000  {
+       compatible = "ti,musb-am33xx";
+       reg = <0x47400000 0x1000        /* usbss */
+              0x47401000 0x800         /* musb instance 0 */
+              0x47401800 0x800>;       /* musb instance 1 */
+       interrupts = <17                /* usbss */
+                     18                /* musb instance 0 */
+                     19>;              /* musb instance 1 */
+       multipoint = <1>;
+       num-eps = <16>;
+       ram-bits = <12>;
+       port0-mode = <3>;
+       port1-mode = <3>;
+       power = <250>;
+       ti,hwmods = "usb_otg_hs";
+};
index 634bd4246574402cb73f5f0e37d0aa76a0f9860c..2458b69e2be6f2937d1189f8251a83592a4d8ec8 100644 (file)
@@ -73,6 +73,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
        omap4-sdp.dtb \
        omap5-evm.dtb \
        am335x-evm.dtb \
+       am335x-evmsk.dtb \
        am335x-bone.dtb
 dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
 dtb-$(CONFIG_ARCH_U8500) += snowball.dtb
index 91eee97371ea359b80be3d14895738082f013904..2c338889df1bd308e8e76da28148a0434a830ca0 100644 (file)
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
 
+       am33xx_pinmux: pinmux@44e10800 {
+               pinctrl-names = "default";
+               pinctrl-0 = <&user_leds_s0>;
+
+               user_leds_s0: user_leds_s0 {
+                       pinctrl-single,pins = <
+                               0x54 0x7        /* gpmc_a5.gpio1_21, OUTPUT | MODE7 */
+                               0x58 0x17       /* gpmc_a6.gpio1_22, OUTPUT_PULLUP | MODE7 */
+                               0x5c 0x7        /* gpmc_a7.gpio1_23, OUTPUT | MODE7 */
+                               0x60 0x17       /* gpmc_a8.gpio1_24, OUTPUT_PULLUP | MODE7 */
+                       >;
+               };
+       };
+
        ocp {
                uart1: serial@44e09000 {
                        status = "okay";
 
                };
        };
+
+       leds {
+               compatible = "gpio-leds";
+
+               led@2 {
+                       label = "beaglebone:green:heartbeat";
+                       gpios = <&gpio2 21 0>;
+                       linux,default-trigger = "heartbeat";
+                       default-state = "off";
+               };
+
+               led@3 {
+                       label = "beaglebone:green:mmc0";
+                       gpios = <&gpio2 22 0>;
+                       linux,default-trigger = "mmc0";
+                       default-state = "off";
+               };
+
+               led@4 {
+                       label = "beaglebone:green:usr2";
+                       gpios = <&gpio2 23 0>;
+                       default-state = "off";
+               };
+
+               led@5 {
+                       label = "beaglebone:green:usr3";
+                       gpios = <&gpio2 24 0>;
+                       default-state = "off";
+               };
+       };
 };
 
 /include/ "tps65217.dtsi"
index 513284fc66b9a6e0f4ad20fd7a74224f27f92161..9f65f17ebdf8f10452e28048a9c7a7af5a8e455c 100644 (file)
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
 
+       am33xx_pinmux: pinmux@44e10800 {
+               pinctrl-names = "default";
+               pinctrl-0 = <&matrix_keypad_s0 &volume_keys_s0>;
+
+               matrix_keypad_s0: matrix_keypad_s0 {
+                       pinctrl-single,pins = <
+                               0x54 0x7        /* gpmc_a5.gpio1_21, OUTPUT | MODE7 */
+                               0x58 0x7        /* gpmc_a6.gpio1_22, OUTPUT | MODE7 */
+                               0x64 0x27       /* gpmc_a9.gpio1_25, INPUT | MODE7 */
+                               0x68 0x27       /* gpmc_a10.gpio1_26, INPUT | MODE7 */
+                               0x6c 0x27       /* gpmc_a11.gpio1_27, INPUT | MODE7 */
+                       >;
+               };
+
+               volume_keys_s0: volume_keys_s0 {
+                       pinctrl-single,pins = <
+                               0x150 0x27      /* spi0_sclk.gpio0_2, INPUT | MODE7 */
+                               0x154 0x27      /* spi0_d0.gpio0_3, INPUT | MODE7 */
+                       >;
+               };
+       };
+
        ocp {
                uart1: serial@44e09000 {
                        status = "okay";
                regulator-name = "lis3_reg";
                regulator-boot-on;
        };
+
+       matrix_keypad: matrix_keypad@0 {
+               compatible = "gpio-matrix-keypad";
+               debounce-delay-ms = <5>;
+               col-scan-delay-us = <2>;
+
+               row-gpios = <&gpio2 25 0        /* Bank1, pin25 */
+                            &gpio2 26 0        /* Bank1, pin26 */
+                            &gpio2 27 0>;      /* Bank1, pin27 */
+
+               col-gpios = <&gpio2 21 0        /* Bank1, pin21 */
+                            &gpio2 22 0>;      /* Bank1, pin22 */
+
+               linux,keymap = <0x0000008b      /* MENU */
+                               0x0100009e      /* BACK */
+                               0x02000069      /* LEFT */
+                               0x0001006a      /* RIGHT */
+                               0x0101001c      /* ENTER */
+                               0x0201006c>;    /* DOWN */
+       };
+
+       gpio_keys: volume_keys@0 {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               autorepeat;
+
+               switch@9 {
+                       label = "volume-up";
+                       linux,code = <115>;
+                       gpios = <&gpio1 2 1>;
+                       gpio-key,wakeup;
+               };
+
+               switch@10 {
+                       label = "volume-down";
+                       linux,code = <114>;
+                       gpios = <&gpio1 3 1>;
+                       gpio-key,wakeup;
+               };
+       };
 };
 
 /include/ "tps65910.dtsi"
index 6f538798786510187883cbf17c11aa06df5608b2..f5a6162a4ff22c0137fc97346c03d26cca11e8b7 100644 (file)
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
 
+       am33xx_pinmux: pinmux@44e10800 {
+               pinctrl-names = "default";
+               pinctrl-0 = <&user_leds_s0 &gpio_keys_s0>;
+
+               user_leds_s0: user_leds_s0 {
+                       pinctrl-single,pins = <
+                               0x10 0x7        /* gpmc_ad4.gpio1_4, OUTPUT | MODE7 */
+                               0x14 0x7        /* gpmc_ad5.gpio1_5, OUTPUT | MODE7 */
+                               0x18 0x7        /* gpmc_ad6.gpio1_6, OUTPUT | MODE7 */
+                               0x1c 0x7        /* gpmc_ad7.gpio1_7, OUTPUT | MODE7 */
+                       >;
+               };
+
+               gpio_keys_s0: gpio_keys_s0 {
+                       pinctrl-single,pins = <
+                               0x94 0x27       /* gpmc_oen_ren.gpio2_3, INPUT | MODE7 */
+                               0x90 0x27       /* gpmc_advn_ale.gpio2_2, INPUT | MODE7 */
+                               0x70 0x27       /* gpmc_wait0.gpio0_30, INPUT | MODE7 */
+                               0x9c 0x27       /* gpmc_ben0_cle.gpio2_5, INPUT | MODE7 */
+                       >;
+               };
+       };
+
        ocp {
                uart1: serial@44e09000 {
                        status = "okay";
                regulator-name = "lis3_reg";
                regulator-boot-on;
        };
+
+       leds {
+               compatible = "gpio-leds";
+
+               led@1 {
+                       label = "evmsk:green:usr0";
+                       gpios = <&gpio2 4 0>;
+                       default-state = "off";
+               };
+
+               led@2 {
+                       label = "evmsk:green:usr1";
+                       gpios = <&gpio2 5 0>;
+                       default-state = "off";
+               };
+
+               led@3 {
+                       label = "evmsk:green:mmc0";
+                       gpios = <&gpio2 6 0>;
+                       linux,default-trigger = "mmc0";
+                       default-state = "off";
+               };
+
+               led@4 {
+                       label = "evmsk:green:heartbeat";
+                       gpios = <&gpio2 7 0>;
+                       linux,default-trigger = "heartbeat";
+                       default-state = "off";
+               };
+       };
+
+       gpio_buttons: gpio_buttons@0 {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               switch@1 {
+                       label = "button0";
+                       linux,code = <0x100>;
+                       gpios = <&gpio3 3 0>;
+               };
+
+               switch@2 {
+                       label = "button1";
+                       linux,code = <0x101>;
+                       gpios = <&gpio3 2 0>;
+               };
+
+               switch@3 {
+                       label = "button2";
+                       linux,code = <0x102>;
+                       gpios = <&gpio1 30 0>;
+                       gpio-key,wakeup;
+               };
+
+               switch@4 {
+                       label = "button3";
+                       linux,code = <0x103>;
+                       gpios = <&gpio3 5 0>;
+               };
+       };
 };
 
 /include/ "tps65910.dtsi"
index 5dfd6822e6f836db303e600f117125241f5e33a7..20a3f29a6bfeaf9a81b4c988b64dbe8ab3aa16cb 100644 (file)
                        ti,hwmods = "spi1";
                        status = "disabled";
                };
+
+               usb@47400000 {
+                       compatible = "ti,musb-am33xx";
+                       reg = <0x47400000 0x1000        /* usbss */
+                              0x47401000 0x800         /* musb instance 0 */
+                              0x47401800 0x800>;       /* musb instance 1 */
+                       interrupts = <17                /* usbss */
+                                     18                /* musb instance 0 */
+                                     19>;              /* musb instance 1 */
+                       multipoint = <1>;
+                       num-eps = <16>;
+                       ram-bits = <12>;
+                       port0-mode = <3>;
+                       port1-mode = <3>;
+                       power = <250>;
+                       ti,hwmods = "usb_otg_hs";
+               };
        };
 };
diff --git a/arch/arm/boot/dts/omap4-panda-a4.dts b/arch/arm/boot/dts/omap4-panda-a4.dts
new file mode 100644 (file)
index 0000000..75466d2
--- /dev/null
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+/include/ "omap4-panda.dts"
+
+/* Pandaboard Rev A4+ have external pullups on SCL & SDA */
+&dss_hdmi_pins {
+       pinctrl-single,pins = <
+               0x5a 0x118      /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */
+               0x5c 0x100      /* hdmi_scl.hdmi_scl INPUT | MODE 0 */
+               0x5e 0x100      /* hdmi_sda.hdmi_sda INPUT | MODE 0 */
+               >;
+};
index d4ba43a48d9b3f46a354267a9eb1d11b9739f3a4..73bc1a67e444480ff08ec414848981ec27fe7e39 100644 (file)
                "AFML", "Line In",
                "AFMR", "Line In";
 };
+
+/* PandaboardES has external pullups on SCL & SDA */
+&dss_hdmi_pins {
+       pinctrl-single,pins = <
+               0x5a 0x118      /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */
+               0x5c 0x100      /* hdmi_scl.hdmi_scl INPUT | MODE 0 */
+               0x5e 0x100      /* hdmi_sda.hdmi_sda INPUT | MODE 0 */
+               >;
+};
index 32baf65a7ea2c0933b3847fc6fb5e5de4fb6f543..4122efe31cfdf04ed6218ca970c7c661372d94e2 100644 (file)
@@ -65,6 +65,8 @@
                        &twl6040_pins
                        &mcpdm_pins
                        &mcbsp1_pins
+                       &dss_hdmi_pins
+                       &tpd12s015_pins
        >;
 
        twl6040_pins: pinmux_twl6040_pins {
                        0xc4 0x100      /* abe_mcbsp1_fsx.abe_mcbsp1_fsx INPUT | MODE0 */
                >;
        };
+
+       dss_hdmi_pins: pinmux_dss_hdmi_pins {
+               pinctrl-single,pins = <
+                       0x5a 0x118      /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */
+                       0x5c 0x118      /* hdmi_scl.hdmi_scl INPUT PULLUP | MODE 0 */
+                       0x5e 0x118      /* hdmi_sda.hdmi_sda INPUT PULLUP | MODE 0 */
+               >;
+       };
+
+       tpd12s015_pins: pinmux_tpd12s015_pins {
+               pinctrl-single,pins = <
+                       0x22 0x3        /* gpmc_a17.gpio_41 OUTPUT | MODE3 */
+                       0x48 0x3        /* gpmc_nbe1.gpio_60 OUTPUT | MODE3 */
+                       0x58 0x10b      /* hdmi_hpd.gpio_63 INPUT PULLDOWN | MODE3 */
+               >;
+       };
 };
 
 &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 (file)
index 0000000..b4a40ff
--- /dev/null
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+/include/ "omap4-sdp.dts"
+
+/* SDP boards with 4430 ES2.3+ or 4460 have external pullups on SCL & SDA */
+&dss_hdmi_pins {
+       pinctrl-single,pins = <
+               0x5a 0x118      /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */
+               0x5c 0x100      /* hdmi_scl.hdmi_scl INPUT | MODE 0 */
+               0x5e 0x100      /* hdmi_sda.hdmi_sda INPUT | MODE 0 */
+               >;
+};
index 0f57bdf7c2df650b8827665b1a52311540238700..43e5258a9372b673d8c7a7866e30bbd5181148fa 100644 (file)
                        &dmic_pins
                        &mcbsp1_pins
                        &mcbsp2_pins
+                       &dss_hdmi_pins
+                       &tpd12s015_pins
        >;
 
        uart2_pins: pinmux_uart2_pins {
                        0xbc 0x100      /* abe_mcbsp2_fsx.abe_mcbsp2_fsx INPUT | MODE0 */
                >;
        };
+
+       dss_hdmi_pins: pinmux_dss_hdmi_pins {
+               pinctrl-single,pins = <
+                       0x5a 0x118      /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */
+                       0x5c 0x118      /* hdmi_scl.hdmi_scl INPUT PULLUP | MODE 0 */
+                       0x5e 0x118      /* hdmi_sda.hdmi_sda INPUT PULLUP | MODE 0 */
+               >;
+       };
+
+       tpd12s015_pins: pinmux_tpd12s015_pins {
+               pinctrl-single,pins = <
+                       0x22 0x3        /* gpmc_a17.gpio_41 OUTPUT | MODE3 */
+                       0x48 0x3        /* gpmc_nbe1.gpio_60 OUTPUT | MODE3 */
+                       0x58 0x10b      /* hdmi_hpd.gpio_63 INPUT PULLDOWN | MODE3 */
+               >;
+       };
 };
 
 &i2c1 {
index c663eba73168adb8eb27edd7e15147440fae1af6..8722c15bbba2869a0fcd617517b132d930c05899 100644 (file)
@@ -8,6 +8,7 @@
 /dts-v1/;
 
 /include/ "omap5.dtsi"
+/include/ "samsung_k3pe0e000b.dtsi"
 
 / {
        model = "TI OMAP5 EVM board";
@@ -15,7 +16,7 @@
 
        memory {
                device_type = "memory";
-               reg = <0x80000000 0x40000000>; /* 1 GB */
+               reg = <0x80000000 0x80000000>; /* 2 GB */
        };
 
        vmmcsd_fixed: fixedregulator-mmcsd {
 &mcbsp3 {
        status = "disabled";
 };
+
+&emif1 {
+       cs1-used;
+       device-handle = <&samsung_K3PE0E000B>;
+};
+
+&emif2 {
+       cs1-used;
+       device-handle = <&samsung_K3PE0E000B>;
+};
index ead74c85d999505aaf138623ab6cb2ec04d35d0b..790bb2a4b3434d47a500005da78ec20d385afd48 100644 (file)
                        ti,hwmods = "timer11";
                        ti,timer-pwm;
                };
+
+               emif1: emif@0x4c000000 {
+                       compatible      = "ti,emif-4d5";
+                       ti,hwmods       = "emif1";
+                       phy-type        = <2>; /* DDR PHY type: Intelli PHY */
+                       reg = <0x4c000000 0x400>;
+                       interrupts = <0 110 0x4>;
+                       hw-caps-read-idle-ctrl;
+                       hw-caps-ll-interface;
+                       hw-caps-temp-alert;
+               };
+
+               emif2: emif@0x4d000000 {
+                       compatible      = "ti,emif-4d5";
+                       ti,hwmods       = "emif2";
+                       phy-type        = <2>; /* DDR PHY type: Intelli PHY */
+                       reg = <0x4d000000 0x400>;
+                       interrupts = <0 111 0x4>;
+                       hw-caps-read-idle-ctrl;
+                       hw-caps-ll-interface;
+                       hw-caps-temp-alert;
+               };
        };
 };
diff --git a/arch/arm/boot/dts/samsung_k3pe0e000b.dtsi b/arch/arm/boot/dts/samsung_k3pe0e000b.dtsi
new file mode 100644 (file)
index 0000000..9657a5c
--- /dev/null
@@ -0,0 +1,67 @@
+/*
+ * Timings and Geometry for Samsung K3PE0E000B memory part
+ */
+
+/ {
+       samsung_K3PE0E000B: lpddr2 {
+               compatible      = "Samsung,K3PE0E000B","jedec,lpddr2-s4";
+               density         = <4096>;
+               io-width        = <32>;
+
+               tRPab-min-tck   = <3>;
+               tRCD-min-tck    = <3>;
+               tWR-min-tck     = <3>;
+               tRASmin-min-tck = <3>;
+               tRRD-min-tck    = <2>;
+               tWTR-min-tck    = <2>;
+               tXP-min-tck     = <2>;
+               tRTP-min-tck    = <2>;
+               tCKE-min-tck    = <3>;
+               tCKESR-min-tck  = <3>;
+               tFAW-min-tck    = <8>;
+
+               timings_samsung_K3PE0E000B_533MHz: lpddr2-timings@0 {
+                       compatible      = "jedec,lpddr2-timings";
+                       min-freq        = <10000000>;
+                       max-freq        = <533333333>;
+                       tRPab           = <21000>;
+                       tRCD            = <18000>;
+                       tWR             = <15000>;
+                       tRAS-min        = <42000>;
+                       tRRD            = <10000>;
+                       tWTR            = <7500>;
+                       tXP             = <7500>;
+                       tRTP            = <7500>;
+                       tCKESR          = <15000>;
+                       tDQSCK-max      = <5500>;
+                       tFAW            = <50000>;
+                       tZQCS           = <90000>;
+                       tZQCL           = <360000>;
+                       tZQinit         = <1000000>;
+                       tRAS-max-ns     = <70000>;
+                       tDQSCK-max-derated = <6000>;
+               };
+
+               timings_samsung_K3PE0E000B_266MHz: lpddr2-timings@1 {
+                       compatible      = "jedec,lpddr2-timings";
+                       min-freq        = <10000000>;
+                       max-freq        = <266666666>;
+                       tRPab           = <21000>;
+                       tRCD            = <18000>;
+                       tWR             = <15000>;
+                       tRAS-min        = <42000>;
+                       tRRD            = <10000>;
+                       tWTR            = <7500>;
+                       tXP             = <7500>;
+                       tRTP            = <7500>;
+                       tCKESR          = <15000>;
+                       tDQSCK-max      = <5500>;
+                       tFAW            = <50000>;
+                       tZQCS           = <90000>;
+                       tZQCL           = <360000>;
+                       tZQinit         = <1000000>;
+                       tRAS-max-ns     = <70000>;
+                       tDQSCK-max-derated = <6000>;
+               };
+       };
+};