Commit fd038197 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.8/fixes-rc2' of... 

Merge tag 'omap-for-v4.8/fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Fixes for omaps for v4.8-rc cycle, mostly a series of four fixes for
am335x RTC zero offset for clkctrl register. Also few other fixes:

- Add missing sysc information for DSI as at least n950 needs it for
  the working display

- Fix old elm-id properties that cause nand boot to not work

- Fix overo gpmc nand cs0 range

- FIx overo gpmc nand on boards with ethernet

- Fix logicpd torpedo nand ready pin nand interrupt configuration

* tag 'omap-for-v4.8/fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: logicpd-somlv: Fix NAND device nodes
  ARM: dts: logicpd-torpedo-som: Provide NAND ready pin
  ARM: dts: overo: fix gpmc nand on boards with ethernet
  ARM: dts: overo: fix gpmc nand cs0 range
  ARM: dts: am335x: Update elm phandle binding
  ARM: OMAP4+: CM: Remove redundant checks for clkctrl_offs of zero
  ARM: OMAP4+: Have _omap4_wait_target_* check for valid clkctrl_offs
  ARM: OMAP2+: AM33XX: Add HWMOD_OMAP4_ZERO_CLKCTRL_OFFSET flag to rtc hwmod
  ARM: OMAP4+: hwmod: Add hwmod flag for HWMOD_OMAP4_ZERO_CLKCTRL_OFFSET
  ARM: OMAP3: hwmod data: Add sysc information for DSI

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 8184a34f 73912188

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

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ 


		#address-cells = <1>;

		#size-cells = <1>;

		elm_id = <&elm>;

		ti,elm-id = <&elm>;

	};

};

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

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ 


		#address-cells = <1>;

		#size-cells = <1>;

		elm_id = <&elm>;

		ti,elm-id = <&elm>;



		/* MTD partition table */

		partition@0 {

arch/arm/boot/dts/am335x-phycore-som.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ 
		gpmc,wr-access-ns = <30>;

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



		elm_id = <&elm>;

		ti,elm-id = <&elm>;



		#address-cells = <1>;

		#size-cells = <1>;

arch/arm/boot/dts/logicpd-som-lv.dtsi

+6 −5
Original line number Diff line number Diff line
@@ -35,10 +35,15 @@ 
	ranges = <0 0 0x00000000 0x1000000>;	/* CS0: 16MB for NAND */



	nand@0,0 {

		linux,mtd-name = "micron,mt29f4g16abbda3w";

		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 */

		linux,mtd-name = "micron,mt29f4g16abbda3w";

		nand-bus-width = <16>;

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

		rb-gpios = <&gpmc 0 GPIO_ACTIVE_HIGH>; /* gpmc_wait0 */

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

		gpmc,cs-on-ns = <0>;

		gpmc,cs-rd-off-ns = <44>;
@@ -54,10 +59,6 @@ 
		gpmc,wr-access-ns = <40>;

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

		gpmc,device-width = <2>;



		gpmc,page-burst-access-ns = <5>;

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



		#address-cells = <1>;

		#size-cells = <1>;

arch/arm/boot/dts/logicpd-torpedo-som.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
		linux,mtd-name = "micron,mt29f4g16abbda3w";

		nand-bus-width = <16>;

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

		rb-gpios = <&gpmc 0 GPIO_ACTIVE_HIGH>; /* gpmc_wait0 */

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

		gpmc,cs-on-ns = <0>;

		gpmc,cs-rd-off-ns = <44>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE