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

Commit 5796e682 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'davinci-for-v4.16/soc-v2' of... 

Merge tag 'davinci-for-v4.16/soc-v2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

Pull "TI DaVinci SoC support updates for v4.16" from Sekhar Nori:

DaVinci SoC updates consisting of non-critical bug fixes including constifying
data structures, removal of unnecessary newlines from gpio labels and code
simplification.

Also a defconfig update for DaVinci, enabling support for USB network adaptors.

* tag 'davinci-for-v4.16/soc-v2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: constify gpio_led
  ARM: davinci: drop unneeded newline
  ARM: davinci: Use PTR_ERR_OR_ZERO()
  ARM: davinci: make davinci_soc_info structures const
  ARM: davinci: make argument to davinci_common_init() as const
  ARM: davinci_all_defconfig: enable support for USB network adaptors
parents 95f7f383 23bbeaef

arch/arm/configs/davinci_all_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ CONFIG_PPP=m 
CONFIG_PPP_DEFLATE=m

CONFIG_PPP_ASYNC=m

CONFIG_PPP_SYNC_TTY=m

CONFIG_USB_USBNET=m

CONFIG_INPUT_EVDEV=m

CONFIG_INPUT_EVBUG=m

CONFIG_KEYBOARD_ATKBD=m

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

+2 −2
Original line number Diff line number Diff line
@@ -798,11 +798,11 @@ static int da850_lcd_hw_init(void) 
{

	int status;



	status = gpio_request(DA850_LCD_BL_PIN, "lcd bl\n");

	status = gpio_request(DA850_LCD_BL_PIN, "lcd bl");

	if (status < 0)

		return status;



	status = gpio_request(DA850_LCD_PWR_PIN, "lcd pwr\n");

	status = gpio_request(DA850_LCD_PWR_PIN, "lcd pwr");

	if (status < 0) {

		gpio_free(DA850_LCD_BL_PIN);

		return status;

arch/arm/mach-davinci/board-neuros-osd2.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static struct platform_device davinci_fb_device = { 
	.num_resources = 0,

};



static struct gpio_led ntosd2_leds[] = {

static const struct gpio_led ntosd2_leds[] = {

	{ .name = "led1_green", .gpio = GPIO(10), },

	{ .name = "led1_red",   .gpio = GPIO(11), },

	{ .name = "led2_green", .gpio = GPIO(12), },

arch/arm/mach-davinci/common.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int __init davinci_init_id(struct davinci_soc_info *soc_info) 
	return -EINVAL;

}



void __init davinci_common_init(struct davinci_soc_info *soc_info)

void __init davinci_common_init(const struct davinci_soc_info *soc_info)

{

	int ret;

arch/arm/mach-davinci/da830.c

+1 −1
Original line number Diff line number Diff line
@@ -1194,7 +1194,7 @@ static struct davinci_timer_info da830_timer_info = { 
	.clocksource_id	= T0_BOT,

};



static struct davinci_soc_info davinci_soc_info_da830 = {

static const struct davinci_soc_info davinci_soc_info_da830 = {

	.io_desc		= da830_io_desc,

	.io_desc_num		= ARRAY_SIZE(da830_io_desc),

	.jtag_id_reg		= DA8XX_SYSCFG0_BASE + DA8XX_JTAG_ID_REG,