Commit 8ee74248 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'davinci-fixes-for-v4.17' of... 

Merge tag 'davinci-fixes-for-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes

DaVinci fixes for v4.17
* W=1 warning fixes in device-tree files
* GPIO look-up fixes for legacy boot on several platforms

* tag 'davinci-fixes-for-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: davinci: fix GPIO lookup for I2C
  ARM: davinci: board-dm355-evm: fix broken networking
  ARM: davinci: board-omapl138-hawk: fix GPIO numbers for MMC/SD lookup
  ARM: davinci: board-da850-evm: fix GPIO lookup for MMC/SD
  ARM: davinci: board-da830-evm: fix GPIO lookup for MMC/SD
  ARM: dts: da850: fix W=1 warnings with pinmux node
  ARM: dts: da850-lcdk: add unit name for memory node
  ARM: dts: da850: get rid of skeleton.dtsi

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1e61f547 9411ac07

arch/arm/boot/dts/da850-lcdk.dts

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
		stdout-path = "serial2:115200n8";

	};



	memory {

		device_type = "memory";

	memory@c0000000 {

		/* 128 MB DDR2 SDRAM @ 0xc0000000 */

		reg = <0xc0000000 0x08000000>;

	};

arch/arm/boot/dts/da850.dtsi

+10 −3
Original line number Diff line number Diff line
@@ -7,10 +7,19 @@ 
 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 */

#include "skeleton.dtsi"

#include <dt-bindings/interrupt-controller/irq.h>



/ {

	#address-cells = <1>;

	#size-cells = <1>;

	chosen { };

	aliases { };



	memory@c0000000 {

		device_type = "memory";

		reg = <0xc0000000 0x0>;

	};



	arm {

		#address-cells = <1>;

		#size-cells = <1>;
@@ -46,8 +55,6 @@ 
		pmx_core: pinmux@14120 {

			compatible = "pinctrl-single";

			reg = <0x14120 0x50>;

			#address-cells = <1>;

			#size-cells = <0>;

			#pinctrl-cells = <2>;

			pinctrl-single,bit-per-mux;

			pinctrl-single,register-width = <32>;

arch/arm/mach-davinci/board-da830-evm.c

+7 −2
Original line number Diff line number Diff line
@@ -205,12 +205,17 @@ static const short da830_evm_mmc_sd_pins[] = { 
	-1

};



#define DA830_MMCSD_WP_PIN		GPIO_TO_PIN(2, 1)

#define DA830_MMCSD_CD_PIN		GPIO_TO_PIN(2, 2)



static struct gpiod_lookup_table mmc_gpios_table = {

	.dev_id = "da830-mmc.0",

	.table = {

		/* gpio chip 1 contains gpio range 32-63 */

		GPIO_LOOKUP("davinci_gpio.1", 2, "cd", GPIO_ACTIVE_LOW),

		GPIO_LOOKUP("davinci_gpio.1", 1, "wp", GPIO_ACTIVE_LOW),

		GPIO_LOOKUP("davinci_gpio.0", DA830_MMCSD_CD_PIN, "cd",

			    GPIO_ACTIVE_LOW),

		GPIO_LOOKUP("davinci_gpio.0", DA830_MMCSD_WP_PIN, "wp",

			    GPIO_ACTIVE_LOW),

	},

};

arch/arm/mach-davinci/board-da850-evm.c

+7 −2
Original line number Diff line number Diff line
@@ -763,12 +763,17 @@ static const short da850_evm_mcasp_pins[] __initconst = { 
	-1

};



#define DA850_MMCSD_CD_PIN		GPIO_TO_PIN(4, 0)

#define DA850_MMCSD_WP_PIN		GPIO_TO_PIN(4, 1)



static struct gpiod_lookup_table mmc_gpios_table = {

	.dev_id = "da830-mmc.0",

	.table = {

		/* gpio chip 2 contains gpio range 64-95 */

		GPIO_LOOKUP("davinci_gpio.2", 0, "cd", GPIO_ACTIVE_LOW),

		GPIO_LOOKUP("davinci_gpio.2", 1, "wp", GPIO_ACTIVE_LOW),

		GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_CD_PIN, "cd",

			    GPIO_ACTIVE_LOW),

		GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_WP_PIN, "wp",

			    GPIO_ACTIVE_LOW),

	},

};

arch/arm/mach-davinci/board-dm355-evm.c

+12 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/gpio.h>

#include <linux/gpio/machine.h>

#include <linux/clk.h>

#include <linux/dm9000.h>

#include <linux/videodev2.h>

#include <media/i2c/tvp514x.h>

#include <linux/spi/spi.h>
@@ -109,12 +110,15 @@ static struct platform_device davinci_nand_device = { 
	},

};



#define DM355_I2C_SDA_PIN	GPIO_TO_PIN(0, 15)

#define DM355_I2C_SCL_PIN	GPIO_TO_PIN(0, 14)



static struct gpiod_lookup_table i2c_recovery_gpiod_table = {

	.dev_id = "i2c_davinci",

	.dev_id = "i2c_davinci.1",

	.table = {

		GPIO_LOOKUP("davinci_gpio", 15, "sda",

		GPIO_LOOKUP("davinci_gpio.0", DM355_I2C_SDA_PIN, "sda",

			    GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

		GPIO_LOOKUP("davinci_gpio", 14, "scl",

		GPIO_LOOKUP("davinci_gpio.0", DM355_I2C_SCL_PIN, "scl",

			    GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

	},

};
@@ -179,11 +183,16 @@ static struct resource dm355evm_dm9000_rsrc[] = { 
	},

};



static struct dm9000_plat_data dm335evm_dm9000_platdata;



static struct platform_device dm355evm_dm9000 = {

	.name		= "dm9000",

	.id		= -1,

	.resource	= dm355evm_dm9000_rsrc,

	.num_resources	= ARRAY_SIZE(dm355evm_dm9000_rsrc),

	.dev		= {

		.platform_data = &dm335evm_dm9000_platdata,

	},

};



static struct tvp514x_platform_data tvp5146_pdata = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE