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

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

Merge tag 'omap-for-v3.17/fixes-against-rc2' of... 

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

Merge "omap fixes against v3.17-rc2" from Tony Lindgren:

Fixes for omaps, mostly to revert NAND back to using software ECC
by default as that's what many boards expect. Also fixes for omap5
clocks, PM wake-up events, GPIO interrupt cells for dra7, and few
other minor fixes.

* tag 'omap-for-v3.17/fixes-against-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: omap54xx-clocks: Fix the l3 and l4 clock rates
  ARM: OMAP2+: hwmod: Rearm wake-up interrupts for DT when MUSB is idled
  ARM: dts: Enable UART wake-up events for beagleboard
  ARM: dts: Remove twl6030 clk32g "regulator"
  ARM: OMAP2+: omap_device: remove warning that clk alias already exists
  ARM: OMAP: fix %d confusingly prefixed with 0x in format string
  ARM: dts: DRA7: fix interrupt-cells for GPIO
  mtd: nand: omap: Fix 1-bit Hamming code scheme, omap_calculate_ecc()
  ARM: dts: omap3430-sdp: Revert to using software ECC for NAND
  ARM: OMAP2+: GPMC: Support Software ECC scheme via DT
  mtd: nand: omap: Revert to using software ECC by default
parents 541555e9 8fd46439

Documentation/devicetree/bindings/mtd/gpmc-nand.txt

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ Optional properties: 
				width of 8 is assumed.



 - ti,nand-ecc-opt:		A string setting the ECC layout to use. One of:

		"sw"		<deprecated> use "ham1" instead

		"sw"		1-bit Hamming ecc code via software

		"hw"		<deprecated> use "ham1" instead

		"hw-romcode"	<deprecated> use "ham1" instead

		"ham1"		1-bit Hamming ecc code

arch/arm/boot/dts/dra7.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio2: gpio@48055000 {
@@ -256,7 +256,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio3: gpio@48057000 {
@@ -267,7 +267,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio4: gpio@48059000 {
@@ -278,7 +278,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio5: gpio@4805b000 {
@@ -289,7 +289,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio6: gpio@4805d000 {
@@ -300,7 +300,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio7: gpio@48051000 {
@@ -311,7 +311,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		gpio8: gpio@48053000 {
@@ -322,7 +322,7 @@ 
			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <2>;

		};



		uart1: serial@4806a000 {

arch/arm/boot/dts/omap3-beagle.dts

+1 −0
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ 
&uart3 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart3_pins>;

	interrupts-extended = <&intc 74 &omap3_pmx_core OMAP3_UART3_RX>;

};



&gpio1 {

arch/arm/boot/dts/omap3430-sdp.dts

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ 
		#address-cells = <1>;

		#size-cells = <1>;

		reg = <1 0 0x08000000>;

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

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

		nand-bus-width = <8>;

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

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

arch/arm/boot/dts/omap54xx-clocks.dtsi

+10 −6
Original line number Diff line number Diff line
@@ -367,10 +367,12 @@ 


	l3_iclk_div: l3_iclk_div {

		#clock-cells = <0>;

		compatible = "fixed-factor-clock";

		compatible = "ti,divider-clock";

		ti,max-div = <2>;

		ti,bit-shift = <4>;

		reg = <0x100>;

		clocks = <&dpll_core_h12x2_ck>;

		clock-mult = <1>;

		clock-div = <1>;

		ti,index-power-of-two;

	};



	gpu_l3_iclk: gpu_l3_iclk {
@@ -383,10 +385,12 @@ 


	l4_root_clk_div: l4_root_clk_div {

		#clock-cells = <0>;

		compatible = "fixed-factor-clock";

		compatible = "ti,divider-clock";

		ti,max-div = <2>;

		ti,bit-shift = <8>;

		reg = <0x100>;

		clocks = <&l3_iclk_div>;

		clock-mult = <1>;

		clock-div = <1>;

		ti,index-power-of-two;

	};



	slimbus1_slimbus_clk: slimbus1_slimbus_clk {