From patchwork Fri Apr 26 13:29:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 16435 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f199.google.com (mail-ye0-f199.google.com [209.85.213.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C7FA72397A for ; Fri, 26 Apr 2013 13:31:23 +0000 (UTC) Received: by mail-ye0-f199.google.com with SMTP id l3sf512485yen.2 for ; Fri, 26 Apr 2013 06:30:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :from:to:cc:subject:date:message-id:x-mailer:mime-version :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=0hPtttHpfaQeqHA40ufw1GmZl4SM3fljgALBN/tnxCY=; b=RM2vOFOUxrGdh7xnM2edepFNU1m9Z2mUHH79efJ11HdJi0qbfp/IfsimlduF9VZT8y 9LV8kU+m+eHzGHRRLhNORLR8S1O0gDKig+76bL2yuatMuc9Kjs2w2P+Sg1kfzc6XgGn0 9f6H6ZI1dhB2EWOlhB3eEfFdJg4VKq8csjm5+v263kb8S/uH2zD24i4HyG2/W07LkY/n xFZ1tCiJXhADNpMwdNj6rTBEAaTLBZSYfrKs2hzczmeuuNjQzbBU42LG38Gtp5Bkgk3T Fs11Z0xxujnQKt0aRkWa2cb1eVxbwXFCSKAG5qzi+4/zrovu5M0jYIfM0hwe6ypJu06h TWhw== X-Received: by 10.236.188.103 with SMTP id z67mr20004469yhm.30.1366983027978; Fri, 26 Apr 2013 06:30:27 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.71.166 with SMTP id w6ls1712418qeu.14.gmail; Fri, 26 Apr 2013 06:30:27 -0700 (PDT) X-Received: by 10.52.120.101 with SMTP id lb5mr4196563vdb.11.1366983027613; Fri, 26 Apr 2013 06:30:27 -0700 (PDT) Received: from mail-vb0-x229.google.com (mail-vb0-x229.google.com [2607:f8b0:400c:c02::229]) by mx.google.com with ESMTPS id p12si5371282vce.22.2013.04.26.06.30.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 26 Apr 2013 06:30:27 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::229 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::229; Received: by mail-vb0-f41.google.com with SMTP id f12so1620339vbg.0 for ; Fri, 26 Apr 2013 06:30:27 -0700 (PDT) X-Received: by 10.58.144.170 with SMTP id sn10mr24150717veb.7.1366983027136; Fri, 26 Apr 2013 06:30:27 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp69256veb; Fri, 26 Apr 2013 06:30:26 -0700 (PDT) X-Received: by 10.15.93.202 with SMTP id w50mr63811528eez.45.1366983025713; Fri, 26 Apr 2013 06:30:25 -0700 (PDT) Received: from eu1sys200aog123.obsmtp.com (eu1sys200aog123.obsmtp.com [207.126.144.155]) by mx.google.com with SMTP id v7si16967630eep.240.2013.04.26.06.30.18 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 26 Apr 2013 06:30:25 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.155 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.155; Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob123.postini.com ([207.126.147.11]) with SMTP ID DSNKUXqBaLGbFy4LD3E4roS0fDIAobec+mV9@postini.com; Fri, 26 Apr 2013 13:30:25 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id 9D6BE4E; Fri, 26 Apr 2013 13:29:06 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 81FA84D; Fri, 26 Apr 2013 06:35:20 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 1F67AA8083; Fri, 26 Apr 2013 15:29:56 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.279.5; Fri, 26 Apr 2013 15:30:01 +0200 From: Linus Walleij To: Cc: , Anmar Oueja , Linus Walleij , Subject: [PATCH] ARM: u300: fix ages old copy/paste bug Date: Fri, 26 Apr 2013 15:29:55 +0200 Message-ID: <1366982995-10870-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmoVNoGYlNBSYNI6lIgTPOuo7imFqkQTqKr40KPXNqWpebB+JqhUdXInUMwcL50l9R7/LIa X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::229 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Linus Walleij The UART1 is on the fast AHB bridge, not on the slow bus. Cc: stable@vger.kernel.org Acked-by: Arnd Bergmann Signed-off-by: Linus Walleij --- Hi ARM SoC folks, as discussed with Arnd, please apply this patch directly for fixes. --- arch/arm/mach-u300/include/mach/u300-regs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-u300/include/mach/u300-regs.h b/arch/arm/mach-u300/include/mach/u300-regs.h index 1e49d90..0320495 100644 --- a/arch/arm/mach-u300/include/mach/u300-regs.h +++ b/arch/arm/mach-u300/include/mach/u300-regs.h @@ -95,7 +95,7 @@ #define U300_SPI_BASE (U300_FAST_PER_PHYS_BASE+0x6000) /* Fast UART1 on U335 only */ -#define U300_UART1_BASE (U300_SLOW_PER_PHYS_BASE+0x7000) +#define U300_UART1_BASE (U300_FAST_PER_PHYS_BASE+0x7000) /* * SLOW peripherals