]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
DTS update karo-tx48-lw kc/karo-tx48-lw
authorLothar Waßmann <LW@KARO-electronics.de>
Thu, 4 Apr 2013 10:02:05 +0000 (12:02 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Thu, 4 Apr 2013 10:02:05 +0000 (12:02 +0200)
arch/arm/boot/dts/am335x-tx48.dts
arch/arm/boot/dts/am33xx.dtsi

index 6737e809a496f332d78e28535082b7eb97bc0922..aa77e7463574b164f71daa2f1dd7c343370a216b 100755 (executable)
@@ -20,7 +20,7 @@
 
        cpus {
                cpu@0 {
-                       cpu0-supply = <&sw2_reg>;
+//                     cpu0-supply = <&sw2_reg>;
                };
        };
 
                reg = <0 0>; /* will be set up by bootloader */
        };
 
-       ocp {
-               pinmux@44e10800 {
-               pinctrl-names = "default";
+       reg_3v3: fixedregulator@0 {
+               compatible = "regulator-fixed";
+               regulator-name = "vbat";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-boot-on;
+       };
+};
 
-               pinctrl_usb_host_0: usbhostgrp-1 {
-                       pinctrl-single,pins = <
-                               0x234 0x0       /* usb1_drvvbus.usb1_drvvbus, OUTPUT | MODE0; USBH_VBUSEN */
-                               0x21c 0x7       /* usb0_drvvbus.gpio0_18,  INPUT | MODE0; #USBH_OC */
-                       >;
-               };
-               pinctrl_usbotg_0: usbotggrp-1 { // USB-OTG / 2nd CAN
-                       pinctrl-single,pins = <
-                               0x100 0x7       /* mmc0_clk.gpio2_30, OUTPUT | MODE7; USBOTG_VBUSEN */
-                               0x104 0x7       /* mmc0_cmd.gpio2_31, OUTPUT | MODE7; #USBOTG_OC */
-                       >;
-               };
-               pinctrl_dcan_1: dcan1grp-1 { // USB-OTG / 2nd CAN
-                       pinctrl-single,pins = <
-                               0x100 0x4       /* mmc0_clk.dcan1_tx, OUTPUT | MODE4; USBOTG_VBUSEN */
-                               0x104 0x7       /* mmc0_cmd.gpio2_31,  INPUT | MODE4; #USBOTG_OC */
-                       >;
-               };
-               pinctrl_i2c0_1: i2c0grp-1 {
-                       pinctrl-single,pins = <
-                               0x188 0x20      /* i2c0_sda.i2c0_sda, OUTPUT | MODE0; I2C_DATA */
-                               0x18c 0x20      /* i2c0_scl.i2c0_scl, OUTPUT | MODE0; I2C_CLK */
-                       >;
-               };
-               pinctrl_pwm_0: pwm0grp-11 {
-                       pinctrl-single,pins = <
-                               0x190 0x1       /* mcasp0_aclkx.ehrpwm0a, OUTPUT | MODE1; PWM */
-                       >;
-               };
-               pinctrl_ow_0: ow0grp-1 {
-                       pinctrl-single,pins = <
-                               0xf4 0x7        /* mmc0_dat2.gpio2_27, OUTPUT | MODE7; OWDAT */
-                       >;
-               };
-               pinctrl_cspi_0: cspi0grp-1 {
-                       pinctrl-single,pins = <
-                               0x15c 0x0       /* spi0_cs0.spi0_cs0    CSPI_SS */
-                               0x160 0x0       /* spi0_cs1.spi0_cs1    CSPI_SS*/
-                               0x154 0x0       /* spi0_d0.spi0_d0      CSPI_MOSI*/
-                               0x158 0x0       /* spi0_d1.spi0_d1      CSPI_MISO*/
-                               0x150 0x0       /* spi0_sclk.spi0_sclk, I/O | MODE0; CSPI_SCLK */
-                       >;
-               };
-               pinctrl_mmc_0: mmc0grp-1 {
-                       pinctrl-single,pins = <
-                               0x194 0x27
-                               0x12c 0x4
-                               0x130 0x4
-                               0x134 0x4
-                               0x138 0x4
-                               0x84 0x2
-                               0x80 0x2
-                       >;
-               };
-               uart1 {
-                       pinctrl_uart1_1: uart1grp-1 {
-                               pinctrl-single,pins = <
-                                       0x174 0x0
-                                       0x170 0x20
-                                       0x168 0x20
-                                       0x16c 0x0
-                               >;
-                       };
-               };
+&am33xx_pinmux {
+       pinctrl-names = "default";
 
-               uart2 {
-               pinctrl_uart2_1: uart2grp-1 {
-                       pinctrl-single,pins = <
-                               0x184 0x0
-                               0x180 0x0
-                               0x178 0x0
-                               0x17c 0x0
-                       >;
-               };
-               };
-               uart6 {
-               pinctrl_uart6_1: uart6grp-1 {
-                       pinctrl-single,pins = <
-                               0x118 0x3
-                               0x108 0x3
-                               0xf8 0x2
-                               0xfc 0x2
-                       >;
-               };
-               };
-               pinctrl_matrix_keypad_0: matrix-keypad0 {
-                       pinctrl-single,pins = <
-                               0xf0 0x7
-                               0x19c 0x7
-                               0x164 0x7
-                               0x78 0x7
-                               0x1b0 0x7
-                               0x1b4 0x7
-                               0x8c 0x7
-                               0x88 0x7
-                       >;
-               };
-               pinctrl_dcan_0: dcan0grp-1 {
-                       pinctrl-single,pins = <
-                               0x11c 0x1
-                               0x120 0x1
-                       >;
-               };
-               pinctrl_ssi_0: ssi0grp-1 {
-                       pinctrl-single,pins = <
-                               0x198 0x7
-                               0x1a8 0x3
-                               0x1ac 0x3
-                               0x1a0 0x3
-                               0x1a4 0x0
-                       >;
-               };
-               pinctrl_lcd_0: lcd0grp1 {
-                       pinctrl-single,pins = <
-                               0x20 0x0
-                               0x2c 0x0
-                               0x38 0x0
-                               0xcc 0x0
-                               0xd0 0x0
-                               0xd4 0x0
-                               0xd8 0x0
-                               0xdc 0x0
-                               0x24 0x0
-                               0x30 0x0
-                               0xb4 0x0
-                               0xb8 0x0
-                               0xbc 0x0
-                               0xc0 0x0
-                               0xc4 0x0
-                               0xc8 0x0
-                               0x28 0x0
-                               0x34 0x0
-                               0x3c 0x0
-                               0xa0 0x0
-                               0xa4 0x0
-                               0xa8 0x0
-                               0xac 0x0
-                               0xb0 0x0
-                               0xe4 0x0
-                               0xe0 0x0
-                               0xec 0x0
-                               0xe8 0x0
-                       >;
-               };
+       /* pinconfig:
+               0x08 PU/PD enable
+               0x10 PULLUP select
+               0x20 INPUT active
+               0x40 FAST slew rate
+       */
+       pinctrl_gpmc_1: gpmcgrp-1 {
+               pinctrl-single,pins = <
+                       0x00 0x38       /* gpmc_ad0.gpmc_ad0 */
+                       0x04 0x38       /* gpmc_ad1.gpmc_ad1 */
+                       0x08 0x38       /* gpmc_ad2.gpmc_ad2 */
+                       0x0c 0x38       /* gpmc_ad3.gpmc_ad3 */
+                       0x10 0x38       /* gpmc_ad4.gpmc_ad4 */
+                       0x14 0x38       /* gpmc_ad5.gpmc_ad5 */
+                       0x18 0x38       /* gpmc_ad6.gpmc_ad6 */
+                       0x1c 0x38       /* gpmc_ad7.gpmc_ad7 */
+                       0x9c 0x18       /* gpmc_ben0_cle.gpmc_ben0_cle */
+                       0x90 0x18       /* gpmc_advn_ale.gpmc_advn_ale */
+                       0x7c 0x18       /* gpmc_csn0.gpmc_csn0 */
+                       0x94 0x18       /* gpmc_oe_re.gpmc_oe_re */
+                       0x98 0x18       /* gpmc_wen.gpmc_wen */
+                       0x74 0x18       /* gpmc_wpn.gpmc_wpn */
+                       0x70 0x38       /* gpmc_wait0.gpmc_wait0 */
+               >;
+       };
+
+       pinctrl_usb_host_0: usbhostgrp-1 {
+               pinctrl-single,pins = <
+                       0x234 0x0       /* usb1_drvvbus.usb1_drvvbus, OUTPUT | MODE0; USBH_VBUSEN */
+                       0x21c 0x7       /* usb0_drvvbus.gpio0_18,  INPUT | MODE0; #USBH_OC */
+               >;
+       };
+
+       pinctrl_usbotg0: usbotggrp-1 { // USB-OTG / 2nd CAN
+               pinctrl-single,pins = <
+                       0x100 0x7       /* mmc0_clk.gpio2_30, OUTPUT | MODE7; USBOTG_VBUSEN */
+                       0x104 0x7       /* mmc0_cmd.gpio2_31, OUTPUT | MODE7; #USBOTG_OC */
+               >;
+       };
+
+       pinctrl_dcan1: dcan1grp-1 { // USB-OTG / 2nd CAN
+               pinctrl-single,pins = <
+                       0x100 0x24      /* mmc0_clk.dcan1_tx, OUTPUT | MODE4; USBOTG_VBUSEN */
+                       0x104 0x24      /* mmc0_cmd.dcan1_rx,  INPUT | MODE4; #USBOTG_OC */
+               >;
+       };
+
+       pinctrl_i2c0_1: i2c0grp-1 {
+               pinctrl-single,pins = <
+                       0x188 0x20      /* i2c0_sda.i2c0_sda, OUTPUT | MODE0; I2C_DATA */
+                       0x18c 0x20      /* i2c0_scl.i2c0_scl, OUTPUT | MODE0; I2C_CLK */
+               >;
+       };
+
+       pinctrl_pwm0: pwm0grp-11 {
+               pinctrl-single,pins = <
+                       0x190 0x1       /* mcasp0_aclkx.ehrpwm0a, OUTPUT | MODE1; PWM */
+               >;
+       };
+
+       pinctrl_ow0: ow0grp-1 {
+               pinctrl-single,pins = <
+                       0xf4 0x27       /* mmc0_dat2.gpio2_27, OUTPUT | MODE7; OWDAT */
+               >;
+       };
+
+       pinctrl_cspi0: cspi0grp-1 {
+               pinctrl-single,pins = <
+                       0x15c 0x0       /* spi0_cs0.spi0_cs0    CSPI_SS */
+                       0x160 0x0       /* spi0_cs1.spi0_cs1    CSPI_SS*/
+                       0x154 0x0       /* spi0_d0.spi0_d0      CSPI_MOSI*/
+                       0x158 0x20      /* spi0_d1.spi0_d1      CSPI_MISO*/
+                       0x150 0x0       /* spi0_sclk.spi0_sclk, I/O | MODE0; CSPI_SCLK */
+               >;
+       };
+
+       pinctrl_mmc1: mmc1grp-1 {
+               pinctrl-single,pins = <
+                       0x194 0x27      /* mcasp0_fsx.gpio3_15 SD1_CD */
+                       0x12c 0x24      /* mii1_tx_clk.mmc1_dat0 SD1_DAT0 */
+                       0x130 0x24      /* mii1_rx_clk.mmc1_dat1 SD1_DAT1 */
+                       0x134 0x24      /* mii1_rxd3.mmc1_dat2 SD1_DAT2 */
+                       0x138 0x24      /* mii1_rxd2.mmc1_dat3 SD1_DAT3 */
+                       0x84 0x22       /* gpmc_cs2.mmc1_cmd SD1_CMD */
+                       0x80 0x2        /* gpmc_cs1.mmc1_clk SD1_CLK */
+               >;
+       };
+
+       pinctrl_uart1_1: uart1grp-1 {
+               pinctrl-single,pins = <
+                       0x174 0x0
+                       0x170 0x20
+                       0x168 0x20
+                       0x16c 0x0
+               >;
+       };
+
+       pinctrl_uart2_1: uart2grp-1 {
+               pinctrl-single,pins = <
+                       0x184 0x0
+                       0x180 0x0
+                       0x178 0x0
+                       0x17c 0x0
+               >;
+       };
 
-               pinctrl_tsc2007: tsc2007grp-1 {
-                       pinctrl-single,pins = <
-                               0x198 0x27 /* GPIO3_16 */
-                       >;
+       pinctrl_uart6_1: uart6grp-1 {
+               pinctrl-single,pins = <
+                       0x118 0x3
+                       0x108 0x3
+                       0xf8 0x2
+                       0xfc 0x2
+               >;
+       };
+
+       pinctrl_matrix_keypad0: matrix-keypad0 {
+               pinctrl-single,pins = <
+                       0xf0 0x7
+                       0x19c 0x7
+                       0x164 0x7
+                       0x78 0x7
+                       0x1b0 0x27
+                       0x1b4 0x27
+                       0x8c 0x27
+                       0x88 0x27
+               >;
+       };
+       pinctrl_dcan_0: dcan0grp-1 {
+               pinctrl-single,pins = <
+                       0x11c 0x1
+                       0x120 0x1
+               >;
+       };
+       pinctrl_ssi_0: ssi0grp-1 {
+               pinctrl-single,pins = <
+                       0x198 0x7
+                       0x1a8 0x3
+                       0x1ac 0x3
+                       0x1a0 0x3
+                       0x1a4 0x0
+               >;
+       };
+       pinctrl_lcd_0: lcd0grp1 {
+               pinctrl-single,pins = <
+                       0x20 0x0
+                       0x2c 0x0
+                       0x38 0x0
+                       0xcc 0x0
+                       0xd0 0x0
+                       0xd4 0x0
+                       0xd8 0x0
+                       0xdc 0x0
+                       0x24 0x0
+                       0x30 0x0
+                       0xb4 0x0
+                       0xb8 0x0
+                       0xbc 0x0
+                       0xc0 0x0
+                       0xc4 0x0
+                       0xc8 0x0
+                       0x28 0x0
+                       0x34 0x0
+                       0x3c 0x0
+                       0xa0 0x0
+                       0xa4 0x0
+                       0xa8 0x0
+                       0xac 0x0
+                       0xb0 0x0
+                       0xe4 0x0
+                       0xe0 0x0
+                       0xec 0x0
+                       0xe8 0x0
+               >;
+       };
+
+       pinctrl_tsc2007: tsc2007grp-1 {
+               pinctrl-single,pins = <
+                       0x198 0x27 /* GPIO3_16 */
+               >;
+       };
+
+       leds {
+               compatible = "gpio-leds";
+               heartbeat {
+                       label = "heartbeat";
+                       gpios = <&gpio1 26 0>;
+                       linux,default-trigger = "heartbeat";
                };
        };
+
+       matrix_keypad: matrix_keypad@0 {
+               compatible = "gpio-matrix-keypad";
+               debounce-delay-ms = <5>;
+               col-scan-delay-us = <2>;
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_matrix_keypad0>;
+
+               row-gpios = <
+                       &gpio0 19 0
+                       &gpio0 20 0
+                       &gpio2  1 0
+                       &gpio2  0 0
+               >;
+
+               col-gpios = <
+                       &gpio2 26 0
+                       &gpio3 17 0
+                       &gpio0 7 0
+                       &gpio1 28 0
+               >;
+
+               linux,keymap = <
+                       0x00000074      /* POWER */
+               >;
        };
 };
 
 };
 
 &gpmc {
-       elm_id = <&elm>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_gpmc_1>;
 
-       nand@0,0 {
-               reg = <0 0 0>; /* CS0, offset 0 */
+       omap2-nand@0 {
+               reg = <0 0 0>;
                nand-bus-width = <8>;
                ti,nand-ecc-opt = "bch8";
 
                #address-cells = <1>;
                #size-cells = <1>;
 
-               /* partitions go here */
+               partitions {
+                       /* filled in by U-Boot */
+               };
        };
 };
 
                reg = <0x48>;
                interrupt-parent = <&gpio3>;
                interrupts = <16 0>;
-               /* TODO: add DT support to driver */
                pendown-gpios = <&gpio3 16 1>;
                model = "2007";
                x-plate-ohms = <660>;
                reg = <0x38>;
                interrupt-parent = <&gpio1>;
                interrupts = <17>;
-               /* TODO: add DT support to driver */
+               // TODO: add DT support to driver
                reset-gpios = <&gpio1 18 1>;
                wake-gpios = <&gpio1 27 0>;
        };
 &pmic {
        regulators {
                sw1_reg: regulator@4 {
-                       /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
+                       // VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance
                        regulator-name = "vdd_core";
                        regulator-min-microvolt = <912000>;
                        regulator-max-microvolt = <1144000>;
                };
 
                sw2_reg: regulator@5 {
-                       /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
+                       // VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance
                        regulator-name = "vdd_mpu";
                        regulator-min-microvolt = <912500>;
                        regulator-max-microvolt = <1312500>;
                        regulator-always-on;
                };
        };
-
-       leds {
-               compatible = "gpio-leds";
-               heartbeat {
-                       label = "heartbeat";
-                       gpios = <&gpio1 26 0>;
-                       linux,default-trigger = "heartbeat";
-               };
-       };
 };
 
 &codec {
 &spi0 {
        status = "okay";
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_cspi_0>;
-};
-
-&spi1 {
-       status = "okay";
+       pinctrl-0 = <&pinctrl_cspi0>;
 };
 
-&mmchs0 {
+&mmchs1 {
        status = "okay";
        cd-gpios = <&gpio3 15 1>;
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_mmc_0>;
+       pinctrl-0 = <&pinctrl_mmc1>;
+       vmmc-supply = <&reg_3v3>;
 };
index e686291ce82c40fdc58b00f3154646232780bd6b..a3007c69588cf4315dbcde635fbf16f0ccbc5514 100644 (file)
                        ti,edma-default-queue = <0>;
                };
 
-               gpio1: gpio@44e07000 {
+               gpio0: gpio@44e07000 {
                        compatible = "ti,omap4-gpio";
                        ti,hwmods = "gpio1";
                        gpio-controller;
                        interrupts = <96>;
                };
 
-               gpio2: gpio@4804c000 {
+               gpio1: gpio@4804c000 {
                        compatible = "ti,omap4-gpio";
                        ti,hwmods = "gpio2";
                        gpio-controller;
                        interrupts = <98>;
                };
 
-               gpio3: gpio@481ac000 {
+               gpio2: gpio@481ac000 {
                        compatible = "ti,omap4-gpio";
                        ti,hwmods = "gpio3";
                        gpio-controller;
                        interrupts = <32>;
                };
 
-               gpio4: gpio@481ae000 {
+               gpio3: gpio@481ae000 {
                        compatible = "ti,omap4-gpio";
                        ti,hwmods = "gpio4";
                        gpio-controller;
                        interrupts = <4>;
                };
 
+               nand: omap2nand@0 {
+                       compatible = "omap2-nand";
+                       elm_id = <&elm>;
+               };
+
                mac: ethernet@4a100000 {
                        compatible = "ti,cpsw";
                        ti,hwmods = "cpgmac0";