hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

based on tags/s3c24xx-dt-1 

- update uart addresses in s3c2416-dt auxdata due to removing S3C2410_PA_UARTX
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJRwK8hAAoJEA0Cl+kVi2xqPogP/iQcUyriupy1YuMuo5PZ6Gg9
 zBgkE/DBsoMKEvc1WtK0EbGpQgC3/Ik9Zvp5sJdxpcdP7qMRMZRYt+b1kemYkAaQ
 9MJVz5Fh4GGPWleXppCx/eviEHs8e5owXzbfF5iH36GLwFjvtfuNZx/Tlz72txjo
 azwjgUBwY/KSyzXLbmp7hwN5plZd3RMvaiVeJel/tChJjZn7oaa7RSh5OU37KWHl
 Vx7O4M7YiwcuECrZ7+F7/EIPlaUelNWPBLgXBS53ynUYzigfx2HWYwwHTnN839ZJ
 yEx1J/8xDCgYkY+t9WXfbiTbcE1yU+Mff3Al6eGbg0JtzNU+zuzh1cvdLVIiaKmZ
 fLYmJbTg/MJlZNJYbbwS4Oel8vqRhaaPdWE87rrz4bb+cMUidhiTCcQfAWY+OJYO
 TdMAdwEBdISvd2flTjLWYMRTY66n19FAaFalYWd9MJLHnyxx5+P/5Xju4Bc1gC5A
 cIS5Eck5VVS2EDj2WFJzfzP3CYj2p+2U2ymNHKo+ob/DZ3xETlomTVhc6fnTJy94
 mVUvk6aYvX/D5dYdjdmx890q9A900pmNgIHejg+tkZQZrEUc6ZtzvOIovlrw7ExI
 GasI65trpsREpgYHrUiJHZjJNBWwb7yBvZ2wrwvynEnCN5HRsvgXkztDtt8NTEdY
 agQfkvxa3BpHYZ2iPULb
 =Cuff
 -----END PGP SIGNATURE-----

Merge tag 's3c24xx-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt

From Kukjin Kim:

based on tags/s3c24xx-dt-1
- update uart addresses in s3c2416-dt auxdata due to removing S3C2410_PA_UARTX

* tag 's3c24xx-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C24XX: update uart addresses in s3c2416-dt auxdata

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2013-06-20 22:18:40 +02:00
parent 6f9543f158 52c76e44f1
commit 62274f8f93
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-s3c24xx/mach-s3c2416-dt.c
View File

@ -43,13 +43,13 @@
* data from the device tree. * data from the device tree.
*/ */
static const struct of_dev_auxdata s3c2416_auxdata_lookup[] __initconst = { static const struct of_dev_auxdata s3c2416_auxdata_lookup[] __initconst = {
OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2410_PA_UART0, OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART,
"s3c2440-uart.0", NULL), "s3c2440-uart.0", NULL),
OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2410_PA_UART1, OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART + 0x4000,
"s3c2440-uart.1", NULL), "s3c2440-uart.1", NULL),
OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2410_PA_UART2, OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART + 0x8000,
"s3c2440-uart.2", NULL), "s3c2440-uart.2", NULL),
OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C2443_PA_UART3, OF_DEV_AUXDATA("samsung,s3c2440-uart", S3C24XX_PA_UART + 0xC000,
"s3c2440-uart.3", NULL), "s3c2440-uart.3", NULL),
OF_DEV_AUXDATA("samsung,s3c6410-sdhci", S3C_PA_HSMMC0, OF_DEV_AUXDATA("samsung,s3c6410-sdhci", S3C_PA_HSMMC0,
"s3c-sdhci.0", NULL), "s3c-sdhci.0", NULL),