Skip to content

Commit

Permalink
Merge pull request torvalds#74 in DTE/lnxdsp-linux from feature/LNXDS…
Browse files Browse the repository at this point in the history
…P-416-port-the-linux-kernel-poc-changes-to-yocto-1.0.0-for-sc589-mini-board to develop/yocto-1.0.0-fastboot

* commit 'd4deb95eb186f7a9e8316fcacac6df1d36a33352':
  [LNXDSP-416] Port the kernel POC changes to Yocto for sc589-mini
  • Loading branch information
davidgibsonadi committed Aug 21, 2020
2 parents 99992b7 + d4deb95 commit e66a8a6
Show file tree
Hide file tree
Showing 11 changed files with 158 additions and 66 deletions.
10 changes: 2 additions & 8 deletions arch/arm/boot/dts/sc589-mini.dts
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,8 @@
core-id = <1>;
core-irq = <76>;
firmware-name = "adi_adsp_core1_fw.ldr";
};

core2-rproc@0x3108b000 {
compatible = "adi,remoteproc";
reg = <0x3108b000 0x70>;
core-id = <2>;
core-irq = <77>;
firmware-name = "adi_adsp_core2_fw.ldr";
interrupt-parent = <&gic>;
interrupts = <0 250 1>;
};

sound {
Expand Down
13 changes: 1 addition & 12 deletions arch/arm/boot/dts/sc58x.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
ethernet0 = &emac0;
ethernet1 = &emac1;
spi0 = &spi0;
spi1 = &spi1;
spi2 = &spi2;
can0 = &can0;
can1 = &can1;
Expand Down Expand Up @@ -73,6 +72,7 @@
L2: cache-controller@10000000 {
compatible = "arm,pl310-cache";
reg = <0x10000000 0x1000>;
cache-unified;
cache-level = <2>;
};

Expand Down Expand Up @@ -286,17 +286,6 @@
status = "disabled";
};

spi1: spi@0x31043000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "adi,spi3";
reg = <0x31043000 0xFF>;
interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
num-cs = <128>;
dma-channel = <24>, <25>;
status = "disabled";
};

spi2: spi@0x31044000 {
#address-cells = <1>;
#size-cells = <0>;
Expand Down
97 changes: 56 additions & 41 deletions arch/arm/configs/sc589-mini_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,24 @@ CONFIG_EMBEDDED=y
# CONFIG_VM_EVENT_COUNTERS is not set
CONFIG_SLAB=y
CONFIG_PROFILING=y
CONFIG_OPROFILE=m
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_LBDAF is not set
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_SC58X=y
CONFIG_MACH_SC589_MINI=y
CONFIG_ARM_THUMBEE=y
CONFIG_PCI=y
CONFIG_PCI_MSI=y
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_HZ_250=y
# CONFIG_COMPACTION is not set
CONFIG_CPU_FREQ=y
CONFIG_CPUFREQ_DT=y
# CONFIG_COREDUMP is not set
# CONFIG_SUSPEND is not set
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
CONFIG_IP_PNP_BOOTP=y
CONFIG_IP_PNP_RARP=y
# CONFIG_IPV6 is not set
CONFIG_NETWORK_PHY_TIMESTAMPING=y
CONFIG_NETFILTER=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
Expand All @@ -49,57 +40,81 @@ CONFIG_DEVTMPFS_MOUNT=y
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
# CONFIG_BLK_DEV is not set
CONFIG_NETDEVICES=y
CONFIG_NETCONSOLE=y
# CONFIG_NET_VENDOR_ALACRITECH is not set
# CONFIG_NET_VENDOR_AMAZON is not set
# CONFIG_NET_VENDOR_AQUANTIA is not set
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_VENDOR_AURORA is not set
# CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_CADENCE is not set
# CONFIG_NET_VENDOR_CAVIUM is not set
# CONFIG_NET_VENDOR_CIRRUS is not set
# CONFIG_NET_VENDOR_CORTINA is not set
# CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_FARADAY is not set
# CONFIG_NET_VENDOR_HISILICON is not set
# CONFIG_NET_VENDOR_HUAWEI is not set
# CONFIG_NET_VENDOR_INTEL is not set
# CONFIG_NET_VENDOR_MARVELL is not set
# CONFIG_NET_VENDOR_MICREL is not set
# CONFIG_NET_VENDOR_MICROSEMI is not set
# CONFIG_NET_VENDOR_NATSEMI is not set
# CONFIG_NET_VENDOR_NETRONOME is not set
# CONFIG_NET_VENDOR_NI is not set
# CONFIG_NET_VENDOR_QUALCOMM is not set
# CONFIG_NET_VENDOR_RENESAS is not set
# CONFIG_NET_VENDOR_ROCKER is not set
# CONFIG_NET_VENDOR_SAMSUNG is not set
# CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_SOLARFLARE is not set
# CONFIG_NET_VENDOR_SMSC is not set
# CONFIG_NET_VENDOR_SOCIONEXT is not set
CONFIG_STMMAC_ETH=y
# CONFIG_NET_VENDOR_SYNOPSYS is not set
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set
CONFIG_DP83867_PHY=y
# CONFIG_WLAN is not set
# CONFIG_INPUT is not set
# CONFIG_SERIO is not set
# CONFIG_VT is not set
# CONFIG_UNIX98_PTYS is not set
# CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVMEM is not set
CONFIG_SERIAL_ADI_UART4=y
CONFIG_TTY_PRINTK=y
# CONFIG_HW_RANDOM is not set
CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_MUX=y
CONFIG_I2C_ADI_TWI=y
CONFIG_SPI=y
CONFIG_SPI_ADI_V3=y
# CONFIG_PTP_1588_CLOCK is not set
CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
# CONFIG_HWMON is not set
CONFIG_WATCHDOG=y
CONFIG_ADI_WATCHDOG=y
# CONFIG_VGA_ARB is not set
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_MUSB_HDRC=y
CONFIG_USB_MUSB_ADI=y
CONFIG_USB_INVENTRA_DMA=y
CONFIG_NOP_USB_XCEIV=y
CONFIG_USB_GADGET=y
CONFIG_USB_ETH=m
CONFIG_USB_GADGETFS=m
CONFIG_USB_MASS_STORAGE=m
CONFIG_USB_G_SERIAL=m
CONFIG_USB_G_HID=m
CONFIG_MMC=y
CONFIG_MMC_DW=y
CONFIG_MMC_DW_ADI=y
# CONFIG_USB_SUPPORT is not set
# CONFIG_VIRTIO_MENU is not set
CONFIG_STAGING=y
CONFIG_ICC=y
# CONFIG_CORE_CONTROL is not set
# CONFIG_ICC_PROTOCOL is not set
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_REMOTEPROC=y
CONFIG_ADI_REMOTEPROC=y
# CONFIG_ARM_PMU is not set
CONFIG_EXT4_FS=y
# CONFIG_DNOTIFY is not set
# CONFIG_INOTIFY_USER is not set
CONFIG_VFAT_FS=y
CONFIG_TMPFS=y
CONFIG_CONFIGFS_FS=m
CONFIG_CONFIGFS_FS=y
CONFIG_JFFS2_FS=y
CONFIG_UBIFS_FS=y
CONFIG_JFFS2_SUMMARY=y
CONFIG_JFFS2_COMPRESSION_OPTIONS=y
# CONFIG_JFFS2_ZLIB is not set
# CONFIG_JFFS2_RTIME is not set
CONFIG_JFFS2_CMODE_NONE=y
# CONFIG_NETWORK_FILESYSTEMS is not set
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_CODEPAGE_936=y
CONFIG_NLS_CODEPAGE_950=y
Expand Down
7 changes: 7 additions & 0 deletions arch/arm/mach-sc58x/icc.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,15 @@ void platform_res_manage_free_irq(uint16_t subid)
{
}

void platform_send_ipi_sharc0(void)
{
writel(TRGM_SOFT1, __io_address(REG_TRU0_MTR));
}

void platform_ipi_init(void)
{
writel(TRGM_SOFT0, __io_address(REG_TRU0_SSR86));
writel(TRGM_SOFT1, __io_address(REG_TRU0_SSR90));
writel(TRGM_SOFT3, __io_address(REG_TRU0_SSR87));
writel(TRGM_SOFT4, __io_address(REG_TRU0_SSR91));
writel(TRGM_SOFT5, __io_address(REG_TRU0_SSR95));
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-sc58x/include/mach/icc.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,6 @@ void platform_clear_ipi(unsigned int cpu, int irq);
int platform_res_manage_request_irq(uint16_t subid, unsigned int cpu);
void platform_res_manage_free_irq(uint16_t subid);
void platform_ipi_init(void);
void platform_send_ipi_sharc0(void);

#endif
5 changes: 5 additions & 0 deletions arch/arm/mach-sc58x/include/mach/sc58x.h
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,9 @@
/* =========================
TRU0
========================= */
#define REG_TRU0_SSR86 0x3108A158 /* TRU0 Slave Select Register */
#define REG_TRU0_SSR87 0x3108A15C /* TRU0 Slave Select Register */
#define REG_TRU0_SSR90 0x3108A168 /* TRU0 Slave Select Register */
#define REG_TRU0_SSR91 0x3108A16C /* TRU0 Slave Select Register */
#define REG_TRU0_SSR95 0x3108A17C /* TRU0 Slave Select Register */
#define REG_TRU0_MTR 0x3108A7E0 /* TRU0 Master Trigger Register */
Expand All @@ -153,6 +155,9 @@
/* ===================================
Trigger Master Definitions
=================================== */
#define TRGM_SOFT0 93 /* Software-driven Trigger 0 */
#define TRGM_SOFT1 94 /* Software-driven Trigger 1 */
#define TRGM_SOFT2 95 /* Software-driven Trigger 2 */
#define TRGM_SOFT3 96 /* Software-driven Trigger 3 */
#define TRGM_SOFT4 97 /* Software-driven Trigger 4 */
#define TRGM_SOFT5 98 /* Software-driven Trigger 5 */
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/phy/phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ EXPORT_SYMBOL_GPL(phy_speed_up);
*/
void phy_start_machine(struct phy_device *phydev)
{
queue_delayed_work(system_power_efficient_wq, &phydev->state_queue, HZ);
queue_delayed_work(system_power_efficient_wq, &phydev->state_queue, 0 * HZ);
}
EXPORT_SYMBOL_GPL(phy_start_machine);

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/phy/phy_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, int phy_id,
dev->link = 0;
dev->interface = PHY_INTERFACE_MODE_GMII;

dev->autoneg = AUTONEG_ENABLE;
dev->autoneg = AUTONEG_DISABLE;

dev->is_c45 = is_c45;
dev->phy_id = phy_id;
Expand Down
Loading

0 comments on commit e66a8a6

Please sign in to comment.