hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJaT4oeAAoJEGFBu2jqvgRNEaMP+gKZlNTd5Xg+ZprJLdWf6eQw
 0+9DZWJtTwXIJV44YkUDbRG+bo2xagrbMthwh1Orhhxqp5TQk474XuSY6gtmb6wL
 wNadBo0VVqU/aQD0oSEDdVxFMyb5CInLsLZJAY/3zn4/h7OaP7P1jQ1lV0TslVb1
 MXv4llU0NRskhfO6lpysvT0NcRVBtPDXItgKiGuzFnF5IgWGzWzoEFrVu5kWbYQ+
 H77AuSChtXfs4SzgSdx7SN13IeRS0z/hg0MfGGlVUrHNkx2iorGu2cwJKMO/386e
 mawJxkCQZ43c172e8IarbZRBWfU2x6mREI7OxDSrYF1lPSTLl+yDT+t7UGVi78aa
 BF6POwrbgY3kFvfCZhqYlMCZ3Qg8MRxlJ4omr/YChtUdpsKVXf5cRNAfM4SfH1eW
 rVZh3gDq/YBlFkNmRaWjaHHU6XvQlbrdODxMDAIafDiVF4SjJZtkOawhsGk3zuVM
 6mE+F0pJTegRoc4Nv85NSMpqmRVG1X+Ht5Dj2llodCDc1OUnVoFRbRXbqDvKCuCA
 pxK6XaiNpIpEXNP+IwzZLrYJn7f+vbpD9eyWyyWLrY2RDLX5QbV/c0hsr0dnFg/l
 gL1nRmn+O4VqRufzyh4MgvbrcZJMoiWtSudNAcppe3ogh52oK1TkTqhSdcRcvwTJ
 PN4m7htGARI2zlVa9xcU
 =oZrM
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2018-01-05 17:58:08 +01:00
parent 95f7f383b6 23bbeaef90
commit 5796e682e6
12 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/configs/davinci_all_defconfig
View File

@ -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

4
arch/arm/mach-davinci/board-da850-evm.c
View File

@ -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;

2
arch/arm/mach-davinci/board-neuros-osd2.c
View File

@ -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), },

2
arch/arm/mach-davinci/common.c
View File

@ -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;

2
arch/arm/mach-davinci/da830.c
View File

@ -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,

2
arch/arm/mach-davinci/da850.c
View File

@ -1347,7 +1347,7 @@ int __init da850_register_gpio(void)
return da8xx_register_gpio(&da850_gpio_platform_data);
}
static struct davinci_soc_info davinci_soc_info_da850 = {
static const struct davinci_soc_info davinci_soc_info_da850 = {
.io_desc = da850_io_desc,
.io_desc_num = ARRAY_SIZE(da850_io_desc),
.jtag_id_reg = DA8XX_SYSCFG0_BASE + DA8XX_JTAG_ID_REG,

4
arch/arm/mach-davinci/devices-da8xx.c
View File

@ -252,7 +252,7 @@ int __init da830_register_edma(struct edma_rsv_info *rsv)
da8xx_edma0_pdata.slavecnt = ARRAY_SIZE(da830_edma_map);
edma_pdev = platform_device_register_full(&da8xx_edma0_device);
return IS_ERR(edma_pdev) ? PTR_ERR(edma_pdev) : 0;
return PTR_ERR_OR_ZERO(edma_pdev);
}
static const struct dma_slave_map da850_edma0_map[] = {
@ -297,7 +297,7 @@ int __init da850_register_edma(struct edma_rsv_info *rsv[2])
da850_edma1_pdata.slavecnt = ARRAY_SIZE(da850_edma1_map);
edma_pdev = platform_device_register_full(&da850_edma1_device);
return IS_ERR(edma_pdev) ? PTR_ERR(edma_pdev) : 0;
return PTR_ERR_OR_ZERO(edma_pdev);
}
static struct resource da8xx_i2c_resources0[] = {

2
arch/arm/mach-davinci/dm355.c
View File

@ -1006,7 +1006,7 @@ struct platform_device dm355_serial_device[] = {
}
};
static struct davinci_soc_info davinci_soc_info_dm355 = {
static const struct davinci_soc_info davinci_soc_info_dm355 = {
.io_desc = dm355_io_desc,
.io_desc_num = ARRAY_SIZE(dm355_io_desc),
.jtag_id_reg = 0x01c40028,

2
arch/arm/mach-davinci/dm365.c
View File

@ -1108,7 +1108,7 @@ struct platform_device dm365_serial_device[] = {
}
};
static struct davinci_soc_info davinci_soc_info_dm365 = {
static const struct davinci_soc_info davinci_soc_info_dm365 = {
.io_desc = dm365_io_desc,
.io_desc_num = ARRAY_SIZE(dm365_io_desc),
.jtag_id_reg = 0x01c40028,

2
arch/arm/mach-davinci/dm644x.c
View File

@ -899,7 +899,7 @@ struct platform_device dm644x_serial_device[] = {
}
};
static struct davinci_soc_info davinci_soc_info_dm644x = {
static const struct davinci_soc_info davinci_soc_info_dm644x = {
.io_desc = dm644x_io_desc,
.io_desc_num = ARRAY_SIZE(dm644x_io_desc),
.jtag_id_reg = 0x01c40028,

4
arch/arm/mach-davinci/dm646x.c
View File

@ -882,7 +882,7 @@ struct platform_device dm646x_serial_device[] = {
}
};
static struct davinci_soc_info davinci_soc_info_dm646x = {
static const struct davinci_soc_info davinci_soc_info_dm646x = {
.io_desc = dm646x_io_desc,
.io_desc_num = ARRAY_SIZE(dm646x_io_desc),
.jtag_id_reg = 0x01c40028,
@ -949,7 +949,7 @@ int __init dm646x_init_edma(struct edma_rsv_info *rsv)
dm646x_edma_pdata.rsv = rsv;
edma_pdev = platform_device_register_full(&dm646x_edma_device);
return IS_ERR(edma_pdev) ? PTR_ERR(edma_pdev) : 0;
return PTR_ERR_OR_ZERO(edma_pdev);
}
void __init dm646x_init(void)

2
arch/arm/mach-davinci/include/mach/common.h
View File

@ -79,7 +79,7 @@ struct davinci_soc_info {
extern struct davinci_soc_info davinci_soc_info;
extern void davinci_common_init(struct davinci_soc_info *soc_info);
extern void davinci_common_init(const struct davinci_soc_info *soc_info);
extern void davinci_init_ide(void);
void davinci_restart(enum reboot_mode mode, const char *cmd);
void davinci_init_late(void);