Commit 42d5d460 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.11/fixes-rc1-v2' of... 

Merge tag 'omap-for-v4.11/fixes-rc1-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Fixes for omaps for v4.11-rc cycle:

- Fix smartreflex platform data regression where I accidentally
  removed legacy platform data still in use
- Fix hypervisor mode for thumb2 kernel
- Fix misplaced tpic2810 to move it to right bus
- Enable INPUT_MOUSEDEV as a loadable module have mice working
- Fix use of gpio-key,wakeup and use wakeup-source instead as
  this accidentally sneaked in during the merge window
- Fix error handling for onenand to properly return error
- Remove legacy gpmc-nand.c that's now dead code, this
  also removes dependency to the MTD tree for further driver
  changes
- Fix device node reference count errors for omap3 and
  related to it also release device nodes after no longer
  needed

* tag 'omap-for-v4.11/fixes-rc1-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: Release device node after it is no longer needed.
  ARM: OMAP2+: Fix device node reference counts
  ARM: OMAP2+: Remove legacy gpmc-nand.c
  ARM: OMAP2+: gpmc-onenand: propagate error on initialization failure
  ARM: dts: am335x-pcm953: Fix legacy wakeup source binding
  ARM: omap2plus_defconfig: Enable INPUT_MOUSEDEV as loadable modules
  ARM: dts: am57xx-idk: tpic2810 is on I2C bus, not SPI
  ARM: OMAP5 / DRA7: Fix HYP mode boot for thumb2 build
  ARM: OMAP3: Fix smartreflex platform data regression

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f40624e8 e24bce8f

arch/arm/boot/dts/am335x-pcm-953.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -63,14 +63,14 @@ 
			label = "home";

			linux,code = <KEY_HOME>;

			gpios = <&gpio3 7 GPIO_ACTIVE_HIGH>;

			gpio-key,wakeup;

			wakeup-source;

		};



		button@1 {

			label = "menu";

			linux,code = <KEY_MENU>;

			gpios = <&gpio3 8 GPIO_ACTIVE_HIGH>;

			gpio-key,wakeup;

			wakeup-source;

		};



	};

arch/arm/boot/dts/am57xx-idk-common.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -315,6 +315,13 @@ 
			/* ID & VBUS GPIOs provided in board dts */

		};

	};



	tpic2810: tpic2810@60 {

		compatible = "ti,tpic2810";

		reg = <0x60>;

		gpio-controller;

		#gpio-cells = <2>;

	};

};



&mcspi3 {
@@ -330,13 +337,6 @@ 
		spi-max-frequency = <1000000>;

		spi-cpol;

	};



	tpic2810: tpic2810@60 {

		compatible = "ti,tpic2810";

		reg = <0x60>;

		gpio-controller;

		#gpio-cells = <2>;

	};

};



&uart3 {

arch/arm/configs/omap2plus_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ CONFIG_WL12XX=m 
CONFIG_WL18XX=m

CONFIG_WLCORE_SPI=m

CONFIG_WLCORE_SDIO=m

CONFIG_INPUT_MOUSEDEV=m

CONFIG_INPUT_JOYDEV=m

CONFIG_INPUT_EVDEV=m

CONFIG_KEYBOARD_ATKBD=m

arch/arm/mach-omap2/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -241,6 +241,3 @@ obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o 


onenand-$(CONFIG_MTD_ONENAND_OMAP2)	:= gpmc-onenand.o

obj-y					+= $(onenand-m) $(onenand-y)
 


nand-$(CONFIG_MTD_NAND_OMAP2)		:= gpmc-nand.o

obj-y					+= $(nand-m) $(nand-y)

arch/arm/mach-omap2/gpmc-nand.c

deleted100644 → 0
+0 −154
Original line number Diff line number Diff line 
/*

 * gpmc-nand.c

 *

 * Copyright (C) 2009 Texas Instruments

 * Vimal Singh <vimalsingh@ti.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/omap-gpmc.h>

#include <linux/mtd/nand.h>

#include <linux/platform_data/mtd-nand-omap2.h>



#include <asm/mach/flash.h>



#include "soc.h"



/* minimum size for IO mapping */

#define	NAND_IO_SIZE	4



static bool gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt)

{

	/* platforms which support all ECC schemes */

	if (soc_is_am33xx() || soc_is_am43xx() || cpu_is_omap44xx() ||

		 soc_is_omap54xx() || soc_is_dra7xx())

		return 1;



	if (ecc_opt == OMAP_ECC_BCH4_CODE_HW_DETECTION_SW ||

		 ecc_opt == OMAP_ECC_BCH8_CODE_HW_DETECTION_SW) {

		if (cpu_is_omap24xx())

			return 0;

		else if (cpu_is_omap3630() && (GET_OMAP_REVISION() == 0))

			return 0;

		else

			return 1;

	}



	/* OMAP3xxx do not have ELM engine, so cannot support ECC schemes

	 * which require H/W based ECC error detection */

	if ((cpu_is_omap34xx() || cpu_is_omap3630()) &&

	    ((ecc_opt == OMAP_ECC_BCH4_CODE_HW) ||

		 (ecc_opt == OMAP_ECC_BCH8_CODE_HW)))

		return 0;



	/* legacy platforms support only HAM1 (1-bit Hamming) ECC scheme */

	if (ecc_opt == OMAP_ECC_HAM1_CODE_HW ||

	    ecc_opt == OMAP_ECC_HAM1_CODE_SW)

		return 1;

	else

		return 0;

}



/* This function will go away once the device-tree convertion is complete */

static void gpmc_set_legacy(struct omap_nand_platform_data *gpmc_nand_data,

			    struct gpmc_settings *s)

{

	/* Enable RD PIN Monitoring Reg */

	if (gpmc_nand_data->dev_ready) {

		s->wait_on_read = true;

		s->wait_on_write = true;

	}



	if (gpmc_nand_data->devsize == NAND_BUSWIDTH_16)

		s->device_width = GPMC_DEVWIDTH_16BIT;

	else

		s->device_width = GPMC_DEVWIDTH_8BIT;

}



int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,

		   struct gpmc_timings *gpmc_t)

{

	int err	= 0;

	struct gpmc_settings s;

	struct platform_device *pdev;

	struct resource gpmc_nand_res[] = {

		{ .flags = IORESOURCE_MEM, },

		{ .flags = IORESOURCE_IRQ, },

		{ .flags = IORESOURCE_IRQ, },

	};



	BUG_ON(gpmc_nand_data->cs >= GPMC_CS_NUM);



	err = gpmc_cs_request(gpmc_nand_data->cs, NAND_IO_SIZE,

			      (unsigned long *)&gpmc_nand_res[0].start);

	if (err < 0) {

		pr_err("omap2-gpmc: Cannot request GPMC CS %d, error %d\n",

		       gpmc_nand_data->cs, err);

		return err;

	}

	gpmc_nand_res[0].end = gpmc_nand_res[0].start + NAND_IO_SIZE - 1;

	gpmc_nand_res[1].start = gpmc_get_client_irq(GPMC_IRQ_FIFOEVENTENABLE);

	gpmc_nand_res[2].start = gpmc_get_client_irq(GPMC_IRQ_COUNT_EVENT);



	memset(&s, 0, sizeof(struct gpmc_settings));

	gpmc_set_legacy(gpmc_nand_data, &s);



	s.device_nand = true;



	if (gpmc_t) {

		err = gpmc_cs_set_timings(gpmc_nand_data->cs, gpmc_t, &s);

		if (err < 0) {

			pr_err("omap2-gpmc: Unable to set gpmc timings: %d\n",

			       err);

			return err;

		}

	}



	err = gpmc_cs_program_settings(gpmc_nand_data->cs, &s);

	if (err < 0)

		goto out_free_cs;



	err = gpmc_configure(GPMC_CONFIG_WP, 0);

	if (err < 0)

		goto out_free_cs;



	if (!gpmc_hwecc_bch_capable(gpmc_nand_data->ecc_opt)) {

		pr_err("omap2-nand: Unsupported NAND ECC scheme selected\n");

		err = -EINVAL;

		goto out_free_cs;

	}





	pdev = platform_device_alloc("omap2-nand", gpmc_nand_data->cs);

	if (pdev) {

		err = platform_device_add_resources(pdev, gpmc_nand_res,

						    ARRAY_SIZE(gpmc_nand_res));

		if (!err)

			pdev->dev.platform_data = gpmc_nand_data;

	} else {

		err = -ENOMEM;

	}

	if (err)

		goto out_free_pdev;



	err = platform_device_add(pdev);

	if (err) {

		dev_err(&pdev->dev, "Unable to register NAND device\n");

		goto out_free_pdev;

	}



	return 0;



out_free_pdev:

	platform_device_put(pdev);

out_free_cs:

	gpmc_cs_free(gpmc_nand_data->cs);



	return err;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE