Commit 4f474037 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'gemini-dts' of... 

Merge tag 'gemini-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt

Gemini DTS updates for v4.21:
- Fix the erroneous partition table on D-Link DIR-685
- Multiplex flash usage with other usage using pin control
  handling (merged to the MTD tree)
- Use the RedBoot partition parser on SQ201
- Add the USB blocks (DT bindings merged in the last merge
  window)
- Bump the debounce times a bit to avoid bouncing

* tag 'gemini-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik

:
  ARM: dts: Bump Gemini platforms to use 100ms debounce
  ARM: dts: Add the FOTG210 USB host to Gemini boards
  ARM: dts: Fix up SQ201 flash access
  ARM: dts: Enable Gemini flash access
  ARM: dts: Fix up the D-Link DIR-685 MTD partition info

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 69c5f266 f18fd0f5

arch/arm/boot/dts/gemini-dlink-dir-685.dts

+40 −23
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
		compatible = "gpio-keys";



		button-esc {

			debounce-interval = <50>;

			debounce-interval = <100>;

			wakeup-source;

			linux,code = <KEY_ESC>;

			label = "reset";
@@ -36,7 +36,7 @@ 
			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;

		};

		button-eject {

			debounce-interval = <50>;

			debounce-interval = <100>;

			wakeup-source;

			linux,code = <KEY_EJECTCD>;

			label = "unmount";
@@ -64,7 +64,6 @@ 
		gpio-sck = <&gpio1 5 GPIO_ACTIVE_HIGH>;

		gpio-miso = <&gpio1 8 GPIO_ACTIVE_HIGH>;

		gpio-mosi = <&gpio1 7 GPIO_ACTIVE_HIGH>;

		/* Collides with pflash CE1, not so cool */

		cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;

		num-chipselects = <1>;
@@ -253,15 +252,18 @@ 
	soc {

		flash@30000000 {

			/*

			 * Flash access is by default disabled, because it

			 * collides with the Chip Enable signal for the display

			 * panel, that reuse the parallel flash Chip Select 1

			 * (CS1). Enabling flash makes graphics stop working.

			 *

			 * We might be able to hack around this by letting

			 * GPIO poke around in the flash controller registers.

			 * Flash access collides with the Chip Enable signal for

			 * the display panel, that reuse the parallel flash Chip

			 * Select 1 (CS1). We switch the pin control state so we

			 * enable these pins for flash access only when we need

			 * then, and when disabled they can be used for GPIO which

			 * is what the display panel needs.

			 */

			/* status = "okay"; */

			status = "okay";

			pinctrl-names = "enabled", "disabled";

			pinctrl-0 = <&pflash_default_pins>;

			pinctrl-1 = <&pflash_disabled_pins>;



			/* 32MB of flash */

			reg = <0x30000000 0x02000000>;
@@ -274,20 +276,16 @@ 
				read-only;

			};

			/*

			 * Between the boot loader and the rootfs is the kernel

			 * in a custom Storlink format flashed from the boot

			 * menu. The rootfs is in squashfs format.

			 * This firmware image contains the kernel catenated

			 * with the squashfs root filesystem. For some reason

			 * this is called "upgrade" on the vendor system.

			 */

			partition@1800c0 {

				label = "rootfs";

				reg = <0x001800c0 0x01dbff40>;

				read-only;

			};

			partition@1f40000 {

			partition@40000 {

				label = "upgrade";

				reg = <0x01f40000 0x00040000>;

				reg = <0x00040000 0x01f40000>;

				read-only;

			};

			/* RGDB, Residental Gateway Database? */

			partition@1f80000 {

				label = "rgdb";

				reg = <0x01f80000 0x00040000>;
@@ -331,7 +329,6 @@ 
						"gpio0cgrp",

						"gpio0egrp",

						"gpio0fgrp",

						"gpio0ggrp",

						"gpio0hgrp";

					};

				};
@@ -346,6 +343,18 @@ 
						groups = "gpio1bgrp";

					};

				};

				/*

				 * These GPIO groups will be mapped in over some

				 * of the flash pins when the flash is not in

				 * active use.

				 */

				pflash_disabled_pins: pinctrl-pflash-disabled {

					mux {

						function = "gpio0";

						groups = "gpio0ggrp", "gpio0igrp", "gpio0jgrp",

							 "gpio0kgrp";

					};

				};

				pinctrl-gmii {

					mux {

						function = "gmii";
@@ -434,7 +443,7 @@ 
		};



		display-controller@6a000000 {

			status = "okay";

			status = "disabled";



			port@0 {

				reg = <0>;
@@ -443,5 +452,13 @@ 
				};

			};

		};



		usb@68000000 {

			status = "okay";

		};



		usb@69000000 {

			status = "okay";

		};

	};

};

arch/arm/boot/dts/gemini-dlink-dns-313.dts

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
		compatible = "gpio-keys";



		button-esc {

			debounce-interval = <50>;

			debounce-interval = <100>;

			wakeup-source;

			linux,code = <KEY_ESC>;

			label = "reset";

arch/arm/boot/dts/gemini-nas4220b.dts

+10 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
		compatible = "gpio-keys";



		button-setup {

			debounce-interval = <50>;

			debounce-interval = <100>;

			wakeup-source;

			linux,code = <KEY_SETUP>;

			label = "Backup button";
@@ -36,7 +36,7 @@ 
			gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;

		};

		button-restart {

			debounce-interval = <50>;

			debounce-interval = <100>;

			wakeup-source;

			linux,code = <KEY_RESTART>;

			label = "Softreset button";
@@ -204,5 +204,13 @@ 
		ata@63400000 {

			status = "okay";

		};



		usb@68000000 {

			status = "okay";

		};



		usb@69000000 {

			status = "okay";

		};

	};

};

arch/arm/boot/dts/gemini-rut1xx.dts

+21 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
		compatible = "gpio-keys";



		button-setup {

			debounce-interval = <50>;

			debounce-interval = <100>;

			wakeup-source;

			linux,code = <KEY_SETUP>;

			label = "Reset to defaults";
@@ -124,5 +124,25 @@ 
				/* Not used in this platform */

			};

		};



		ethernet@60000000 {

			status = "okay";



			ethernet-port@0 {

				phy-mode = "rgmii";

				phy-handle = <&phy0>;

			};

			ethernet-port@1 {

				/* Not used in this platform */

			};

		};



		usb@68000000 {

			status = "okay";

		};



		usb@69000000 {

			status = "okay";

		};

	};

};

arch/arm/boot/dts/gemini-sl93512r.dts

+8 −0
Original line number Diff line number Diff line
@@ -324,5 +324,13 @@ 
		ata@63400000 {

			status = "okay";

		};



		usb@68000000 {

			status = "okay";

		};



		usb@69000000 {

			status = "okay";

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE