]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'omap_dss2/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 03:38:15 +0000 (13:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 03:38:15 +0000 (13:38 +1000)
Conflicts:
arch/arm/boot/dts/am437x-gp-evm.dts

1  2 
arch/arm/boot/dts/am4372.dtsi
arch/arm/boot/dts/am437x-gp-evm.dts
arch/arm/boot/dts/omap3-evm-37xx.dts
arch/arm/boot/dts/omap3-ldp.dts
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5.dtsi
include/linux/omap-dma.h

Simple merge
index c25d15837ce9d0220ebbc1eb539ce12f8c5a0ea8,3acccdf258e94a03feecfb12d6f12c09fa81c8a7..003766c47bbfe094d3b68d2d4169a2119ba4cf9b
                >;
        };
  
 +      nand_flash_x8: nand_flash_x8 {
 +              pinctrl-single,pins = <
 +                      0x26c(PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* spi2_cs0.gpio/eMMCorNANDsel */
 +                      0x0  (PIN_INPUT  | MUX_MODE0)   /* gpmc_ad0.gpmc_ad0 */
 +                      0x4  (PIN_INPUT  | MUX_MODE0)   /* gpmc_ad1.gpmc_ad1 */
 +                      0x8  (PIN_INPUT  | MUX_MODE0)   /* gpmc_ad2.gpmc_ad2 */
 +                      0xc  (PIN_INPUT  | MUX_MODE0)   /* gpmc_ad3.gpmc_ad3 */
 +                      0x10 (PIN_INPUT  | MUX_MODE0)   /* gpmc_ad4.gpmc_ad4 */
 +                      0x14 (PIN_INPUT  | MUX_MODE0)   /* gpmc_ad5.gpmc_ad5 */
 +                      0x18 (PIN_INPUT  | MUX_MODE0)   /* gpmc_ad6.gpmc_ad6 */
 +                      0x1c (PIN_INPUT  | MUX_MODE0)   /* gpmc_ad7.gpmc_ad7 */
 +                      0x70 (PIN_INPUT_PULLUP | MUX_MODE0)     /* gpmc_wait0.gpmc_wait0 */
 +                      0x74 (PIN_OUTPUT_PULLUP | MUX_MODE7)    /* gpmc_wpn.gpmc_wpn */
 +                      0x7c (PIN_OUTPUT | MUX_MODE0)           /* gpmc_csn0.gpmc_csn0  */
 +                      0x90 (PIN_OUTPUT | MUX_MODE0)           /* gpmc_advn_ale.gpmc_advn_ale */
 +                      0x94 (PIN_OUTPUT | MUX_MODE0)           /* gpmc_oen_ren.gpmc_oen_ren */
 +                      0x98 (PIN_OUTPUT | MUX_MODE0)           /* gpmc_wen.gpmc_wen */
 +                      0x9c (PIN_OUTPUT | MUX_MODE0)           /* gpmc_be0n_cle.gpmc_be0n_cle */
 +              >;
 +      };
++
+       dss_pins: dss_pins {
+               pinctrl-single,pins = <
+                       0x020 (PIN_OUTPUT_PULLUP | MUX_MODE1) /*gpmc ad 8 -> DSS DATA 23 */
+                       0x024 (PIN_OUTPUT_PULLUP | MUX_MODE1)
+                       0x028 (PIN_OUTPUT_PULLUP | MUX_MODE1)
+                       0x02c (PIN_OUTPUT_PULLUP | MUX_MODE1)
+                       0x030 (PIN_OUTPUT_PULLUP | MUX_MODE1)
+                       0x034 (PIN_OUTPUT_PULLUP | MUX_MODE1)
+                       0x038 (PIN_OUTPUT_PULLUP | MUX_MODE1)
+                       0x03c (PIN_OUTPUT_PULLUP | MUX_MODE1) /*gpmc ad 15 -> DSS DATA 16 */
+                       0x0a0 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* DSS DATA 0 */
+                       0x0a4 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                       0x0a8 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                       0x0ac (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                       0x0b0 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                       0x0b4 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                       0x0b8 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                       0x0bc (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                       0x0c0 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                       0x0c4 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                       0x0c8 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                       0x0cc (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                       0x0d0 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                       0x0d4 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                       0x0d8 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                       0x0dc (PIN_OUTPUT_PULLUP | MUX_MODE0) /* DSS DATA 15 */
+                       0x0e0 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* DSS VSYNC */
+                       0x0e4 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* DSS HSYNC */
+                       0x0e8 (PIN_OUTPUT_PULLUP | MUX_MODE0) /* DSS PCLK */
+                       0x0ec (PIN_OUTPUT_PULLUP | MUX_MODE0) /* DSS AC BIAS EN */
+               >;
+       };
+       lcd_pins: lcd_pins {
+               pinctrl-single,pins = <
+                       /* GPIO 5_8 to select LCD / HDMI */
+                       0x238 (PIN_OUTPUT_PULLUP | MUX_MODE7)
+               >;
+       };
  };
  
  &i2c0 {
        phy-mode = "rgmii";
  };
  
 +&elm {
 +      status = "okay";
 +};
 +
 +&gpmc {
 +      status = "okay";
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&nand_flash_x8>;
 +      ranges = <0 0 0 0x01000000>;    /* minimum GPMC partition = 16MB */
 +      nand@0,0 {
 +              reg = <0 0 4>;          /* device IO registers */
 +              ti,nand-ecc-opt = "bch8";
 +              ti,elm-id = <&elm>;
 +              nand-bus-width = <8>;
 +              gpmc,device-width = <1>;
 +              gpmc,sync-clk-ps = <0>;
 +              gpmc,cs-on-ns = <0>;
 +              gpmc,cs-rd-off-ns = <40>;
 +              gpmc,cs-wr-off-ns = <40>;
 +              gpmc,adv-on-ns = <0>;
 +              gpmc,adv-rd-off-ns = <25>;
 +              gpmc,adv-wr-off-ns = <25>;
 +              gpmc,we-on-ns = <0>;
 +              gpmc,we-off-ns = <20>;
 +              gpmc,oe-on-ns = <3>;
 +              gpmc,oe-off-ns = <30>;
 +              gpmc,access-ns = <30>;
 +              gpmc,rd-cycle-ns = <40>;
 +              gpmc,wr-cycle-ns = <40>;
 +              gpmc,wait-pin = <0>;
 +              gpmc,wait-on-read;
 +              gpmc,wait-on-write;
 +              gpmc,bus-turnaround-ns = <0>;
 +              gpmc,cycle2cycle-delay-ns = <0>;
 +              gpmc,clk-activation-ns = <0>;
 +              gpmc,wait-monitoring-ns = <0>;
 +              gpmc,wr-access-ns = <40>;
 +              gpmc,wr-data-mux-bus-ns = <0>;
 +              /* MTD partition table */
 +              /* All SPL-* partitions are sized to minimal length
 +               * which can be independently programmable. For
 +               * NAND flash this is equal to size of erase-block */
 +              #address-cells = <1>;
 +              #size-cells = <1>;
 +              partition@0 {
 +                      label = "NAND.SPL";
 +                      reg = <0x00000000 0x00040000>;
 +              };
 +              partition@1 {
 +                      label = "NAND.SPL.backup1";
 +                      reg = <0x00040000 0x00040000>;
 +              };
 +              partition@2 {
 +                      label = "NAND.SPL.backup2";
 +                      reg = <0x00080000 0x00040000>;
 +              };
 +              partition@3 {
 +                      label = "NAND.SPL.backup3";
 +                      reg = <0x000c0000 0x00040000>;
 +              };
 +              partition@4 {
 +                      label = "NAND.u-boot-spl-os";
 +                      reg = <0x00100000 0x00080000>;
 +              };
 +              partition@5 {
 +                      label = "NAND.u-boot";
 +                      reg = <0x00180000 0x00100000>;
 +              };
 +              partition@6 {
 +                      label = "NAND.u-boot-env";
 +                      reg = <0x00280000 0x00040000>;
 +              };
 +              partition@7 {
 +                      label = "NAND.u-boot-env.backup1";
 +                      reg = <0x002c0000 0x00040000>;
 +              };
 +              partition@8 {
 +                      label = "NAND.kernel";
 +                      reg = <0x00300000 0x00700000>;
 +              };
 +              partition@9 {
 +                      label = "NAND.file-system";
 +                      reg = <0x00a00000 0x1f600000>;
 +              };
 +      };
 +};
++
+ &dss {
+       status = "ok";
+       pinctrl-names = "default";
+       pinctrl-0 = <&dss_pins>;
+       port {
+               dpi_out: endpoint@0 {
+                       remote-endpoint = <&lcd_in>;
+                       data-lines = <24>;
+               };
+       };
+ };
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge