diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 14:56:14 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 14:56:14 +0100 |
| commit | ea4409cc44e8f0f36182fcc22eb48b15ed61dd16 (patch) | |
| tree | 1edc32a56fe62d017672495fdb326f180bc16064 /arch/arm/boot/dts/omap3-sb-t35.dtsi | |
| parent | bcc8cef7c43c46ca0467be725d677e2a8da806c0 (diff) | |
| parent | f80ecaf55b4982a888272790743dabf2c715dc10 (diff) | |
| download | blackbird-op-linux-ea4409cc44e8f0f36182fcc22eb48b15ed61dd16.tar.gz blackbird-op-linux-ea4409cc44e8f0f36182fcc22eb48b15ed61dd16.zip | |
Merge tag 'omap-for-v3.19/dt-part2-updated' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Pull "More dts changes for omaps to add support for new devices" from Tony Lindgren:
- Add DCAN support am335x, am437x and dra7
- Add devices for sb-t3x computers
- Add support for NovaTech OrionLXm
- Add n900 battery and si4713 support
* tag 'omap-for-v3.19/dt-part2-updated' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (26 commits)
ARM: dts: am335x-evm: Add DCAN1 details
ARM: dts: am33xx: Update DCAN nodes
ARM: dts: am33xx: Add control module syscon node
ARM: dts: am437x-gp: Add dcan support
ARM: dts: am4372: Add DCAN nodes
ARM: dts: am4372: Add control module syscon node
ARM: dts: dra72-evm: Add CAN support
ARM: dts: dra7-evm: Add CAN support
ARM: dts: DRA7: Add DCAN nodes
ARM: dts: dra7: Add syscon regmap for CORE CONTROL area
ARM: dts: sbc-t3x30: add audio support
ARM: dts: sbc-t3x: add TV out display alias
ARM: dts: cm-t3x: add TV out support
ARM: dts: cm-t3x: add I2C1 pinmux
ARM: dts: AM43xx: add tscadc DT entries for am437x-evm and am43x-epos-evm
ARM: dts: cm-t3x30: add keypad support
ARM: dts: sb-t35: add EEPROM support
ARM: dts: cm-t3x: add EEPROM support
ARM: OMAP2+: remove cm-t3x touchscreen pdata quirk
ARM: dts: cm-t3x: add ADS7846 touchscreen support
...
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/omap3-sb-t35.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/omap3-sb-t35.dtsi | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap3-sb-t35.dtsi b/arch/arm/boot/dts/omap3-sb-t35.dtsi index b1cb5774f49a..827f614261f6 100644 --- a/arch/arm/boot/dts/omap3-sb-t35.dtsi +++ b/arch/arm/boot/dts/omap3-sb-t35.dtsi @@ -43,6 +43,16 @@ }; }; }; + + audio_amp: audio_amp { + compatible = "regulator-fixed"; + regulator-name = "audio_amp"; + pinctrl-names = "default"; + pinctrl-0 = <&sb_t35_audio_amp>; + gpio = <&gpio2 29 GPIO_ACTIVE_LOW>; /* gpio_61 */ + enable-active-low; + regulator-always-on; + }; }; &omap3_pmx_core { @@ -58,6 +68,32 @@ OMAP3_CORE1_IOPAD(0x20b4, PIN_OUTPUT | MUX_MODE4) /* gpmc_ncs3.gpio_54 */ >; }; + + i2c3_pins: pinmux_i2c3_pins { + pinctrl-single,pins = < + OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_scl */ + OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda */ + >; + }; + + sb_t35_audio_amp: pinmux_sb_t35_audio_amp { + pinctrl-single,pins = < + OMAP3_CORE1_IOPAD(0x20c8, PIN_OUTPUT | MUX_MODE4) /* gpmc_nbe1.gpio_61 */ + >; + }; +}; + +&i2c3 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c3_pins>; + + clock-frequency = <400000>; + + at24@50 { + compatible = "at24,24c02"; + pagesize = <16>; + reg = <0x50>; + }; }; &gpmc { |
