 903a9f77d1
			
		
	
	
	903a9f77d1
	
	
	
		
			
			This branch is reducing in size for every release since most board-related
 changes have started happening in devicetrees now. Still, we have some things
 going on here.
 
 * Renesas platforms are still adding a bit more legacy device support, something
   that should trail off shortly as they move to full DT.
 * We group most defconfig updates into this branch out of old habits
 * Removal of legacy OMAP2 platforms over to DT continues, and a handful of old
   code is being removed here.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJS4VhpAAoJEIwa5zzehBx3dgMP/2qc+pY4Sx13x5gWMyj29kQd
 LF6JeGLbj3+F+brPh8nXg6feOcsqVN9lpQ7v4+u1tLv6XfYe5kzBTDwF9MFbZi4I
 lV9o4cehcZWjCEx+JIbg1MvuNUCU2k1H7HmDIiOQIuoL9j58f2ZywlH/HmLuo2iZ
 j5Aly006x0s1lUIDhw2w9PJZzzSRBfPr8hW8q+JdLZinlA5Nd4jSxDX0QoSZE+2t
 2GJMb//Ej1KbLO7fcM6BImNtB0kz4xRkPvINJwh1xGHYKY0BzMCYS3K2zBgoeyut
 /olOK2xpnSjzcp1ToVQSAa7Mr1zbiyxQTKkqRHMnKyD/BTMzgoSVHxCA7yGYsCjz
 mc6AW4v1ucfvXrz0qPXd9fHCIYMyvn6PPv3DmRFU/tR3zJaakI2RvYZFaeyK3RIn
 0NGwMQBe3gGIHFAK5Q9hrPyZtbtGicKHjd6eNrNIVeSyTi1njbviTFRHA5yMqWBL
 eHRM5KxCnp7+6ES61J0YCSF121/V3GT1rJyJnABl3B2UYj/qKXUBAJ2aPqCspWOG
 pcbI7fdeyV67YJvgrV5s8eO7HtPJs9KtOw7Fng4P4Kgjy2XLNfVhQRkaAwe4P914
 HCtZfKCVe4xOWLFHDWApaRpfeOFXZgd0hLOG5jiAEhBRZbRALS044Ta9mAFKqQxx
 v0mqo85bCHixiFWz1UVc
 =wLdE
 -----END PGP SIGNATURE-----
Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC board updates from Olof Johansson:
 "This branch is reducing in size for every release since most
  board-related changes have started happening in devicetrees now.
  Still, we have some things going on here.
   * Renesas platforms are still adding a bit more legacy device
     support, something that should trail off shortly as they move to
     full DT
   * We group most defconfig updates into this branch out of old habits
   * Removal of legacy OMAP2 platforms over to DT continues, and a
     handful of old code is being removed here"
* tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
  ARM: dts: OMAP2: fix interrupt number for rng
  ARM: dts: Split omap3 pinmux core device
  ARM: dts: Add omap specific pinctrl defines to use padconf addresses
  ARM: bcm2835: bcm2835_defconfig updates
  ARM: msm_defconfig: Enable restart driver
  defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
  ARM: msm: Add support for APQ8074 Dragonboard
  ARM: exynos_defconfig: Enable S2MPS11 voltage regulator
  ARM: tegra: Enable DRM panel support
  ARM: shmobile: mackerel: Fix USBHS pinconf entry
  ARM: shmobile: Let Koelsch multiplatform boot with Koelsch DTB
  ARM: shmobile: Let Lager multiplatform boot with Lager DTB
  ARM: shmobile: Remove non-multiplatform Koelsch reference support
  ARM: shmobile: Remove non-multiplatform Lager reference support
  ARM: shmobile: koelsch-reference: Instantiate clkdevs for SCIF and CMT
  ARM: shmobile: lager-reference: Instantiate clkdevs for SCIF and CMT
  ARM: shmobile: koelsch-reference: Remove duplicate CCF initialization
  ARM: shmobile: lager-reference: Enable multiplaform kernel support
  ARM: shmobile: armadillo: Set backlight enable GPIO
  ARM: shmobile: Koelsch: add Ether support
  ...
Conflicts:
	arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
		
	
			
		
			
				
	
	
		
			84 lines
		
	
	
	
		
			1.7 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			84 lines
		
	
	
	
		
			1.7 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Renesas R-Car SRU/SCU/SSIU/SSI support
 | |
|  *
 | |
|  * Copyright (C) 2013 Renesas Solutions Corp.
 | |
|  * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
 | |
|  *
 | |
|  * This program is free software; you can redistribute it and/or modify
 | |
|  * it under the terms of the GNU General Public License version 2 as
 | |
|  * published by the Free Software Foundation.
 | |
|  */
 | |
| 
 | |
| #ifndef RCAR_SND_H
 | |
| #define RCAR_SND_H
 | |
| 
 | |
| #include <linux/sh_clk.h>
 | |
| 
 | |
| #define RSND_GEN1_SRU	0
 | |
| #define RSND_GEN1_ADG	1
 | |
| #define RSND_GEN1_SSI	2
 | |
| 
 | |
| #define RSND_GEN2_SCU	0
 | |
| #define RSND_GEN2_ADG	1
 | |
| #define RSND_GEN2_SSIU	2
 | |
| #define RSND_GEN2_SSI	3
 | |
| 
 | |
| #define RSND_BASE_MAX	4
 | |
| 
 | |
| /*
 | |
|  * flags
 | |
|  *
 | |
|  * 0xAB000000
 | |
|  *
 | |
|  * A : clock sharing settings
 | |
|  * B : SSI direction
 | |
|  */
 | |
| #define RSND_SSI_CLK_PIN_SHARE		(1 << 31)
 | |
| #define RSND_SSI_SYNC			(1 << 29) /* SSI34_sync etc */
 | |
| 
 | |
| #define RSND_SSI_PLAY			(1 << 24)
 | |
| 
 | |
| #define RSND_SSI_SET(_dai_id, _dma_id, _pio_irq, _flags)	\
 | |
| { .dai_id = _dai_id, .dma_id = _dma_id, .pio_irq = _pio_irq, .flags = _flags }
 | |
| #define RSND_SSI_UNUSED \
 | |
| { .dai_id = -1, .dma_id = -1, .pio_irq = -1, .flags = 0 }
 | |
| 
 | |
| struct rsnd_ssi_platform_info {
 | |
| 	int dai_id;
 | |
| 	int dma_id;
 | |
| 	int pio_irq;
 | |
| 	u32 flags;
 | |
| };
 | |
| 
 | |
| /*
 | |
|  * flags
 | |
|  */
 | |
| #define RSND_SCU_USE_HPBIF		(1 << 31) /* it needs RSND_SSI_DEPENDENT */
 | |
| 
 | |
| struct rsnd_scu_platform_info {
 | |
| 	u32 flags;
 | |
| 	u32 convert_rate; /* sampling rate convert */
 | |
| };
 | |
| 
 | |
| /*
 | |
|  * flags
 | |
|  *
 | |
|  * 0x0000000A
 | |
|  *
 | |
|  * A : generation
 | |
|  */
 | |
| #define RSND_GEN_MASK	(0xF << 0)
 | |
| #define RSND_GEN1	(1 << 0) /* fixme */
 | |
| #define RSND_GEN2	(2 << 0) /* fixme */
 | |
| 
 | |
| struct rcar_snd_info {
 | |
| 	u32 flags;
 | |
| 	struct rsnd_ssi_platform_info *ssi_info;
 | |
| 	int ssi_info_nr;
 | |
| 	struct rsnd_scu_platform_info *scu_info;
 | |
| 	int scu_info_nr;
 | |
| 	int (*start)(int id);
 | |
| 	int (*stop)(int id);
 | |
| };
 | |
| 
 | |
| #endif
 |