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

Commit 44a0f884 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v5.0/fixes-rc3' of... 

Merge tag 'omap-for-v5.0/fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes

Device tree fixes for omaps for v5.0-rc cycle

This series of dts fixes for omap devices fixes several device specific
regressions:

- The onenand timings for n950/n9 have been wrong for a while since
  we moved to dts based timings

- A typo for the cpcap pmic is now producing erors during boot as the
  level should be 0 for unconfigurable triggering instead of 1

- Changes for ti-sysc for omap5 left uart3 with debug flags that should
  not be set

- Fix a new dtc warning started showing up for omap3-gta04 grap_port

- With the generic MMC card detection code we need to fix the gpio
  in dts for n900 and am335x-shc

* tag 'omap-for-v5.0/fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: am335x-shc.dts: fix wrong cd pin level
  ARM: dts: n900: fix mmc1 card detect gpio polarity
  ARM: dts: omap3-gta04: Fix graph_port warning
  ARM: dts: Remove unnecessary idle flags for omap5 uart3
  ARM: dts: omap4-droid4: Fix typo in cpcap IRQ flags
  ARM: OMAP: dts: N950/N9: fix onenand timings

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2b3604e2 063c20e1

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

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	bus-width = <0x4>;

	cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;

	cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;

	cd-inverted;

	max-frequency = <26000000>;

	vmmc-supply = <&vmmcsd_fixed>;

arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ 
			interrupts-extended = <

				&cpcap 15 0 &cpcap 14 0 &cpcap 28 0 &cpcap 19 0

				&cpcap 18 0 &cpcap 17 0 &cpcap 16 0 &cpcap 49 0

				&cpcap 48 1

				&cpcap 48 0

			>;

			interrupt-names =

				"id_ground", "id_float", "se0conn", "vbusvld",

arch/arm/boot/dts/omap3-gta04.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -714,11 +714,7 @@ 


	vdda-supply = <&vdac>;



	#address-cells = <1>;

	#size-cells = <0>;



	port {

		reg = <0>;

		venc_out: endpoint {

			remote-endpoint = <&opa_in>;

			ti,channels = <1>;

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

+1 −1
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ 
	/* For debugging, it is often good idea to remove this GPIO.

	   It means you can remove back cover (to reboot by removing

	   battery) and still use the MMC card. */

	cd-gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>; /* 160 */

	cd-gpios = <&gpio6 0 GPIO_ACTIVE_LOW>; /* 160 */

};



/* most boards use vaux3, only some old versions use vmmc2 instead */

arch/arm/boot/dts/omap3-n950-n9.dtsi

+28 −14
Original line number Diff line number Diff line
@@ -370,6 +370,19 @@ 
		compatible = "ti,omap2-onenand";

		reg = <0 0 0x20000>;	/* CS0, offset 0, IO size 128K */



		/*

		 * These timings are based on CONFIG_OMAP_GPMC_DEBUG=y reported

		 * bootloader set values when booted with v4.19 using both N950

		 * and N9 devices (OneNAND Manufacturer: Samsung):

		 *

		 *   gpmc cs0 before gpmc_cs_program_settings:

		 *   cs0 GPMC_CS_CONFIG1: 0xfd001202

		 *   cs0 GPMC_CS_CONFIG2: 0x00181800

		 *   cs0 GPMC_CS_CONFIG3: 0x00030300

		 *   cs0 GPMC_CS_CONFIG4: 0x18001804

		 *   cs0 GPMC_CS_CONFIG5: 0x03171d1d

		 *   cs0 GPMC_CS_CONFIG6: 0x97080000

		 */

		gpmc,sync-read;

		gpmc,sync-write;

		gpmc,burst-length = <16>;
@@ -379,26 +392,27 @@ 
		gpmc,device-width = <2>;

		gpmc,mux-add-data = <2>;

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

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

		gpmc,cs-wr-off-ns = <87>;

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

		gpmc,cs-wr-off-ns = <122>;

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

		gpmc,adv-rd-off-ns = <10>;

		gpmc,adv-wr-off-ns = <10>;

		gpmc,oe-on-ns = <15>;

		gpmc,oe-off-ns = <87>;

		gpmc,adv-rd-off-ns = <15>;

		gpmc,adv-wr-off-ns = <15>;

		gpmc,oe-on-ns = <20>;

		gpmc,oe-off-ns = <122>;

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

		gpmc,we-off-ns = <87>;

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

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

		gpmc,access-ns = <81>;

		gpmc,we-off-ns = <122>;

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

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

		gpmc,access-ns = <117>;

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

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

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

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

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

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

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

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

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

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

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



		gpmc,sync-clk-ps = <15000>; /* TBC; Where this value came? */



		/*

		 * MTD partition table corresponding to Nokia's MeeGo 1.2