From patchwork Mon Jan 26 06:17:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 5706551 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 79F569F2ED for ; Mon, 26 Jan 2015 06:11:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B1A602012E for ; Mon, 26 Jan 2015 06:11:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DEA0A20145 for ; Mon, 26 Jan 2015 06:11:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752156AbbAZGLt (ORCPT ); Mon, 26 Jan 2015 01:11:49 -0500 Received: from mail-pd0-f175.google.com ([209.85.192.175]:55478 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751828AbbAZGLt (ORCPT ); Mon, 26 Jan 2015 01:11:49 -0500 Received: by mail-pd0-f175.google.com with SMTP id fl12so10160795pdb.6 for ; Sun, 25 Jan 2015 22:11:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=3S8qpQygPtPDnbyAda59HR30sOqy4MUD9G1wlgH36rI=; b=VU0gwXUCEWNuDzKi+b41w64Dp+wz5Hjj+HlSckTWvbxivQ+aIoT/4KHeIp1l3S6Uxe A8mghC76HcPbHcDun/AnL4SScaRTD7Zrpo7HFgChfAOFb0eWryKxutfl9MBecHyOjNRI ZeLQf6YgVNGki5WIF+ktLf5cif6v0Tw8hCrI0SddKTscmDF4ydMs9hohSXG7F2FcJ0xM SwYLD4l8kDWaGBP+deHHHpkOKpaHU0m6Etr64UZgrYJwft2z/aiYkeW52Lgez5wJ0F3X HpMyGiM6GG5VeRoKzjy/c3R0yc8dJLFfNK8Ef03TBNN6ApZ1os7nB5gzNoTxFeujWwV3 DwtA== X-Received: by 10.68.57.165 with SMTP id j5mr31851600pbq.70.1422252708611; Sun, 25 Jan 2015 22:11:48 -0800 (PST) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by mx.google.com with ESMTPSA id oa17sm3352491pdb.5.2015.01.25.22.11.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Jan 2015 22:11:47 -0800 (PST) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be, linus.walleij@linaro.org, horms@verge.net.au, Magnus Damm , linux-arm-kernel@lists.infradead.org Date: Mon, 26 Jan 2015 15:17:58 +0900 Message-Id: <20150126061758.6848.22708.sendpatchset@little-apple> In-Reply-To: <20150126061747.6848.9708.sendpatchset@little-apple> References: <20150126061747.6848.9708.sendpatchset@little-apple> Subject: [PATCH 01/14 v2] ARM: shmobile: mackerel: Remove ZBOOT code Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Magnus Damm Remove ZBOOT support code for Mackerel. With this patch in place it is no longer possible to boot a self-contained kernel directly from the reset vector. ZBOOT is still supported on kzm9g. Signed-off-by: Magnus Damm Acked-by: Laurent Pinchart --- Changes since V1: - Rebased and resolved conflicts arch/arm/mach-shmobile/include/mach/head-mackerel.txt | 93 ----------------- arch/arm/mach-shmobile/include/mach/mmc-mackerel.h | 38 ------ arch/arm/mach-shmobile/include/mach/mmc.h | 5 arch/arm/mach-shmobile/include/mach/zboot.h | 5 4 files changed, 1 insertion(+), 140 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/arch/arm/mach-shmobile/include/mach/head-mackerel.txt +++ /dev/null 2015-01-13 15:44:39.280208949 +0900 @@ -1,93 +0,0 @@ -LIST "partner-jet-setup.txt" -LIST "(C) Copyright 2010 Renesas Solutions Corp" -LIST "Kuninori Morimoto " - -LIST "RWT Setting" -EW 0xE6020004, 0xA500 -EW 0xE6030004, 0xA500 - -LIST "GPIO Setting" -EB 0xE6051013, 0xA2 - -LIST "CPG" -ED 0xE61500C0, 0x00000002 - -WAIT 1, 0xFE40009C - -LIST "FRQCR" -ED 0xE6150000, 0x2D1305C3 -ED 0xE61500E0, 0x9E40358E -ED 0xE6150004, 0x80331050 - -WAIT 1, 0xFE40009C - -ED 0xE61500E4, 0x00002000 - -WAIT 1, 0xFE40009C - -LIST "PLL" -ED 0xE6150028, 0x00004000 - -WAIT 1, 0xFE40009C - -ED 0xE615002C, 0x93000040 - -WAIT 1, 0xFE40009C - -LIST "SUB/USBClk" -ED 0xE6150080, 0x00000180 - -LIST "BSC" -ED 0xFEC10000, 0x00E0001B - -LIST "SBSC1" -ED 0xFE400354, 0x01AD8000 -ED 0xFE400354, 0x01AD8001 - -WAIT 5, 0xFE40009C - -ED 0xFE400008, 0xBCC90151 -ED 0xFE400040, 0x41774113 -ED 0xFE400044, 0x2712E229 -ED 0xFE400048, 0x20C18505 -ED 0xFE40004C, 0x00110209 -ED 0xFE400010, 0x00000087 - -WAIT 30, 0xFE40009C - -ED 0xFE400084, 0x0000003F -EB 0xFE500000, 0x00 - -WAIT 5, 0xFE40009C - -ED 0xFE400084, 0x0000FF0A -EB 0xFE500000, 0x00 - -WAIT 1, 0xFE40009C - -ED 0xFE400084, 0x00002201 -EB 0xFE500000, 0x00 -ED 0xFE400084, 0x00000302 -EB 0xFE500000, 0x00 -EB 0xFE5C0000, 0x00 -ED 0xFE400008, 0xBCC90159 -ED 0xFE40008C, 0x88800004 -ED 0xFE400094, 0x00000004 -ED 0xFE400028, 0xA55A0032 -ED 0xFE40002C, 0xA55A000C -ED 0xFE400020, 0xA55A2048 -ED 0xFE400008, 0xBCC90959 - -LIST "Change CPGA setting" -ED 0xE61500E0, 0x9E40352E -ED 0xE6150004, 0x80331050 - -WAIT 1, 0xFE40009C - -ED 0xFE400354, 0x01AD8002 - -LIST "SCIF0 - Serial port for earlyprintk" -EB 0xE6053098, 0xe1 -EW 0xE6C40000, 0x0000 -EB 0xE6C40004, 0x19 -EW 0xE6C40008, 0x0030 --- 0001/arch/arm/mach-shmobile/include/mach/mmc-mackerel.h +++ /dev/null 2015-01-13 15:44:39.280208949 +0900 @@ -1,38 +0,0 @@ -#ifndef MMC_MACKEREL_H -#define MMC_MACKEREL_H - -#define PORT0CR (void __iomem *)0xe6051000 -#define PORT1CR (void __iomem *)0xe6051001 -#define PORT2CR (void __iomem *)0xe6051002 -#define PORT159CR (void __iomem *)0xe605009f - -#define PORTR031_000DR (void __iomem *)0xe6055000 -#define PORTL159_128DR (void __iomem *)0xe6054010 - -static inline void mmc_init_progress(void) -{ - /* Initialise LEDS0-3 - * registers: PORT0CR-PORT2CR,PORT159CR (LED0-LED3 Control) - * value: 0x10 - enable output - */ - __raw_writeb(0x10, PORT0CR); - __raw_writeb(0x10, PORT1CR); - __raw_writeb(0x10, PORT2CR); - __raw_writeb(0x10, PORT159CR); -} - -static inline void mmc_update_progress(int n) -{ - unsigned a = 0, b = 0; - - if (n < 3) - a = 1 << n; - else - b = 1 << 31; - - __raw_writel((__raw_readl(PORTR031_000DR) & ~0x7) | a, - PORTR031_000DR); - __raw_writel((__raw_readl(PORTL159_128DR) & ~(1 << 31)) | b, - PORTL159_128DR); -} -#endif /* MMC_MACKEREL_H */ --- 0001/arch/arm/mach-shmobile/include/mach/mmc.h +++ work/arch/arm/mach-shmobile/include/mach/mmc.h 2015-01-26 13:25:56.975993591 +0900 @@ -7,10 +7,5 @@ * **************************************************/ -#ifdef CONFIG_MACH_MACKEREL -#include "mach/mmc-mackerel.h" -#else #error "unsupported board." -#endif - #endif /* MMC_H */ --- 0001/arch/arm/mach-shmobile/include/mach/zboot.h +++ work/arch/arm/mach-shmobile/include/mach/zboot.h 2015-01-26 13:26:47.145993411 +0900 @@ -9,10 +9,7 @@ * **************************************************/ -#ifdef CONFIG_MACH_MACKEREL -#define MEMORY_START 0x40000000 -#include "mach/head-mackerel.txt" -#elif defined(CONFIG_MACH_KZM9G) || defined(CONFIG_MACH_KZM9G_REFERENCE) +#if defined(CONFIG_MACH_KZM9G) || defined(CONFIG_MACH_KZM9G_REFERENCE) #define MEMORY_START 0x43000000 #include "mach/head-kzm9g.txt" #else