Commit 20bb4685 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.15/dt-signed' of... 

Merge tag 'omap-for-v3.15/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

OMAP device tree changes from Tony Lindgren:

Device tree related changes for omaps with minor code
changes also to platform data quirks that are still needed
for some features.

* tag 'omap-for-v3.15/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (60 commits)
  ARM: dts: omap4+: Add DMM bindings
  ARM: dts: am43x-gp-evm: Add matrix gpio keys.
  ARM: dts: am43xx: add support for parallel NAND flash
  ARM: dts: AM33xx: updated default ECC scheme in nand-ecc-opt
  ARM: dts: am335x-evm: NAND: update MTD partition table
  ARM: OMAP2+: gpmc: update gpmc_hwecc_bch_capable() for new platforms and ECC schemes
  ARM: dts: omap3-gta04: Add bma180 accelerometer
  ARM: dts: omap3-gta04: Enable mmc2 for wifi
  ARM: dts: omap3-gta04: Add basic sound support
  ARM: dts: omap3-gta04: Add twl4030 charger
  ARM: dts: omap3-gta04: Add touchscreen properties
  ARM: dts: omap3-gta04: Add support for magnetometer
  ARM: dts: am437x-gp-evm: Enable gpio.
  ARM: dts: am437x-gp-evm: Add pwm backlight support.
  ARM: dts: am437x-gp-evm: Add gp dts.
  ARM: dts: am43x-epos-evm: Add SPI data.
  ARM: dts: am43x-epos-evm: Add I2C2 data.
  pinctrl: am43xx: dt-bindings: add MUX_MODE8
  ARM: dts: am43x-epos-evm: Add pwm backlight support.
  ARM: dts: am4372: Add pwm-cells property for ecap device.
  ...
parents 86a37e52 f777ba17

Documentation/devicetree/bindings/arm/omap/dmm.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
OMAP Dynamic Memory Manager (DMM) bindings



The dynamic memory manager (DMM) is a module located immediately in front of the

SDRAM controllers (called EMIFs on OMAP). DMM manages various aspects of memory

accesses such as priority generation amongst initiators, configuration of SDRAM

interleaving, optimizing transfer of 2D block objects, and provide MMU-like page

translation for initiators which need contiguous dma bus addresses.



Required properties:

- compatible:	Should contain "ti,omap4-dmm" for OMAP4 family

		Should contain "ti,omap5-dmm" for OMAP5 and DRA7x family

- reg:		Contains DMM register address range (base address and length)

- interrupts:	Should contain an interrupt-specifier for DMM_IRQ.

- ti,hwmods:	Name of the hwmod associated to DMM, which is typically "dmm"



Example:



dmm@4e000000 {

	compatible = "ti,omap4-dmm";

	reg = <0x4e000000 0x800>;

	ti,hwmods = "dmm";

};

Documentation/devicetree/bindings/arm/omap/omap.txt

+3 −0
Original line number Diff line number Diff line
@@ -114,5 +114,8 @@ Boards: 
- AM43x EPOS EVM

  compatible = "ti,am43x-epos-evm", "ti,am4372", "ti,am43"



- AM437x GP EVM

  compatible = "ti,am437x-gp-evm", "ti,am4372", "ti,am43"



- DRA7 EVM:  Software Developement Board for DRA7XX

  compatible = "ti,dra7-evm", "ti,dra7"

arch/arm/boot/dts/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -228,6 +228,10 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap2420-n810-wimax.dtb \

	omap3430-sdp.dtb \

	omap3-beagle.dtb \

	omap3-cm-t3517.dtb \

	omap3-sbc-t3517.dtb \

	omap3-cm-t3530.dtb \

	omap3-sbc-t3530.dtb \

	omap3-cm-t3730.dtb \

	omap3-sbc-t3730.dtb \

	omap3-devkit8000.dtb \
@@ -242,6 +246,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap3-gta04.dtb \

	omap3-igep0020.dtb \

	omap3-igep0030.dtb \

	omap3-lilly-dbb056.dtb \

	omap3-zoom3.dtb \

	omap4-panda.dtb \

	omap4-panda-a4.dtb \
@@ -256,9 +261,11 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	am335x-boneblack.dtb \

	am335x-nano.dtb \

	am335x-base0033.dtb \

	am3517-craneboard.dtb \

	am3517-evm.dtb \

	am3517_mt_ventoux.dtb \

	am43x-epos-evm.dtb \

	am437x-gp-evm.dtb \

	dra7-evm.dtb

dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb

arch/arm/boot/dts/am335x-evm.dts

+26 −25
Original line number Diff line number Diff line
@@ -434,9 +434,9 @@ 
	ranges = <0 0 0x08000000 0x10000000>;	/* CS0: NAND */

	nand@0,0 {

		reg = <0 0 0>; /* CS0, offset 0 */

		nand-bus-width = <8>;

		ti,nand-ecc-opt = "bch8";

		gpmc,device-nand = "true";

		ti,elm-id = <&elm>;

		nand-bus-width = <8>;

		gpmc,device-width = <1>;

		gpmc,sync-clk-ps = <0>;

		gpmc,cs-on-ns = <0>;
@@ -460,50 +460,51 @@ 
		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>;

		elm_id = <&elm>;



		/* MTD partition table */

		partition@0 {

			label = "SPL1";

			label = "NAND.SPL";

			reg = <0x00000000 0x000020000>;

		};



		partition@1 {

			label = "SPL2";

			label = "NAND.SPL.backup1";

			reg = <0x00020000 0x00020000>;

		};



		partition@2 {

			label = "SPL3";

			label = "NAND.SPL.backup2";

			reg = <0x00040000 0x00020000>;

		};



		partition@3 {

			label = "SPL4";

			label = "NAND.SPL.backup3";

			reg = <0x00060000 0x00020000>;

		};



		partition@4 {

			label = "U-boot";

			reg = <0x00080000 0x001e0000>;

			label = "NAND.u-boot-spl";

			reg = <0x00080000 0x00040000>;

		};



		partition@5 {

			label = "environment";

			reg = <0x00260000 0x00020000>;

			label = "NAND.u-boot";

			reg = <0x000C0000 0x00100000>;

		};



		partition@6 {

			label = "Kernel";

			reg = <0x00280000 0x00500000>;

			label = "NAND.u-boot-env";

			reg = <0x001C0000 0x00020000>;

		};



		partition@7 {

			label = "File-System";

			reg = <0x00780000 0x0F880000>;

			label = "NAND.u-boot-env.backup1";

			reg = <0x001E0000 0x00020000>;

		};

		partition@8 {

			label = "NAND.kernel";

			reg = <0x00200000 0x00800000>;

		};

		partition@9 {

			label = "NAND.file-system";

			reg = <0x00A00000 0x0F600000>;

		};

	};

};

arch/arm/boot/dts/am335x-evmsk.dts

+10 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ 
		ti,model = "AM335x-EVMSK";

		ti,audio-codec = <&tlv320aic3106>;

		ti,mcasp-controller = <&mcasp1>;

		ti,codec-clock-rate = <24576000>;

		ti,codec-clock-rate = <24000000>;

		ti,audio-routing =

			"Headphone Jack",       "HPLOUT",

			"Headphone Jack",       "HPROUT";
@@ -336,9 +336,18 @@ 
		status = "okay";

	};



	usb-phy@47401b00 {

		status = "okay";

	};



	usb@47401000 {

		status = "okay";

	};



	usb@47401800 {

		status = "okay";

		dr_mode = "host";

	};

};



&epwmss2 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE