ARM: integrator: delete some auxdata
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 30 Aug 2016 08:45:27 +0000 (10:45 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 31 Aug 2016 07:30:33 +0000 (09:30 +0200)
There is just a few auxdata entries still needed on the Integrators:

- UART RTS/CTS callbacks for Integrator/AP
- MMC/SD special card detect quirk for Integrator/CP

Delete the rest.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-integrator/integrator_cp.c

index c7bb832..ceef70d 100644 (file)
@@ -196,16 +196,10 @@ static void __init ap_init_irq_of(void)
 
 /* For the Device Tree, add in the UART callbacks as AUXDATA */
 static struct of_dev_auxdata ap_auxdata_lookup[] __initdata = {
-       OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_RTC_BASE,
-               "rtc", NULL),
        OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_UART0_BASE,
                "uart0", &ap_uart_data),
        OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_UART1_BASE,
                "uart1", &ap_uart_data),
-       OF_DEV_AUXDATA("arm,primecell", KMI0_BASE,
-               "kmi0", NULL),
-       OF_DEV_AUXDATA("arm,primecell", KMI1_BASE,
-               "kmi1", NULL),
        { /* sentinel */ },
 };
 
index a9e3cb5..1742bc7 100644 (file)
@@ -140,20 +140,8 @@ static void __init intcp_init_irq_of(void)
  * and enforce the bus names since these are used for clock lookups.
  */
 static struct of_dev_auxdata intcp_auxdata_lookup[] __initdata = {
-       OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_RTC_BASE,
-               "rtc", NULL),
-       OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_UART0_BASE,
-               "uart0", NULL),
-       OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_UART1_BASE,
-               "uart1", NULL),
-       OF_DEV_AUXDATA("arm,primecell", KMI0_BASE,
-               "kmi0", NULL),
-       OF_DEV_AUXDATA("arm,primecell", KMI1_BASE,
-               "kmi1", NULL),
        OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_CP_MMC_BASE,
                "mmci", &mmc_data),
-       OF_DEV_AUXDATA("arm,primecell", INTEGRATOR_CP_AACI_BASE,
-               "aaci", &mmc_data),
        { /* sentinel */ },
 };