LinuxLists.cc - [PATCH 1/3] ARM: zynq: Move common.h to generic location

Hi Michal,

On Mon, 2014-10-06 at 01:44PM +0200, Michal Simek wrote:
> Get OCM configuration from SLCR.
>
> Signed-off-by: Michal Simek <[email protected]>
> ---
>
> arch/arm/mach-zynq/slcr.c | 15 +++++++++++++++
> include/soc/zynq/common.h | 1 +
> 2 files changed, 16 insertions(+)
>
> diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
> index cb7c46165728..0c3e45090c09 100644
> --- a/arch/arm/mach-zynq/slcr.c
> +++ b/arch/arm/mach-zynq/slcr.c
> @@ -27,6 +27,7 @@
> #define SLCR_A9_CPU_RST_CTRL_OFFSET 0x244 /* CPU Software Reset Control */
> #define SLCR_REBOOT_STATUS_OFFSET 0x258 /* PS Reboot Status */
> #define SLCR_PSS_IDCODE 0x530 /* PS IDCODE */
> +#define SLCR_OCM_CFG_OFFSET 0x910 /* OCM Address Mapping */
>
> #define SLCR_UNLOCK_MAGIC 0xDF0D
> #define SLCR_A9_CPU_CLKSTOP 0x10
> @@ -126,6 +127,20 @@ void zynq_slcr_system_reset(void)
> }
>
> /**
> + * zynq_slcr_get_ocm_config - Get SLCR OCM config
> + *
> + * Return: OCM config bits
> + */
> +u32 zynq_slcr_get_ocm_config(void)
> +{
> + u32 val;
> +
> + zynq_slcr_read(&val, SLCR_OCM_CFG_OFFSET);
> +
> + return val;
> +}

a different idea would be, instead of creating this specific API call
for the OCMC to let the OCMC driver use regmap and making git a subnode
of the SLCR.
In the long run that might be a better option otherwise we'll end up
with a whole bunch of zynq_slcr_get_foo() calls for each driver that
needs to read an SLCR register.

Thanks,
Sören

2014-10-06 17:55:04

by Michal Simek

[permalink] [raw]

Subject: Re: [PATCH 3/3] ARM: zynq: Extend SLCR driver to read OCM configuration

Hi Soren,

On 10/06/2014 05:59 PM, Sören Brinkmann wrote:
> Hi Michal,
>
> On Mon, 2014-10-06 at 01:44PM +0200, Michal Simek wrote:
>> Get OCM configuration from SLCR.
>>
>> Signed-off-by: Michal Simek <[email protected]>
>> ---
>>
>> arch/arm/mach-zynq/slcr.c | 15 +++++++++++++++
>> include/soc/zynq/common.h | 1 +
>> 2 files changed, 16 insertions(+)
>>
>> diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
>> index cb7c46165728..0c3e45090c09 100644
>> --- a/arch/arm/mach-zynq/slcr.c
>> +++ b/arch/arm/mach-zynq/slcr.c
>> @@ -27,6 +27,7 @@
>> #define SLCR_A9_CPU_RST_CTRL_OFFSET 0x244 /* CPU Software Reset Control */
>> #define SLCR_REBOOT_STATUS_OFFSET 0x258 /* PS Reboot Status */
>> #define SLCR_PSS_IDCODE 0x530 /* PS IDCODE */
>> +#define SLCR_OCM_CFG_OFFSET 0x910 /* OCM Address Mapping */
>>
>> #define SLCR_UNLOCK_MAGIC 0xDF0D
>> #define SLCR_A9_CPU_CLKSTOP 0x10
>> @@ -126,6 +127,20 @@ void zynq_slcr_system_reset(void)
>> }
>>
>> /**
>> + * zynq_slcr_get_ocm_config - Get SLCR OCM config
>> + *
>> + * Return: OCM config bits
>> + */
>> +u32 zynq_slcr_get_ocm_config(void)
>> +{
>> + u32 val;
>> +
>> + zynq_slcr_read(&val, SLCR_OCM_CFG_OFFSET);
>> +
>> + return val;
>> +}
>
> a different idea would be, instead of creating this specific API call
> for the OCMC to let the OCMC driver use regmap and making git a subnode
> of the SLCR.
> In the long run that might be a better option otherwise we'll end up
> with a whole bunch of zynq_slcr_get_foo() calls for each driver that
> needs to read an SLCR register.

yes using regmap is also possible and I know that.

Thanks,
Michal

--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform

Attachments:

signature.asc (198.00 B)
OpenPGP digital signature

2014-10-13 20:26:00

by Soren Brinkmann

[permalink] [raw]

Subject: Re: [PATCH 1/3] ARM: zynq: Move common.h to generic location

On Mon, 2014-10-06 at 01:44PM +0200, Michal Simek wrote:
> include/soc/zynq/ is the right location for this header
> to be able to share information from this header with other
> drivers which require it.
>
> Signed-off-by: Michal Simek <[email protected]>
> ---
>
> arch/arm/mach-zynq/common.c | 2 +-
> arch/arm/mach-zynq/hotplug.c | 2 +-
> arch/arm/mach-zynq/platsmp.c | 2 +-
> arch/arm/mach-zynq/slcr.c | 2 +-

In the 3.18 merge window arch/arm/mach-zynq/pm.c had been added which is
not covered in this version of the patch.

Sören

2014-10-20 13:30:03

by Michal Simek

[permalink] [raw]

Subject: Re: [PATCH 1/3] ARM: zynq: Move common.h to generic location

On 10/13/2014 10:24 PM, Sören Brinkmann wrote:
> On Mon, 2014-10-06 at 01:44PM +0200, Michal Simek wrote:
>> include/soc/zynq/ is the right location for this header
>> to be able to share information from this header with other
>> drivers which require it.
>>
>> Signed-off-by: Michal Simek <[email protected]>
>> ---
>>
>> arch/arm/mach-zynq/common.c | 2 +-
>> arch/arm/mach-zynq/hotplug.c | 2 +-
>> arch/arm/mach-zynq/platsmp.c | 2 +-
>> arch/arm/mach-zynq/slcr.c | 2 +-
>
> In the 3.18 merge window arch/arm/mach-zynq/pm.c had been added which is
> not covered in this version of the patch.

Thanks will send v2.
Michal