[GIT PULL v2] Xilinx Zynq changes for v3.15

Michal Simek monstr at monstr.eu
Wed Mar 12 08:03:46 EDT 2014

On 03/11/2014 10:33 PM, Olof Johansson wrote:
> On Mon, Mar 10, 2014 at 09:14:34AM +0100, Michal Simek wrote:
>> Hi,
>> please pull these changes to your arm-soc tree. This branch is based
>> on zynq/dt branch from the second pull request.
>> I have kept OCM patch in this branch because it depends on slcr changes
>> done here. If you want to send another pull request just for this OCM
>> patch based on this branch, please let me know.
>> Changes in v2: Fix incorrect git repo url
> Thanks!
>> The following changes since commit 3795e91d2abb25164dda5687ca680a7ab940c447:
>>   arm: dt: zynq: Add fclk-enable property to clkc node (2014-02-03 17:00:24 +0100)
>> are available in the git repository at:
>>   git://git.xilinx.com/linux-xlnx.git tags/zynq-cleanup-for-3.15
>> for you to fetch changes up to e9aa3e3a5bb2d64515648537100e5cf9b863e01a:
>>   ARM: zynq: Add support for SOC_BUS (2014-02-20 16:08:47 +0100)
>> ----------------------------------------------------------------
>> arm: Xilinx Zynq cleanup patches for v3.15
>> - Redesign SLCR initialization to enable
>>   driver developing which targets SLCR space
>> - Add OCM driver
>> - Add SOC_BUS support
>> ----------------------------------------------------------------
>> Michal Simek (8):
>>       ARM: zynq: Split slcr in two parts
>>       ARM: zynq: Map I/O memory on clkc init
>>       ARM: zynq: Add and use zynq_slcr_read/write() helper functions
>>       ARM: zynq: Introduce zynq_slcr_unlock()
>>       ARM: zynq: Add OCM driver
> Looking at the patches in the branch, this is the one I have most concern with.
> I think it will require more work to get it in shape to get merged, as per
> those comments.
> I think it's worth to merge the other stuff though, so can you rebuild the
> branch without the OCM driver so we can get the rest in for 3.15 even if the
> OCM piece ends up taking longer?

No problem to do it. I will just wait one more day till we finish that discussions.
Or is there any time pressure?


Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: 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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140312/414bf75e/attachment-0001.sig>

More information about the linux-arm-kernel mailing list