mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-04 02:46:43 +07:00
5f10428e4a
This patch updates the marzen board code as if USB PHY isn't enabled
they phy will have a value set by ERR_PTR() rather than be NULL.
Without this patch a NULL pointer dereference and kernel panic
occurs on initialisation of USB on marzen.
This resolves a regression introduced in 3.10-rc1 by
b7fa5c2aec
("usb: phy: return -ENXIO when PHY layer isn't enabled").
Tested-by: Nguyen Hong Ky <nh-ky@jinso.co.jp>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
422 lines
9.9 KiB
C
422 lines
9.9 KiB
C
/*
|
|
* marzen board support
|
|
*
|
|
* Copyright (C) 2011 Renesas Solutions Corp.
|
|
* Copyright (C) 2011 Magnus Damm
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; version 2 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/io.h>
|
|
#include <linux/leds.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/pinctrl/machine.h>
|
|
#include <linux/regulator/fixed.h>
|
|
#include <linux/regulator/machine.h>
|
|
#include <linux/smsc911x.h>
|
|
#include <linux/spi/spi.h>
|
|
#include <linux/spi/sh_hspi.h>
|
|
#include <linux/mmc/host.h>
|
|
#include <linux/mmc/sh_mobile_sdhi.h>
|
|
#include <linux/mfd/tmio.h>
|
|
#include <linux/usb/otg.h>
|
|
#include <linux/usb/ehci_pdriver.h>
|
|
#include <linux/usb/ohci_pdriver.h>
|
|
#include <linux/pm_runtime.h>
|
|
#include <mach/hardware.h>
|
|
#include <mach/r8a7779.h>
|
|
#include <mach/common.h>
|
|
#include <mach/irqs.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/traps.h>
|
|
|
|
/* Fixed 3.3V regulator to be used by SDHI0 */
|
|
static struct regulator_consumer_supply fixed3v3_power_consumers[] = {
|
|
REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
|
|
REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),
|
|
};
|
|
|
|
/* Dummy supplies, where voltage doesn't matter */
|
|
static struct regulator_consumer_supply dummy_supplies[] = {
|
|
REGULATOR_SUPPLY("vddvario", "smsc911x"),
|
|
REGULATOR_SUPPLY("vdd33a", "smsc911x"),
|
|
};
|
|
|
|
/* SMSC LAN89218 */
|
|
static struct resource smsc911x_resources[] = {
|
|
[0] = {
|
|
.start = 0x18000000, /* ExCS0 */
|
|
.end = 0x180000ff, /* A1->A7 */
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
[1] = {
|
|
.start = gic_iid(0x3c), /* IRQ 1 */
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct smsc911x_platform_config smsc911x_platdata = {
|
|
.flags = SMSC911X_USE_32BIT, /* 32-bit SW on 16-bit HW bus */
|
|
.phy_interface = PHY_INTERFACE_MODE_MII,
|
|
.irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
|
|
.irq_type = SMSC911X_IRQ_TYPE_PUSH_PULL,
|
|
};
|
|
|
|
static struct platform_device eth_device = {
|
|
.name = "smsc911x",
|
|
.id = -1,
|
|
.dev = {
|
|
.platform_data = &smsc911x_platdata,
|
|
},
|
|
.resource = smsc911x_resources,
|
|
.num_resources = ARRAY_SIZE(smsc911x_resources),
|
|
};
|
|
|
|
static struct resource sdhi0_resources[] = {
|
|
[0] = {
|
|
.name = "sdhi0",
|
|
.start = 0xffe4c000,
|
|
.end = 0xffe4c0ff,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
[1] = {
|
|
.start = gic_iid(0x88),
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct sh_mobile_sdhi_info sdhi0_platform_data = {
|
|
.tmio_flags = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HAS_IDLE_WAIT,
|
|
.tmio_caps = MMC_CAP_SD_HIGHSPEED,
|
|
};
|
|
|
|
static struct platform_device sdhi0_device = {
|
|
.name = "sh_mobile_sdhi",
|
|
.num_resources = ARRAY_SIZE(sdhi0_resources),
|
|
.resource = sdhi0_resources,
|
|
.id = 0,
|
|
.dev = {
|
|
.platform_data = &sdhi0_platform_data,
|
|
}
|
|
};
|
|
|
|
/* Thermal */
|
|
static struct resource thermal_resources[] = {
|
|
[0] = {
|
|
.start = 0xFFC48000,
|
|
.end = 0xFFC48038 - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
};
|
|
|
|
static struct platform_device thermal_device = {
|
|
.name = "rcar_thermal",
|
|
.resource = thermal_resources,
|
|
.num_resources = ARRAY_SIZE(thermal_resources),
|
|
};
|
|
|
|
/* HSPI */
|
|
static struct resource hspi_resources[] = {
|
|
[0] = {
|
|
.start = 0xFFFC7000,
|
|
.end = 0xFFFC7018 - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
};
|
|
|
|
static struct platform_device hspi_device = {
|
|
.name = "sh-hspi",
|
|
.id = 0,
|
|
.resource = hspi_resources,
|
|
.num_resources = ARRAY_SIZE(hspi_resources),
|
|
};
|
|
|
|
/* USB PHY */
|
|
static struct resource usb_phy_resources[] = {
|
|
[0] = {
|
|
.start = 0xffe70000,
|
|
.end = 0xffe70900 - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
[1] = {
|
|
.start = 0xfff70000,
|
|
.end = 0xfff70900 - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
};
|
|
|
|
static struct platform_device usb_phy_device = {
|
|
.name = "rcar_usb_phy",
|
|
.resource = usb_phy_resources,
|
|
.num_resources = ARRAY_SIZE(usb_phy_resources),
|
|
};
|
|
|
|
/* LEDS */
|
|
static struct gpio_led marzen_leds[] = {
|
|
{
|
|
.name = "led2",
|
|
.gpio = 157,
|
|
.default_state = LEDS_GPIO_DEFSTATE_ON,
|
|
}, {
|
|
.name = "led3",
|
|
.gpio = 158,
|
|
.default_state = LEDS_GPIO_DEFSTATE_ON,
|
|
}, {
|
|
.name = "led4",
|
|
.gpio = 159,
|
|
.default_state = LEDS_GPIO_DEFSTATE_ON,
|
|
},
|
|
};
|
|
|
|
static struct gpio_led_platform_data marzen_leds_pdata = {
|
|
.leds = marzen_leds,
|
|
.num_leds = ARRAY_SIZE(marzen_leds),
|
|
};
|
|
|
|
static struct platform_device leds_device = {
|
|
.name = "leds-gpio",
|
|
.id = 0,
|
|
.dev = {
|
|
.platform_data = &marzen_leds_pdata,
|
|
},
|
|
};
|
|
|
|
static struct platform_device *marzen_devices[] __initdata = {
|
|
ð_device,
|
|
&sdhi0_device,
|
|
&thermal_device,
|
|
&hspi_device,
|
|
&usb_phy_device,
|
|
&leds_device,
|
|
};
|
|
|
|
/* USB */
|
|
static struct usb_phy *phy;
|
|
static int usb_power_on(struct platform_device *pdev)
|
|
{
|
|
if (IS_ERR(phy))
|
|
return PTR_ERR(phy);
|
|
|
|
pm_runtime_enable(&pdev->dev);
|
|
pm_runtime_get_sync(&pdev->dev);
|
|
|
|
usb_phy_init(phy);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void usb_power_off(struct platform_device *pdev)
|
|
{
|
|
if (IS_ERR(phy))
|
|
return;
|
|
|
|
usb_phy_shutdown(phy);
|
|
|
|
pm_runtime_put_sync(&pdev->dev);
|
|
pm_runtime_disable(&pdev->dev);
|
|
}
|
|
|
|
static struct usb_ehci_pdata ehcix_pdata = {
|
|
.power_on = usb_power_on,
|
|
.power_off = usb_power_off,
|
|
.power_suspend = usb_power_off,
|
|
};
|
|
|
|
static struct resource ehci0_resources[] = {
|
|
[0] = {
|
|
.start = 0xffe70000,
|
|
.end = 0xffe70400 - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
[1] = {
|
|
.start = gic_iid(0x4c),
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct platform_device ehci0_device = {
|
|
.name = "ehci-platform",
|
|
.id = 0,
|
|
.dev = {
|
|
.dma_mask = &ehci0_device.dev.coherent_dma_mask,
|
|
.coherent_dma_mask = 0xffffffff,
|
|
.platform_data = &ehcix_pdata,
|
|
},
|
|
.num_resources = ARRAY_SIZE(ehci0_resources),
|
|
.resource = ehci0_resources,
|
|
};
|
|
|
|
static struct resource ehci1_resources[] = {
|
|
[0] = {
|
|
.start = 0xfff70000,
|
|
.end = 0xfff70400 - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
[1] = {
|
|
.start = gic_iid(0x4d),
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct platform_device ehci1_device = {
|
|
.name = "ehci-platform",
|
|
.id = 1,
|
|
.dev = {
|
|
.dma_mask = &ehci1_device.dev.coherent_dma_mask,
|
|
.coherent_dma_mask = 0xffffffff,
|
|
.platform_data = &ehcix_pdata,
|
|
},
|
|
.num_resources = ARRAY_SIZE(ehci1_resources),
|
|
.resource = ehci1_resources,
|
|
};
|
|
|
|
static struct usb_ohci_pdata ohcix_pdata = {
|
|
.power_on = usb_power_on,
|
|
.power_off = usb_power_off,
|
|
.power_suspend = usb_power_off,
|
|
};
|
|
|
|
static struct resource ohci0_resources[] = {
|
|
[0] = {
|
|
.start = 0xffe70400,
|
|
.end = 0xffe70800 - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
[1] = {
|
|
.start = gic_iid(0x4c),
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct platform_device ohci0_device = {
|
|
.name = "ohci-platform",
|
|
.id = 0,
|
|
.dev = {
|
|
.dma_mask = &ohci0_device.dev.coherent_dma_mask,
|
|
.coherent_dma_mask = 0xffffffff,
|
|
.platform_data = &ohcix_pdata,
|
|
},
|
|
.num_resources = ARRAY_SIZE(ohci0_resources),
|
|
.resource = ohci0_resources,
|
|
};
|
|
|
|
static struct resource ohci1_resources[] = {
|
|
[0] = {
|
|
.start = 0xfff70400,
|
|
.end = 0xfff70800 - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
[1] = {
|
|
.start = gic_iid(0x4d),
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct platform_device ohci1_device = {
|
|
.name = "ohci-platform",
|
|
.id = 1,
|
|
.dev = {
|
|
.dma_mask = &ohci1_device.dev.coherent_dma_mask,
|
|
.coherent_dma_mask = 0xffffffff,
|
|
.platform_data = &ohcix_pdata,
|
|
},
|
|
.num_resources = ARRAY_SIZE(ohci1_resources),
|
|
.resource = ohci1_resources,
|
|
};
|
|
|
|
static struct platform_device *marzen_late_devices[] __initdata = {
|
|
&ehci0_device,
|
|
&ehci1_device,
|
|
&ohci0_device,
|
|
&ohci1_device,
|
|
};
|
|
|
|
void __init marzen_init_late(void)
|
|
{
|
|
/* get usb phy */
|
|
phy = usb_get_phy(USB_PHY_TYPE_USB2);
|
|
|
|
shmobile_init_late();
|
|
platform_add_devices(marzen_late_devices,
|
|
ARRAY_SIZE(marzen_late_devices));
|
|
}
|
|
|
|
static const struct pinctrl_map marzen_pinctrl_map[] = {
|
|
/* HSPI0 */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh-hspi.0", "pfc-r8a7779",
|
|
"hspi0", "hspi0"),
|
|
/* SCIF2 (CN18: DEBUG0) */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.2", "pfc-r8a7779",
|
|
"scif2_data_c", "scif2"),
|
|
/* SCIF4 (CN19: DEBUG1) */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-r8a7779",
|
|
"scif4_data", "scif4"),
|
|
/* SDHI0 */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
|
|
"sdhi0_data4", "sdhi0"),
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
|
|
"sdhi0_ctrl", "sdhi0"),
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
|
|
"sdhi0_cd", "sdhi0"),
|
|
PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
|
|
"sdhi0_wp", "sdhi0"),
|
|
/* SMSC */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a7779",
|
|
"intc_irq1_b", "intc"),
|
|
PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a7779",
|
|
"lbsc_ex_cs0", "lbsc"),
|
|
/* USB0 */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform.0", "pfc-r8a7779",
|
|
"usb0", "usb0"),
|
|
/* USB1 */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform.0", "pfc-r8a7779",
|
|
"usb1", "usb1"),
|
|
/* USB2 */
|
|
PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform.1", "pfc-r8a7779",
|
|
"usb2", "usb2"),
|
|
};
|
|
|
|
static void __init marzen_init(void)
|
|
{
|
|
regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
|
|
ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
|
|
regulator_register_fixed(1, dummy_supplies,
|
|
ARRAY_SIZE(dummy_supplies));
|
|
|
|
pinctrl_register_mappings(marzen_pinctrl_map,
|
|
ARRAY_SIZE(marzen_pinctrl_map));
|
|
r8a7779_pinmux_init();
|
|
|
|
r8a7779_add_standard_devices();
|
|
platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
|
|
}
|
|
|
|
MACHINE_START(MARZEN, "marzen")
|
|
.smp = smp_ops(r8a7779_smp_ops),
|
|
.map_io = r8a7779_map_io,
|
|
.init_early = r8a7779_add_early_devices,
|
|
.nr_irqs = NR_IRQS_LEGACY,
|
|
.init_irq = r8a7779_init_irq,
|
|
.init_machine = marzen_init,
|
|
.init_late = marzen_init_late,
|
|
.init_time = r8a7779_earlytimer_init,
|
|
MACHINE_END
|