Merge tag 'xtensa-for-next-20150207' of git://github.com/jcmvbkbc/linux-xtensa into for_next

Xtensa improvements for 3.20: - add audio subsystem bits to xtfpga DTS and provide sample KC705 config with audio features enabled.
author: Chris Zankel <chris@zankel.net> 2015-03-12 20:39:30 -0400
committer: Chris Zankel <chris@zankel.net> 2015-03-12 20:39:30 -0400
commit: 40aad098c2a06b9cccd8ac1ef8407fd1677fe913 (patch)
tree: 141578a35e840c7d7d0125a0cda029cb3dcf5e90
parent: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 (diff)
parent: 04ddc5b5ad4eca2b96160663431f041bec2efc2e (diff)
2 files changed, 206 insertions, 0 deletions
diff --git a/arch/xtensa/boot/dts/xtfpga.dtsi b/arch/xtensa/boot/dts/xtfpga.dtsi
index dec9178840f6..cd0b9e34adc8 100644
--- a/arch/xtensa/boot/dts/xtfpga.dtsi
+++ b/arch/xtensa/boot/dts/xtfpga.dtsi
@@ -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>;
+                };
        };
 };
diff --git a/arch/xtensa/configs/audio_kc705_defconfig b/arch/xtensa/configs/audio_kc705_defconfig
new file mode 100644
index 000000000000..c4904db15582
--- /dev/null
+++ b/arch/xtensa/configs/audio_kc705_defconfig
@@ -0,0 +1,142 @@
+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
author	Chris Zankel <chris@zankel.net>	2015-03-12 20:39:30 -0400
committer	Chris Zankel <chris@zankel.net>	2015-03-12 20:39:30 -0400
commit	40aad098c2a06b9cccd8ac1ef8407fd1677fe913 (patch)
tree	141578a35e840c7d7d0125a0cda029cb3dcf5e90
parent	bfa76d49576599a4b9f9b7a71f23d73d6dcff735 (diff)
parent	04ddc5b5ad4eca2b96160663431f041bec2efc2e (diff)

diff --git a/arch/xtensa/boot/dts/xtfpga.dtsi b/arch/xtensa/boot/dts/xtfpga.dtsi index dec9178840f6..cd0b9e34adc8 100644 --- a/arch/xtensa/boot/dts/xtfpga.dtsi +++ b/arch/xtensa/boot/dts/xtfpga.dtsi
@@ -40,6 +40,12 @@
40	#clock-cells = <0>;	40	#clock-cells = <0>;
41	compatible = "fixed-clock";	41	compatible = "fixed-clock";
42	};	42	};
		43
		44	clk54: clk54 {
		45	#clock-cells = <0>;
		46	compatible = "fixed-clock";
		47	clock-frequency = <54000000>;
		48	};
43	};	49	};
44		50
45	soc {	51	soc {
@@ -65,5 +71,63 @@
65	local-mac-address = [00 50 c2 13 6f 00];	71	local-mac-address = [00 50 c2 13 6f 00];
66	clocks = <&osc>;	72	clocks = <&osc>;
67	};	73	};
		74
		75	i2s0: xtfpga-i2s@0d080000 {
		76	#sound-dai-cells = <0>;
		77	compatible = "cdns,xtfpga-i2s";
		78	reg = <0x0d080000 0x40>;
		79	interrupts = <2 1>; /* external irq 2 */
		80	clocks = <&cdce706 4>;
		81	};
		82
		83	i2c0: i2c-master@0d090000 {
		84	compatible = "opencores,i2c-ocores";
		85	#address-cells = <1>;
		86	#size-cells = <0>;
		87	reg = <0x0d090000 0x20>;
		88	reg-shift = <2>;
		89	reg-io-width = <1>;
		90	interrupts = <4 1>;
		91	clocks = <&osc>;
		92
		93	cdce706: clock-synth@69 {
		94	compatible = "ti,cdce706";
		95	#clock-cells = <1>;
		96	reg = <0x69>;
		97	clocks = <&clk54>;
		98	clock-names = "clk_in0";
		99	};
		100	};
		101
		102	spi0: spi-master@0d0a0000 {
		103	compatible = "cdns,xtfpga-spi";
		104	#address-cells = <1>;
		105	#size-cells = <0>;
		106	reg = <0x0d0a0000 0xc>;
		107
		108	tlv320aic23: sound-codec@0 {
		109	#sound-dai-cells = <0>;
		110	compatible = "tlv320aic23";
		111	reg = <0>;
		112	spi-max-frequency = <12500000>;
		113	};
		114	};
		115	};
		116
		117	sound {
		118	compatible = "simple-audio-card";
		119	simple-audio-card,format = "i2s";
		120	simple-audio-card,mclk-fs = <256>;
		121
		122	simple-audio-card,cpu {
		123	sound-dai = <&i2s0>;
		124	};
		125
		126	simple-audio-card,codec {
		127	sound-dai = <&tlv320aic23>;
		128	simple-audio-card,bitclock-master = <0>;
		129	simple-audio-card,frame-master = <0>;
		130	clocks = <&cdce706 4>;
		131	};
68	};	132	};
69	};	133	};


diff --git a/arch/xtensa/configs/audio_kc705_defconfig b/arch/xtensa/configs/audio_kc705_defconfig new file mode 100644 index 000000000000..c4904db15582 --- /dev/null +++ b/arch/xtensa/configs/audio_kc705_defconfig
@@ -0,0 +1,142 @@
		1	CONFIG_SYSVIPC=y
		2	CONFIG_POSIX_MQUEUE=y
		3	CONFIG_FHANDLE=y
		4	CONFIG_IRQ_DOMAIN_DEBUG=y
		5	CONFIG_NO_HZ_IDLE=y
		6	CONFIG_HIGH_RES_TIMERS=y
		7	CONFIG_IRQ_TIME_ACCOUNTING=y
		8	CONFIG_BSD_PROCESS_ACCT=y
		9	CONFIG_CGROUP_DEBUG=y
		10	CONFIG_CGROUP_FREEZER=y
		11	CONFIG_CGROUP_DEVICE=y
		12	CONFIG_CPUSETS=y
		13	CONFIG_CGROUP_CPUACCT=y
		14	CONFIG_MEMCG=y
		15	CONFIG_NAMESPACES=y
		16	CONFIG_SCHED_AUTOGROUP=y
		17	CONFIG_RELAY=y
		18	CONFIG_BLK_DEV_INITRD=y
		19	CONFIG_EXPERT=y
		20	CONFIG_SYSCTL_SYSCALL=y
		21	CONFIG_KALLSYMS_ALL=y
		22	CONFIG_PROFILING=y
		23	CONFIG_OPROFILE=y
		24	CONFIG_MODULES=y
		25	CONFIG_MODULE_UNLOAD=y
		26	# CONFIG_IOSCHED_DEADLINE is not set
		27	# CONFIG_IOSCHED_CFQ is not set
		28	CONFIG_XTENSA_VARIANT_CUSTOM=y
		29	CONFIG_XTENSA_VARIANT_CUSTOM_NAME="test_kc705_hifi"
		30	CONFIG_XTENSA_UNALIGNED_USER=y
		31	CONFIG_PREEMPT=y
		32	CONFIG_HIGHMEM=y
		33	# CONFIG_PCI is not set
		34	CONFIG_XTENSA_PLATFORM_XTFPGA=y
		35	CONFIG_CMDLINE_BOOL=y
		36	CONFIG_CMDLINE="earlycon=uart8250,mmio32,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug"
		37	CONFIG_USE_OF=y
		38	CONFIG_BUILTIN_DTB="kc705"
		39	# CONFIG_COMPACTION is not set
		40	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
		41	CONFIG_PM=y
		42	CONFIG_NET=y
		43	CONFIG_PACKET=y
		44	CONFIG_UNIX=y
		45	CONFIG_INET=y
		46	CONFIG_IP_MULTICAST=y
		47	CONFIG_IP_PNP=y
		48	CONFIG_IP_PNP_DHCP=y
		49	CONFIG_IP_PNP_BOOTP=y
		50	CONFIG_IP_PNP_RARP=y
		51	# CONFIG_IPV6 is not set
		52	CONFIG_NETFILTER=y
		53	# CONFIG_WIRELESS is not set
		54	CONFIG_DEVTMPFS=y
		55	CONFIG_DEVTMPFS_MOUNT=y
		56	# CONFIG_STANDALONE is not set
		57	CONFIG_MTD=y
		58	CONFIG_MTD_CFI=y
		59	CONFIG_MTD_JEDECPROBE=y
		60	CONFIG_MTD_CFI_INTELEXT=y
		61	CONFIG_MTD_CFI_AMDSTD=y
		62	CONFIG_MTD_CFI_STAA=y
		63	CONFIG_MTD_PHYSMAP_OF=y
		64	CONFIG_MTD_UBI=y
		65	CONFIG_BLK_DEV_LOOP=y
		66	CONFIG_BLK_DEV_RAM=y
		67	CONFIG_SCSI=y
		68	CONFIG_BLK_DEV_SD=y
		69	CONFIG_NETDEVICES=y
		70	# CONFIG_NET_VENDOR_ARC is not set
		71	# CONFIG_NET_VENDOR_BROADCOM is not set
		72	# CONFIG_NET_VENDOR_INTEL is not set
		73	# CONFIG_NET_VENDOR_MARVELL is not set
		74	# CONFIG_NET_VENDOR_MICREL is not set
		75	# CONFIG_NET_VENDOR_NATSEMI is not set
		76	# CONFIG_NET_VENDOR_SAMSUNG is not set
		77	# CONFIG_NET_VENDOR_SEEQ is not set
		78	# CONFIG_NET_VENDOR_SMSC is not set
		79	# CONFIG_NET_VENDOR_STMICRO is not set
		80	# CONFIG_NET_VENDOR_VIA is not set
		81	# CONFIG_NET_VENDOR_WIZNET is not set
		82	CONFIG_MARVELL_PHY=y
		83	# CONFIG_WLAN is not set
		84	# CONFIG_INPUT_MOUSEDEV is not set
		85	# CONFIG_INPUT_KEYBOARD is not set
		86	# CONFIG_INPUT_MOUSE is not set
		87	# CONFIG_SERIO is not set
		88	CONFIG_SERIAL_8250=y
		89	# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
		90	CONFIG_SERIAL_8250_CONSOLE=y
		91	CONFIG_SERIAL_OF_PLATFORM=y
		92	CONFIG_HW_RANDOM=y
		93	CONFIG_I2C=y
		94	CONFIG_I2C_OCORES=y
		95	CONFIG_SPI=y
		96	CONFIG_SPI_XTENSA_XTFPGA=y
		97	# CONFIG_HWMON is not set
		98	CONFIG_WATCHDOG=y
		99	CONFIG_WATCHDOG_NOWAYOUT=y
		100	CONFIG_SOFT_WATCHDOG=y
		101	# CONFIG_VGA_CONSOLE is not set
		102	CONFIG_SOUND=y
		103	CONFIG_SND=y
		104	CONFIG_SND_SOC=y
		105	CONFIG_SND_SOC_XTFPGA_I2S=y
		106	CONFIG_SND_SOC_TLV320AIC23_SPI=y
		107	CONFIG_SND_SIMPLE_CARD=y
		108	# CONFIG_USB_SUPPORT is not set
		109	CONFIG_COMMON_CLK_CDCE706=y
		110	# CONFIG_IOMMU_SUPPORT is not set
		111	CONFIG_EXT3_FS=y
		112	CONFIG_EXT4_FS=y
		113	CONFIG_FANOTIFY=y
		114	CONFIG_VFAT_FS=y
		115	CONFIG_PROC_KCORE=y
		116	CONFIG_TMPFS=y
		117	CONFIG_TMPFS_POSIX_ACL=y
		118	CONFIG_UBIFS_FS=y
		119	CONFIG_NFS_FS=y
		120	CONFIG_NFS_V4=y
		121	CONFIG_NFS_SWAP=y
		122	CONFIG_ROOT_NFS=y
		123	CONFIG_SUNRPC_DEBUG=y
		124	CONFIG_NLS_CODEPAGE_437=y
		125	CONFIG_NLS_ISO8859_1=y
		126	CONFIG_PRINTK_TIME=y
		127	CONFIG_DYNAMIC_DEBUG=y
		128	CONFIG_DEBUG_INFO=y
		129	CONFIG_MAGIC_SYSRQ=y
		130	CONFIG_LOCKUP_DETECTOR=y
		131	# CONFIG_SCHED_DEBUG is not set
		132	CONFIG_SCHEDSTATS=y
		133	CONFIG_TIMER_STATS=y
		134	CONFIG_DEBUG_RT_MUTEXES=y
		135	CONFIG_DEBUG_SPINLOCK=y
		136	CONFIG_DEBUG_MUTEXES=y
		137	CONFIG_DEBUG_ATOMIC_SLEEP=y
		138	CONFIG_STACKTRACE=y
		139	CONFIG_RCU_TRACE=y
		140	# CONFIG_FTRACE is not set
		141	# CONFIG_S32C1I_SELFTEST is not set
		142	CONFIG_CRYPTO_ANSI_CPRNG=y