Commit 0fcd5411 authored by David Lechner's avatar David Lechner Committed by Sekhar Nori

ARM: davinci: da8xx: Add CFGCHIP syscon platform device

The CFGCHIP registers are used by a number of devices, so use a syscon
device to share them. The first consumer of this will be the phy-da8xx-usb
driver.

Add the syscon device and register it.
Signed-off-by: default avatarDavid Lechner <david@lechnology.com>
[nsekhar@ti.com: minor commit message fixes]
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 766763db
...@@ -589,6 +589,10 @@ static __init void da830_evm_init(void) ...@@ -589,6 +589,10 @@ static __init void da830_evm_init(void)
struct davinci_soc_info *soc_info = &davinci_soc_info; struct davinci_soc_info *soc_info = &davinci_soc_info;
int ret; int ret;
ret = da8xx_register_cfgchip();
if (ret)
pr_warn("%s: CFGCHIP registration failed: %d\n", __func__, ret);
ret = da830_register_gpio(); ret = da830_register_gpio();
if (ret) if (ret)
pr_warn("%s: GPIO init failed: %d\n", __func__, ret); pr_warn("%s: GPIO init failed: %d\n", __func__, ret);
......
...@@ -1345,6 +1345,10 @@ static __init void da850_evm_init(void) ...@@ -1345,6 +1345,10 @@ static __init void da850_evm_init(void)
{ {
int ret; int ret;
ret = da8xx_register_cfgchip();
if (ret)
pr_warn("%s: CFGCHIP registration failed: %d\n", __func__, ret);
ret = da850_register_gpio(); ret = da850_register_gpio();
if (ret) if (ret)
pr_warn("%s: GPIO init failed: %d\n", __func__, ret); pr_warn("%s: GPIO init failed: %d\n", __func__, ret);
......
...@@ -514,6 +514,10 @@ static void __init mityomapl138_init(void) ...@@ -514,6 +514,10 @@ static void __init mityomapl138_init(void)
{ {
int ret; int ret;
ret = da8xx_register_cfgchip();
if (ret)
pr_warn("%s: CFGCHIP registration failed: %d\n", __func__, ret);
/* for now, no special EDMA channels are reserved */ /* for now, no special EDMA channels are reserved */
ret = da850_register_edma(NULL); ret = da850_register_edma(NULL);
if (ret) if (ret)
......
...@@ -293,6 +293,10 @@ static __init void omapl138_hawk_init(void) ...@@ -293,6 +293,10 @@ static __init void omapl138_hawk_init(void)
{ {
int ret; int ret;
ret = da8xx_register_cfgchip();
if (ret)
pr_warn("%s: CFGCHIP registration failed: %d\n", __func__, ret);
ret = da850_register_gpio(); ret = da850_register_gpio();
if (ret) if (ret)
pr_warn("%s: GPIO init failed: %d\n", __func__, ret); pr_warn("%s: GPIO init failed: %d\n", __func__, ret);
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
* (at your option) any later version. * (at your option) any later version.
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/platform_data/syscon.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/dma-contiguous.h> #include <linux/dma-contiguous.h>
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
...@@ -1060,3 +1061,30 @@ int __init da850_register_sata(unsigned long refclkpn) ...@@ -1060,3 +1061,30 @@ int __init da850_register_sata(unsigned long refclkpn)
return platform_device_register(&da850_sata_device); return platform_device_register(&da850_sata_device);
} }
#endif #endif
static struct syscon_platform_data da8xx_cfgchip_platform_data = {
.label = "cfgchip",
};
static struct resource da8xx_cfgchip_resources[] = {
{
.start = DA8XX_SYSCFG0_BASE + DA8XX_CFGCHIP0_REG,
.end = DA8XX_SYSCFG0_BASE + DA8XX_CFGCHIP4_REG + 3,
.flags = IORESOURCE_MEM,
},
};
static struct platform_device da8xx_cfgchip_device = {
.name = "syscon",
.id = -1,
.dev = {
.platform_data = &da8xx_cfgchip_platform_data,
},
.num_resources = ARRAY_SIZE(da8xx_cfgchip_resources),
.resource = da8xx_cfgchip_resources,
};
int __init da8xx_register_cfgchip(void)
{
return platform_device_register(&da8xx_cfgchip_device);
}
...@@ -61,6 +61,7 @@ extern unsigned int da850_max_speed; ...@@ -61,6 +61,7 @@ extern unsigned int da850_max_speed;
#define DA8XX_CFGCHIP1_REG 0x180 #define DA8XX_CFGCHIP1_REG 0x180
#define DA8XX_CFGCHIP2_REG 0x184 #define DA8XX_CFGCHIP2_REG 0x184
#define DA8XX_CFGCHIP3_REG 0x188 #define DA8XX_CFGCHIP3_REG 0x188
#define DA8XX_CFGCHIP4_REG 0x18c
#define DA8XX_SYSCFG1_BASE (IO_PHYS + 0x22C000) #define DA8XX_SYSCFG1_BASE (IO_PHYS + 0x22C000)
#define DA8XX_SYSCFG1_VIRT(x) (da8xx_syscfg1_base + (x)) #define DA8XX_SYSCFG1_VIRT(x) (da8xx_syscfg1_base + (x))
...@@ -113,6 +114,7 @@ void da8xx_rproc_reserve_cma(void); ...@@ -113,6 +114,7 @@ void da8xx_rproc_reserve_cma(void);
int da8xx_register_rproc(void); int da8xx_register_rproc(void);
int da850_register_gpio(void); int da850_register_gpio(void);
int da830_register_gpio(void); int da830_register_gpio(void);
int da8xx_register_cfgchip(void);
extern struct platform_device da8xx_serial_device[]; extern struct platform_device da8xx_serial_device[];
extern struct emac_platform_data da8xx_emac_pdata; extern struct emac_platform_data da8xx_emac_pdata;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment