Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4615b4e0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.6/dt-pt2' of... 

Merge tag 'omap-for-v4.6/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Pull "Part 2 of device tree changes for omaps for v4.6 merge window" from Tony Lindgren:

- A series of GPMC related interrupt changes from
  Rogeq Quadros <rogerq@ti.com> to prepare adding interrupt
  support to the NAND driver

- Add RTC support for ti81xx

- Correct LogicPD Torpedo mode description

- Add basic support for LG Optimus Black phone in several
  patches by Paul Kocialkowski <contact@paulk.fr>

- Change address-cells for dra7 for LPAE

- Add TBCLK for PWMSS on dra7

* tag 'omap-for-v4.6/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (21 commits)
  ARM: dts: omap3-sniper: TWL4030 keypad support
  Revert "ARM: dts: DRA7: Add dt nodes for PWMSS"
  ARM: dts: dm814x: dra62x: Disable wait pin monitoring for NAND
  ARM: dts: dm814x: dra62x: Fix NAND device nodes
  ARM: dts: DRA7: Add dt nodes for PWMSS
  ARM: dts: DRA7: Add TBCLK for PWMSS
  ARM: dts: DRA7: change address-cells and size-cells
  ARM: dts: omap3-sniper: USB OTG support
  ARM: dts: LG Optimus Black codename sniper basic support
  ARM: dts: dm3730-torpedo-devkit: Add "Wireless" to model
  ARM: dts: Add RTC entry for dm816x
  ARM: dts: Add RTC entry for dm814x and dra62x
  ARM: dts: omap3: Fix NAND device nodes
  ARM: dts: dm8168-evm: ARM: dts: Disable wait pin monitoring for NAND
  ARM: dts: dm816x: Fix NAND device nodes
  ARM: dts: am335x: Disable wait pin monitoring for NAND
  ARM: dts: am335x: Fix NAND device nodes
  ARM: dts: am437x: Disable wait pin monitoring for NAND
  ARM: dts: am437x: Fix NAND device nodes
  ARM: dts: dra7: Remove redundant nand property
  ...
parents a7d13576 5193523b

arch/arm/boot/dts/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -468,6 +468,7 @@ dtb-$(CONFIG_ARCH_OMAP3) += \ 
	omap3-sbc-t3517.dtb \

	omap3-sbc-t3517.dtb \

	omap3-sbc-t3530.dtb \

	omap3-sbc-t3530.dtb \

	omap3-sbc-t3730.dtb \

	omap3-sbc-t3730.dtb \

	omap3-sniper.dtb \

	omap3-thunder.dtb \

	omap3-thunder.dtb \

	omap3-zoom3.dtb

	omap3-zoom3.dtb

dtb-$(CONFIG_SOC_TI81XX) += \

dtb-$(CONFIG_SOC_TI81XX) += \

arch/arm/boot/dts/am335x-baltos-ir5221.dts

+5 −4
Original line number Original line Diff line number Diff line
@@ -236,7 +236,11 @@ 
	status = "okay";

	status = "okay";





	nand@0,0 {

	nand@0,0 {

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

		compatible = "ti,omap2-nand";

		reg = <0 0 4>; /* CS0, offset 0, IO size 4 */

		interrupt-parent = <&gpmc>;

		interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */

			     <1 IRQ_TYPE_NONE>;	/* termcount */

		nand-bus-width = <8>;

		nand-bus-width = <8>;

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

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

		ti,nand-xfer-type = "polled";

		ti,nand-xfer-type = "polled";
@@ -257,12 +261,9 @@ 
		gpmc,access-ns = <64>;

		gpmc,access-ns = <64>;

		gpmc,rd-cycle-ns = <82>;

		gpmc,rd-cycle-ns = <82>;

		gpmc,wr-cycle-ns = <82>;

		gpmc,wr-cycle-ns = <82>;

		gpmc,wait-on-read = "true";

		gpmc,wait-on-write = "true";

		gpmc,bus-turnaround-ns = <0>;

		gpmc,bus-turnaround-ns = <0>;

		gpmc,cycle2cycle-delay-ns = <0>;

		gpmc,cycle2cycle-delay-ns = <0>;

		gpmc,clk-activation-ns = <0>;

		gpmc,clk-activation-ns = <0>;

		gpmc,wait-monitoring-ns = <0>;

		gpmc,wr-access-ns = <40>;

		gpmc,wr-access-ns = <40>;

		gpmc,wr-data-mux-bus-ns = <0>;

		gpmc,wr-data-mux-bus-ns = <0>;

arch/arm/boot/dts/am335x-chilisom.dtsi

+5 −3
Original line number Original line Diff line number Diff line
@@ -7,6 +7,7 @@ 
 * published by the Free Software Foundation.

 * published by the Free Software Foundation.

 */

 */

#include "am33xx.dtsi"

#include "am33xx.dtsi"

#include <dt-bindings/interrupt-controller/irq.h>





/ {

/ {

	model = "Grinn AM335x ChiliSOM";

	model = "Grinn AM335x ChiliSOM";
@@ -218,7 +219,11 @@ 
	pinctrl-0 = <&nandflash_pins>;

	pinctrl-0 = <&nandflash_pins>;

	ranges = <0 0 0x08000000 0x01000000>; /* CS0 0 @addr 0x08000000, size 0x01000000 */

	ranges = <0 0 0x08000000 0x01000000>; /* CS0 0 @addr 0x08000000, size 0x01000000 */

	nand@0,0 {

	nand@0,0 {

		compatible = "ti,omap2-nand";

		reg = <0 0 4>;	/* CS0, offset 0, IO size 4 */

		reg = <0 0 4>;	/* CS0, offset 0, IO size 4 */

		interrupt-parent = <&gpmc>;

		interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */

			     <1 IRQ_TYPE_NONE>;	/* termcount */

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

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

		ti,elm-id = <&elm>;

		ti,elm-id = <&elm>;

		nand-bus-width = <8>;

		nand-bus-width = <8>;
@@ -237,12 +242,9 @@ 
		gpmc,access-ns = <64>;

		gpmc,access-ns = <64>;

		gpmc,rd-cycle-ns = <82>;

		gpmc,rd-cycle-ns = <82>;

		gpmc,wr-cycle-ns = <82>;

		gpmc,wr-cycle-ns = <82>;

		gpmc,wait-on-read = "true";

		gpmc,wait-on-write = "true";

		gpmc,bus-turnaround-ns = <0>;

		gpmc,bus-turnaround-ns = <0>;

		gpmc,cycle2cycle-delay-ns = <0>;

		gpmc,cycle2cycle-delay-ns = <0>;

		gpmc,clk-activation-ns = <0>;

		gpmc,clk-activation-ns = <0>;

		gpmc,wait-monitoring-ns = <0>;

		gpmc,wr-access-ns = <40>;

		gpmc,wr-access-ns = <40>;

		gpmc,wr-data-mux-bus-ns = <0>;

		gpmc,wr-data-mux-bus-ns = <0>;

	};

	};

arch/arm/boot/dts/am335x-cm-t335.dts

+5 −4
Original line number Original line Diff line number Diff line
@@ -406,7 +406,11 @@ status = "okay"; 
	pinctrl-0 = <&nandflash_pins>;

	pinctrl-0 = <&nandflash_pins>;

	ranges = <0 0 0x08000000 0x10000000>;	/* CS0: NAND */

	ranges = <0 0 0x08000000 0x10000000>;	/* CS0: NAND */

	nand@0,0 {

	nand@0,0 {

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

		compatible = "ti,omap2-nand";

		reg = <0 0 4>; /* CS0, offset 0, IO size 4 */

		interrupt-parent = <&gpmc>;

		interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */

			     <1 IRQ_TYPE_NONE>;	/* termcount */

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

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

		ti,elm-id = <&elm>;

		ti,elm-id = <&elm>;

		nand-bus-width = <8>;

		nand-bus-width = <8>;
@@ -425,12 +429,9 @@ status = "okay"; 
		gpmc,access-ns = <64>;

		gpmc,access-ns = <64>;

		gpmc,rd-cycle-ns = <82>;

		gpmc,rd-cycle-ns = <82>;

		gpmc,wr-cycle-ns = <82>;

		gpmc,wr-cycle-ns = <82>;

		gpmc,wait-on-read = "true";

		gpmc,wait-on-write = "true";

		gpmc,bus-turnaround-ns = <0>;

		gpmc,bus-turnaround-ns = <0>;

		gpmc,cycle2cycle-delay-ns = <0>;

		gpmc,cycle2cycle-delay-ns = <0>;

		gpmc,clk-activation-ns = <0>;

		gpmc,clk-activation-ns = <0>;

		gpmc,wait-monitoring-ns = <0>;

		gpmc,wr-access-ns = <40>;

		gpmc,wr-access-ns = <40>;

		gpmc,wr-data-mux-bus-ns = <0>;

		gpmc,wr-data-mux-bus-ns = <0>;

		/* MTD partition table */

		/* MTD partition table */

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

+4 −3
Original line number Original line Diff line number Diff line
@@ -519,7 +519,11 @@ 
	pinctrl-0 = <&nandflash_pins_s0>;

	pinctrl-0 = <&nandflash_pins_s0>;

	ranges = <0 0 0x08000000 0x1000000>;	/* CS0: 16MB for NAND */

	ranges = <0 0 0x08000000 0x1000000>;	/* CS0: 16MB for NAND */

	nand@0,0 {

	nand@0,0 {

		compatible = "ti,omap2-nand";

		reg = <0 0 4>; /* CS0, offset 0, IO size 4 */

		reg = <0 0 4>; /* CS0, offset 0, IO size 4 */

		interrupt-parent = <&gpmc>;

		interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */

			     <1 IRQ_TYPE_NONE>;	/* termcount */

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

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

		ti,elm-id = <&elm>;

		ti,elm-id = <&elm>;

		nand-bus-width = <8>;

		nand-bus-width = <8>;
@@ -538,12 +542,9 @@ 
		gpmc,access-ns = <64>;

		gpmc,access-ns = <64>;

		gpmc,rd-cycle-ns = <82>;

		gpmc,rd-cycle-ns = <82>;

		gpmc,wr-cycle-ns = <82>;

		gpmc,wr-cycle-ns = <82>;

		gpmc,wait-on-read = "true";

		gpmc,wait-on-write = "true";

		gpmc,bus-turnaround-ns = <0>;

		gpmc,bus-turnaround-ns = <0>;

		gpmc,cycle2cycle-delay-ns = <0>;

		gpmc,cycle2cycle-delay-ns = <0>;

		gpmc,clk-activation-ns = <0>;

		gpmc,clk-activation-ns = <0>;

		gpmc,wait-monitoring-ns = <0>;

		gpmc,wr-access-ns = <40>;

		gpmc,wr-access-ns = <40>;

		gpmc,wr-data-mux-bus-ns = <0>;

		gpmc,wr-data-mux-bus-ns = <0>;

		/* MTD partition table */

		/* MTD partition table */