Merge branch 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel...
authorDan Murphy <dmurphy@ti.com>
Mon, 29 Apr 2013 12:53:29 +0000 (07:53 -0500)
committerDan Murphy <dmurphy@ti.com>
Mon, 29 Apr 2013 12:53:29 +0000 (07:53 -0500)
TI-Feature: platform_base
TI-Tree: git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree
TI-Branch: platform-base-3.8.y

* 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  ARM: dts: AM33XX: Set pinmux for clkout2 pad used for clock output
  ARM: OMAP AM33XX: clock data: Enable clkout2 as part of init
  ARM: dts: AM33XX: Add support for AM335x BeagleBone-Black
  ARM: compressed/head.S: work around new binutils warning
  ARM: OMAP3+: am33xx id: Check dev_feature register for available features
  ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers

Conflicts:
arch/arm/configs/omap2plus_defconfig
arch/arm/mach-omap2/control.h

Signed-off-by: Dan Murphy <dmurphy@ti.com>
1  2 
arch/arm/boot/dts/am335x-bone.dts
arch/arm/boot/dts/am335x-evm.dts
arch/arm/boot/dts/am335x-evmsk.dts
arch/arm/mach-omap2/cclock33xx_data.c
arch/arm/mach-omap2/control.h
arch/arm/mach-omap2/io.c

Simple merge
Simple merge
Simple merge
Simple merge
index 371e9aeb6ae654974f7181ba65a9c2f397006911,0d6c19f001bcaa05cae52c0862ba1225e92d731d..a9d28c28d334e109b3762459f097cba9e7cb3966
  #define AM33XX_CONTROL_STATUS_SYSBOOT1_WIDTH          0x2
  #define AM33XX_CONTROL_STATUS_SYSBOOT1_MASK           (0x3 << 22)
  
 +#define AM33XX_DDR_IO_CTRL            0x0E04
 +#define AM33XX_VTP0_CTRL_REG          0x0E0C
 +
 +/* AM33XX VTP0_CTRL_REG bits */
 +#define AM33XX_VTP_CTRL_START_EN      (1 << 0)
 +#define AM33XX_VTP_CTRL_LOCK_EN               (1 << 4)
 +#define AM33XX_VTP_CTRL_READY         (1 << 5)
 +#define AM33XX_VTP_CTRL_ENABLE                (1 << 6)
 +
 +/* AM33XX M3_TXEV_EOI register */
 +#define AM33XX_CONTROL_M3_TXEV_EOI    0x1324
 +
 +#define AM33XX_M3_TXEV_ACK            (0x1 << 0)
 +#define AM33XX_M3_TXEV_ENABLE         (0x0 << 0)
 +
 +/* AM33XX IPC message registers */
 +#define AM33XX_CONTROL_IPC_MSG_REG0   0x1328
 +#define AM33XX_CONTROL_IPC_MSG_REG1   0x132C
 +#define AM33XX_CONTROL_IPC_MSG_REG2   0x1330
 +#define AM33XX_CONTROL_IPC_MSG_REG3   0x1334
 +#define AM33XX_CONTROL_IPC_MSG_REG4   0x1338
 +#define AM33XX_CONTROL_IPC_MSG_REG5   0x133C
 +#define AM33XX_CONTROL_IPC_MSG_REG6   0x1340
 +#define AM33XX_CONTROL_IPC_MSG_REG7   0x1344
 +
 +#define AM33XX_DDR_CMD0_IOCTRL                0x1404
 +#define AM33XX_DDR_CMD1_IOCTRL                0x1408
 +#define AM33XX_DDR_CMD2_IOCTRL                0x140C
 +#define AM33XX_DDR_DATA0_IOCTRL               0x1440
 +#define AM33XX_DDR_DATA1_IOCTRL               0x1444
 +
+ /* DEV Feature register to identify AM33XX features */
+ #define AM33XX_DEV_FEATURE            0x604
+ #define AM33XX_SGX_SHIFT              29
+ #define AM33XX_SGX_MASK                       (1 << AM33XX_SGX_SHIFT)
  /* CONTROL OMAP STATUS register to identify OMAP3 features */
  #define OMAP3_CONTROL_OMAP_STATUS     0x044c
  
Simple merge