Commit d6aedc4a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v3.19/fixes-not-urgent-part1' of... 

Merge tag 'omap-for-v3.19/fixes-not-urgent-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

Pull "omap non-urgent fixes for v3.19" from Tony Lindgren:

Fixes for omap3 that are not urgent. Mostly to remove unnecessary
noise during the boot with pointless errors and warnings.

* tag 'omap-for-v3.19/fixes-not-urgent-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP: serial: remove last vestige of DTR_gpio support.
  ARM: OMAP2+: gpmc: Get rid of "ti,elm-id not found" warning
  ARM: OMAP2: Remove unnecessary KERN_* in omap_phy_internal.c
  ARM: OMAP4+: Remove unused omap_l3_noc platform init
  ARM: dts: Add twl keypad map for omap3 EVM
  ARM: dts: Add twl keypad map for LDP
  ARM: dts: Fix NAND last partition size on LDP
  ARM: OMAP3: Fix errors for omap_l3_smx when booted with device tree

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0df1f248 7aff221c

arch/arm/boot/dts/omap3-evm-common.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
 * Common support for omap3 EVM boards

 */



#include <dt-bindings/input/input.h>

#include "omap-gpmc-smsc911x.dtsi"



/ {
@@ -111,6 +112,26 @@ 
	ti,use-leds;

};



&twl_keypad {

	linux,keymap = <

			MATRIX_KEY(2, 2, KEY_1)

			MATRIX_KEY(1, 1, KEY_2)

			MATRIX_KEY(0, 0, KEY_3)

			MATRIX_KEY(3, 2, KEY_4)

			MATRIX_KEY(2, 1, KEY_5)

			MATRIX_KEY(1, 0, KEY_6)

			MATRIX_KEY(1, 3, KEY_7)

			MATRIX_KEY(3, 1, KEY_8)

			MATRIX_KEY(2, 0, KEY_9)

			MATRIX_KEY(2, 3, KEY_KPASTERISK)

			MATRIX_KEY(0, 2, KEY_0)

			MATRIX_KEY(3, 0, KEY_KPDOT)

			/* s4 not wired */

			MATRIX_KEY(1, 2, KEY_BACKSPACE)

			MATRIX_KEY(0, 1, KEY_ENTER)

			>;

};



&usb_otg_hs {

	interface-type = <0>;

	usb-phy = <&usb2_phy>;

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

+22 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */

/dts-v1/;



#include <dt-bindings/input/input.h>

#include "omap34xx.dtsi"

#include "omap-gpmc-smsc911x.dtsi"
@@ -141,7 +142,7 @@ 
		};

		partition@2000000 {

			label = "Filesystem";

			reg = <0x2000000 0xe000000>;

			reg = <0x2000000 0x6000000>;

		};

	};
@@ -263,6 +264,26 @@ 
	};

};



&twl_keypad {

	linux,keymap = <MATRIX_KEY(0, 0, KEY_1)

			MATRIX_KEY(0, 1, KEY_2)

			MATRIX_KEY(0, 2, KEY_3)

			MATRIX_KEY(1, 0, KEY_4)

			MATRIX_KEY(1, 1, KEY_5)

			MATRIX_KEY(1, 2, KEY_6)

			MATRIX_KEY(1, 3, KEY_F5)

			MATRIX_KEY(2, 0, KEY_7)

			MATRIX_KEY(2, 1, KEY_8)

			MATRIX_KEY(2, 2, KEY_9)

			MATRIX_KEY(2, 3, KEY_F6)

			MATRIX_KEY(3, 0, KEY_F7)

			MATRIX_KEY(3, 1, KEY_0)

			MATRIX_KEY(3, 2, KEY_F8)

			MATRIX_KEY(5, 4, KEY_RESERVED)

			MATRIX_KEY(4, 4, KEY_VOLUMEUP)

			MATRIX_KEY(5, 5, KEY_VOLUMEDOWN)>;

};



&uart3 {

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

};

arch/arm/boot/dts/omap3.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
	 * hierarchy.

	 */

	ocp {

		compatible = "simple-bus";

		compatible = "ti,omap3-l3-smx", "simple-bus";

		reg = <0x68000000 0x10000>;

		interrupts = <9 10>;

		#address-cells = <1>;

arch/arm/mach-omap2/devices.c

+1 −35
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static int __init omap3_l3_init(void) 
	 * To avoid code running on other OMAPs in

	 * multi-omap builds

	 */

	if (!(cpu_is_omap34xx()))

	if (!(cpu_is_omap34xx()) || of_have_populated_dt())

		return -ENODEV;



	snprintf(oh_name, L3_MODULES_MAX_LEN, "l3_main");
@@ -67,40 +67,6 @@ static int __init omap3_l3_init(void) 
}

omap_postcore_initcall(omap3_l3_init);



static int __init omap4_l3_init(void)

{

	int i;

	struct omap_hwmod *oh[3];

	struct platform_device *pdev;

	char oh_name[L3_MODULES_MAX_LEN];



	/* If dtb is there, the devices will be created dynamically */

	if (of_have_populated_dt())

		return -ENODEV;



	/*

	 * To avoid code running on other OMAPs in

	 * multi-omap builds

	 */

	if (!cpu_is_omap44xx() && !soc_is_omap54xx())

		return -ENODEV;



	for (i = 0; i < L3_MODULES; i++) {

		snprintf(oh_name, L3_MODULES_MAX_LEN, "l3_main_%d", i+1);



		oh[i] = omap_hwmod_lookup(oh_name);

		if (!(oh[i]))

			pr_err("could not look up %s\n", oh_name);

	}



	pdev = omap_device_build_ss("omap_l3_noc", 0, oh, 3, NULL, 0);



	WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name);



	return PTR_RET(pdev);

}

omap_postcore_initcall(omap4_l3_init);



#if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)



static struct resource omap2cam_resources[] = {

arch/arm/mach-omap2/gpmc.c

+0 −2
Original line number Diff line number Diff line
@@ -1394,8 +1394,6 @@ static int gpmc_probe_nand_child(struct platform_device *pdev, 
	if (gpmc_nand_data->elm_of_node == NULL)

		gpmc_nand_data->elm_of_node =

					of_parse_phandle(child, "elm_id", 0);

	if (gpmc_nand_data->elm_of_node == NULL)

		pr_warn("%s: ti,elm-id property not found\n", __func__);



	/* select ecc-scheme for NAND */

	if (of_property_read_string(child, "ti,nand-ecc-opt", &s)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE