From aba4e29eadfb82ef7f52f85cdb4cd10a4abad622 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Mon, 31 Jul 2017 21:03:37 +0200 Subject: brcm63xx: register serial through device tree Register serial consoles through device tree instead of through board data. Signed-off-by: Jonas Gorski --- ...11-MIPS-BCM63XX-Register-SPI-flash-if-present.patch | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'target/linux/brcm63xx/patches-4.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch') diff --git a/target/linux/brcm63xx/patches-4.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch b/target/linux/brcm63xx/patches-4.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch index 6dab40d7e1..608ad8e39a 100644 --- a/target/linux/brcm63xx/patches-4.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch +++ b/target/linux/brcm63xx/patches-4.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch @@ -11,7 +11,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/dev-flash.c +++ b/arch/mips/bcm63xx/dev-flash.c -@@ -17,9 +17,13 @@ +@@ -17,6 +17,9 @@ #include #include #include @@ -21,11 +21,7 @@ Signed-off-by: Jonas Gorski #include #include -+#include - #include - #include - -@@ -66,6 +70,41 @@ void __init bcm63xx_flash_force_phys_bas +@@ -66,6 +69,41 @@ void __init bcm63xx_flash_force_phys_bas mtd_resources[0].end = end; } @@ -67,7 +63,7 @@ Signed-off-by: Jonas Gorski static int __init bcm63xx_detect_flash_type(void) { u32 val; -@@ -73,9 +112,15 @@ static int __init bcm63xx_detect_flash_t +@@ -73,9 +111,15 @@ static int __init bcm63xx_detect_flash_t switch (bcm63xx_get_cpu_id()) { case BCM6318_CPU_ID: /* only support serial flash */ @@ -83,7 +79,7 @@ Signed-off-by: Jonas Gorski if (val & STRAPBUS_6328_BOOT_SEL_SERIAL) return BCM63XX_FLASH_TYPE_SERIAL; else -@@ -94,12 +139,20 @@ static int __init bcm63xx_detect_flash_t +@@ -94,12 +138,20 @@ static int __init bcm63xx_detect_flash_t return BCM63XX_FLASH_TYPE_SERIAL; case BCM6362_CPU_ID: val = bcm_misc_readl(MISC_STRAPBUS_6362_REG); @@ -104,7 +100,7 @@ Signed-off-by: Jonas Gorski switch (val & STRAPBUS_6368_BOOT_SEL_MASK) { case STRAPBUS_6368_BOOT_SEL_NAND: return BCM63XX_FLASH_TYPE_NAND; -@@ -110,6 +163,11 @@ static int __init bcm63xx_detect_flash_t +@@ -110,6 +162,11 @@ static int __init bcm63xx_detect_flash_t } case BCM63268_CPU_ID: val = bcm_misc_readl(MISC_STRAPBUS_63268_REG); @@ -116,7 +112,7 @@ Signed-off-by: Jonas Gorski if (val & STRAPBUS_63268_BOOT_SEL_SERIAL) return BCM63XX_FLASH_TYPE_SERIAL; else -@@ -176,6 +234,7 @@ void __init bcm63xx_flash_detect(void) +@@ -176,6 +233,7 @@ void __init bcm63xx_flash_detect(void) int __init bcm63xx_flash_register(void) { @@ -124,7 +120,7 @@ Signed-off-by: Jonas Gorski u32 val; switch (flash_type) { -@@ -195,8 +254,14 @@ int __init bcm63xx_flash_register(void) +@@ -195,8 +253,14 @@ int __init bcm63xx_flash_register(void) return platform_device_register(&mtd_dev); case BCM63XX_FLASH_TYPE_SERIAL: -- cgit v1.2.3