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

Commit 56c22854 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes from Kevin Hilman:
 "Another round of fixes from arm-soc land, which are mostly DT fixes
  for:

   - OMAP: handful of DT fixes devices on newly supported hardware
   - davinci: fix 2nd EDMA channel
   - ux500: extend previous pinctrl fix to another board
   - at91: clock registration fixes, compatibility string precision

  And one more fix for event cleanup in drivers/bus/arm-ccn"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  bus: arm-ccn: Move event cleanup routine
  ARM: at91/dt: rm9200: fix usb clock definition
  ARM: at91: rm9200: fix clock registration
  ARM: at91/dt: sam9g20: set at91sam9g20 pllb driver
  ARM: dts: dra7-evm: Add vtt regulator support
  ARM: dts: dra7-evm: Fix spi1 mux documentation
  ARM: dts: am43x-epos-evm: Disable QSPI to prevent conflict with GPMC-NAND
  ARM: OMAP2+: gpmc: Don't complain if wait pin is used without r/w monitoring
  ARM: dts: am43xx-epos-evm: Don't use read/write wait monitoring
  ARM: dts: am437x-gp-evm: Don't use read/write wait monitoring
  ARM: dts: am437x-gp-evm: Use BCH16 ECC scheme instead of BCH8
  ARM: dts: am43x-epos-evm: Use BCH16 ECC scheme instead of BCH8
  ARM: dts: am4372: fix USB regs size
  ARM: dts: am437x-gp: switch i2c0 to 100KHz
  ARM: dts: dra7-evm: Fix 8th NAND partition's name
  ARM: dts: dra7-evm: Fix i2c3 pinmux and frequency
  ARM: ux500: disable msp2 node on Snowball
  ARM: edma: Fix configuration parsing for SoCs with multiple eDMA3 CC
  ARM: dts: set 'ti,set-rate-parent' for dpll4_m5x2 clock
parents 11e97398 38971083

arch/arm/boot/dts/am4372.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -804,7 +804,7 @@ 


			usb1: usb@48390000 {

				compatible = "synopsys,dwc3";

				reg = <0x48390000 0x17000>;

				reg = <0x48390000 0x10000>;

				interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;

				phys = <&usb2_phy1>;

				phy-names = "usb2-phy";
@@ -826,7 +826,7 @@ 


			usb2: usb@483d0000 {

				compatible = "synopsys,dwc3";

				reg = <0x483d0000 0x17000>;

				reg = <0x483d0000 0x10000>;

				interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;

				phys = <&usb2_phy2>;

				phy-names = "usb2-phy";

arch/arm/boot/dts/am437x-gp-evm.dts

+2 −4
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ 
	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	clock-frequency = <400000>;

	clock-frequency = <100000>;



	tps65218: tps65218@24 {

		reg = <0x24>;
@@ -424,7 +424,7 @@ 
	ranges = <0 0 0 0x01000000>;	/* minimum GPMC partition = 16MB */

	nand@0,0 {

		reg = <0 0 4>;		/* device IO registers */

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

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

		ti,elm-id = <&elm>;

		nand-bus-width = <8>;

		gpmc,device-width = <1>;
@@ -443,8 +443,6 @@ 
		gpmc,rd-cycle-ns = <40>;

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

		gpmc,wait-pin = <0>;

		gpmc,wait-on-read;

		gpmc,wait-on-write;

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

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

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

arch/arm/boot/dts/am43x-epos-evm.dts

+4 −5
Original line number Diff line number Diff line
@@ -435,13 +435,13 @@ 
};



&gpmc {

	status = "okay";

	status = "okay";	/* Disable QSPI when enabling GPMC (NAND) */

	pinctrl-names = "default";

	pinctrl-0 = <&nand_flash_x8>;

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

	nand@0,0 {

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

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

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

		ti,elm-id = <&elm>;

		nand-bus-width = <8>;

		gpmc,device-width = <1>;
@@ -459,8 +459,7 @@ 
		gpmc,access-ns = <30>; /* tCEA + 4*/

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

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

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

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

		gpmc,wait-pin = <0>;

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

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

		gpmc,clk-activation-ns = <0>;
@@ -557,7 +556,7 @@ 
};



&qspi {

	status = "okay";

	status = "disabled";	/* Disable GPMC (NAND) when enabling QSPI */

	pinctrl-names = "default";

	pinctrl-0 = <&qspi1_default>;

arch/arm/boot/dts/at91rm9200.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ 
				usb: usbck {

					compatible = "atmel,at91rm9200-clk-usb";

					#clock-cells = <0>;

					atmel,clk-divisors = <1 2>;

					atmel,clk-divisors = <1 2 0 0>;

					clocks = <&pllb>;

				};

arch/arm/boot/dts/at91sam9g20.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
				};



				pllb: pllbck {

					compatible = "atmel,at91sam9g20-clk-pllb";

					atmel,clk-input-range = <2000000 32000000>;

					atmel,pll-clk-output-ranges = <30000000 100000000 0 0>;

				};