Commit 603eefda authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://github.com/openrisc/linux 

Pull OpenRISC updates from Stafford Horne:
 "A few cleanups and compiler warning fixes for OpenRISC.

  Also, this includes dts and defconfig updates to enable Ethernet on
  OpenRISC/Litex FPGA SoC's now that the LiteEth driver has gone
  upstream"

* tag 'for-linus' of git://github.com/openrisc/linux:
  openrisc/litex: Update defconfig
  openrisc/litex: Add ethernet device
  openrisc/litex: Update uart address
  openrisc: Fix compiler warnings in setup
  openrisc: rename or32 code & comments to or1k
  openrisc: don't printk() unconditionally
parents 50ddcdb2 1955d843

arch/openrisc/boot/dts/or1klitex.dts

+11 −2
Original line number Diff line number Diff line
@@ -41,10 +41,10 @@ 
		interrupt-controller;

	};



	serial0: serial@e0002000 {

	serial0: serial@e0006800 {

		device_type = "serial";

		compatible = "litex,liteuart";

		reg = <0xe0002000 0x100>;

		reg = <0xe0006800 0x100>;

	};



	soc_ctrl0: soc_controller@e0000000 {
@@ -52,4 +52,13 @@ 
			reg = <0xe0000000 0xc>;

			status = "okay";

	};



	ethernet@e0001000 {

		compatible = "litex,liteeth";

		reg = <0xe0001000 0x7c>,

		      <0xe0001800 0x0a>,

		      <0x80000000 0x2000>;

		reg-names = "mac", "mdio", "buffer";

		interrupts = <2>;

	};

};

arch/openrisc/configs/or1klitex_defconfig

+16 −10
Original line number Diff line number Diff line 
CONFIG_BLK_DEV_INITRD=y

CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_EMBEDDED=y

CONFIG_OPENRISC_BUILTIN_DTB="or1klitex"

CONFIG_HZ_100=y

CONFIG_INITRAMFS_SOURCE="openrisc-rootfs.cpio.gz"

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_OF_OVERLAY=y

CONFIG_OPENRISC_BUILTIN_DTB="or1klitex"

CONFIG_PANIC_ON_OOPS=y

CONFIG_PRINTK_TIME=y

CONFIG_LITEX_SOC_CONTROLLER=y

CONFIG_NETDEVICES=y

CONFIG_LITEX_LITEETH=y

CONFIG_SERIAL_LITEUART=y

CONFIG_SERIAL_LITEUART_CONSOLE=y

CONFIG_SOFTLOCKUP_DETECTOR=y

CONFIG_TTY_PRINTK=y

CONFIG_LITEX_SOC_CONTROLLER=y

CONFIG_TMPFS=y

CONFIG_PRINTK_TIME=y

CONFIG_PANIC_ON_OOPS=y

CONFIG_SOFTLOCKUP_DETECTOR=y

CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y

CONFIG_BUG_ON_DATA_CORRUPTION=y

arch/openrisc/include/asm/pgtable.h

+3 −3
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
 * et al.

 */



/* or32 pgtable.h - macros and functions to manipulate page tables

/* or1k pgtable.h - macros and functions to manipulate page tables

 *

 * Based on:

 * include/asm-cris/pgtable.h
@@ -29,14 +29,14 @@ 


/*

 * The Linux memory management assumes a three-level page table setup. On

 * or32, we use that, but "fold" the mid level into the top-level page

 * or1k, we use that, but "fold" the mid level into the top-level page

 * table. Since the MMU TLB is software loaded through an interrupt, it

 * supports any page table structure, so we could have used a three-level

 * setup, but for the amounts of memory we normally use, a two-level is

 * probably more efficient.

 *

 * This file contains the functions and defines necessary to modify and use

 * the or32 page table tree.

 * the or1k page table tree.

 */



extern void paging_init(void);

arch/openrisc/include/asm/setup.h

0 → 100644
+15 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (C) 2021 Stafford Horne

 */

#ifndef _ASM_OR1K_SETUP_H

#define _ASM_OR1K_SETUP_H



#include <linux/init.h>

#include <asm-generic/setup.h>



#ifndef __ASSEMBLY__

void __init or1k_early_setup(void *fdt);

#endif



#endif /* _ASM_OR1K_SETUP_H */

arch/openrisc/include/asm/thread_info.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


/* THREAD_SIZE is the size of the task_struct/kernel_stack combo.

 * normally, the stack is found by doing something like p + THREAD_SIZE

 * in or32, a page is 8192 bytes, which seems like a sane size

 * in or1k, a page is 8192 bytes, which seems like a sane size

 */



#define THREAD_SIZE_ORDER 0