Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96d928ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xtensa-20150416' of git://github.com/czankel/xtensa-linux 

Pull Xtensa updates from Chris Zankel:

 - fix linker script transformation for .text / .text.fixup

 - wire bpf and execveat syscalls

 - provide __NR_sync_file_range2 instead of __NR_sync_file_range, as
   that's what xtensa uses.

 - make xtfpgs LCD driver functional and configurable.  This fixes
   hardware lockup on KC705/ML605 boot

 - add audio subsystem bits to xtfpga DTS and provide sample KC705
   config with audio features enabled

 - add CY7C67300 USB controller support to XTFPGA

 - fix locking issues in ISS network driver

 - document PIC and MX interrupt distributor device tree bindings

* tag 'xtensa-20150416' of git://github.com/czankel/xtensa-linux:
  xtensa: xtfpga: add CY7C67300 USB controller support
  irqchip: xtensa-pic: xtensa-mx: document DT bindings
  xtensa: ISS: fix locking in TAP network adapter
  xtensa: Fix fix linker script transformation for .text / .text.fixup
  xtensa: provide __NR_sync_file_range2 instead of __NR_sync_file_range
  xtensa: wire bpf and execveat syscalls
  xtensa: xtfpga: fix hardware lockup caused by LCD driver
  xtensa: xtfpga: provide defconfig with audio subsystem
  xtensa: xtfpga: add audio card to xtfpga DTS
parents e076b7c1 2ba9268d

Documentation/devicetree/bindings/interrupt-controller/cdns,xtensa-mx.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
* Xtensa Interrupt Distributor and Programmable Interrupt Controller (MX)



Required properties:

- compatible: Should be "cdns,xtensa-mx".



Remaining properties have exact same meaning as in Xtensa PIC

(see cdns,xtensa-pic.txt).



Examples:

	pic: pic {

		compatible = "cdns,xtensa-mx";

		/* one cell: internal irq number,

		 * two cells: second cell == 0: internal irq number

		 *            second cell == 1: external irq number

		 */

		#interrupt-cells = <2>;

		interrupt-controller;

	};

Documentation/devicetree/bindings/interrupt-controller/cdns,xtensa-pic.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
* Xtensa built-in Programmable Interrupt Controller (PIC)



Required properties:

- compatible: Should be "cdns,xtensa-pic".

- interrupt-controller: Identifies the node as an interrupt controller.

- #interrupt-cells: The number of cells to define the interrupts.

  It may be either 1 or 2.

  When it's 1, the first cell is the internal IRQ number.

  When it's 2, the first cell is the IRQ number, and the second cell

  specifies whether it's internal (0) or external (1).

  Periferals are usually connected to a fixed external IRQ, but for different

  core variants it may be mapped to different internal IRQ.

  IRQ sensitivity and priority are fixed for each core variant and may not be

  changed at runtime.



Examples:

	pic: pic {

		compatible = "cdns,xtensa-pic";

		/* one cell: internal irq number,

		 * two cells: second cell == 0: internal irq number

		 *            second cell == 1: external irq number

		 */

		#interrupt-cells = <2>;

		interrupt-controller;

	};

arch/xtensa/Kconfig

+30 −0
Original line number Diff line number Diff line
@@ -428,6 +428,36 @@ config DEFAULT_MEM_SIZE 


	  If unsure, leave the default value here.



config XTFPGA_LCD

	bool "Enable XTFPGA LCD driver"

	depends on XTENSA_PLATFORM_XTFPGA

	default n

	help

	  There's a 2x16 LCD on most of XTFPGA boards, kernel may output

	  progress messages there during bootup/shutdown. It may be useful

	  during board bringup.



	  If unsure, say N.



config XTFPGA_LCD_BASE_ADDR

	hex "XTFPGA LCD base address"

	depends on XTFPGA_LCD

	default "0x0d0c0000"

	help

	  Base address of the LCD controller inside KIO region.

	  Different boards from XTFPGA family have LCD controller at different

	  addresses. Please consult prototyping user guide for your board for

	  the correct address. Wrong address here may lead to hardware lockup.



config XTFPGA_LCD_8BIT_ACCESS

	bool "Use 8-bit access to XTFPGA LCD"

	depends on XTFPGA_LCD

	default n

	help

	  LCD may be connected with 4- or 8-bit interface, 8-bit access may

	  only be used with 8-bit interface. Please consult prototyping user

	  guide for your board for the correct interface width.



endmenu



menu "Executable file formats"

arch/xtensa/boot/dts/xtfpga.dtsi

+64 −0
Original line number Diff line number Diff line
@@ -40,6 +40,12 @@ 
			#clock-cells = <0>;

			compatible = "fixed-clock";

		};



		clk54: clk54 {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <54000000>;

		};

	};



	soc {
@@ -65,5 +71,63 @@ 
			local-mac-address = [00 50 c2 13 6f 00];

			clocks = <&osc>;

		};



		i2s0: xtfpga-i2s@0d080000 {

			#sound-dai-cells = <0>;

			compatible = "cdns,xtfpga-i2s";

			reg = <0x0d080000 0x40>;

			interrupts = <2 1>; /* external irq 2 */

			clocks = <&cdce706 4>;

		};



		i2c0: i2c-master@0d090000 {

			compatible = "opencores,i2c-ocores";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x0d090000 0x20>;

			reg-shift = <2>;

			reg-io-width = <1>;

			interrupts = <4 1>;

			clocks = <&osc>;



			cdce706: clock-synth@69 {

				compatible = "ti,cdce706";

				#clock-cells = <1>;

				reg = <0x69>;

				clocks = <&clk54>;

				clock-names = "clk_in0";

			};

		};



		spi0: spi-master@0d0a0000 {

			compatible = "cdns,xtfpga-spi";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x0d0a0000 0xc>;



			tlv320aic23: sound-codec@0 {

				#sound-dai-cells = <0>;

				compatible = "tlv320aic23";

				reg = <0>;

				spi-max-frequency = <12500000>;

			};

		};

	};



	sound {

		compatible = "simple-audio-card";

		simple-audio-card,format = "i2s";

		simple-audio-card,mclk-fs = <256>;



		simple-audio-card,cpu {

			sound-dai = <&i2s0>;

		};



		simple-audio-card,codec {

			sound-dai = <&tlv320aic23>;

			simple-audio-card,bitclock-master = <0>;

			simple-audio-card,frame-master = <0>;

			clocks = <&cdce706 4>;

		};

	};

};

arch/xtensa/configs/audio_kc705_defconfig

0 → 100644
+142 −0
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IRQ_TIME_ACCOUNTING=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_CGROUP_DEBUG=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_MEMCG=y

CONFIG_NAMESPACES=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_RELAY=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_KALLSYMS_ALL=y

CONFIG_PROFILING=y

CONFIG_OPROFILE=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_XTENSA_VARIANT_CUSTOM=y

CONFIG_XTENSA_VARIANT_CUSTOM_NAME="test_kc705_hifi"

CONFIG_XTENSA_UNALIGNED_USER=y

CONFIG_PREEMPT=y

CONFIG_HIGHMEM=y

# CONFIG_PCI is not set

CONFIG_XTENSA_PLATFORM_XTFPGA=y

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="earlycon=uart8250,mmio32,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug"

CONFIG_USE_OF=y

CONFIG_BUILTIN_DTB="kc705"

# CONFIG_COMPACTION is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=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_NETFILTER=y

# CONFIG_WIRELESS is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

CONFIG_MTD=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_CFI_STAA=y

CONFIG_MTD_PHYSMAP_OF=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_BROADCOM 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_NATSEMI is not set

# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

CONFIG_MARVELL_PHY=y

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_SERIAL_8250=y

# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_HW_RANDOM=y

CONFIG_I2C=y

CONFIG_I2C_OCORES=y

CONFIG_SPI=y

CONFIG_SPI_XTENSA_XTFPGA=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_SOFT_WATCHDOG=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_SOC=y

CONFIG_SND_SOC_XTFPGA_I2S=y

CONFIG_SND_SOC_TLV320AIC23_SPI=y

CONFIG_SND_SIMPLE_CARD=y

# CONFIG_USB_SUPPORT is not set

CONFIG_COMMON_CLK_CDCE706=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS=y

CONFIG_FANOTIFY=y

CONFIG_VFAT_FS=y

CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_UBIFS_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V4=y

CONFIG_NFS_SWAP=y

CONFIG_ROOT_NFS=y

CONFIG_SUNRPC_DEBUG=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_LOCKUP_DETECTOR=y

# CONFIG_SCHED_DEBUG is not set

CONFIG_SCHEDSTATS=y

CONFIG_TIMER_STATS=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_ATOMIC_SLEEP=y

CONFIG_STACKTRACE=y

CONFIG_RCU_TRACE=y

# CONFIG_FTRACE is not set

# CONFIG_S32C1I_SELFTEST is not set

CONFIG_CRYPTO_ANSI_CPRNG=y